Changeset 81

Show
Ignore:
Timestamp:
05/16/04 16:36:44 (5 years ago)
Author:
jajcus
Message:

- installation (make install)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk

    • Property svn:ignore changed from
      *.pyc
      pyxmpp
      jjigw.xml
      to
      *.pyc
      pyxmpp
      jjigw.xml
      *.inst
  • trunk/.cvsignore

    r8 r81  
    22pyxmpp 
    33jjigw.xml 
     4*.inst 
  • trunk/jjigw

    • Property svn:ignore changed from *.pyc to
      *.pyc
      version.py
  • trunk/jjigw.py

    r71 r81  
    2222from jjigw.config import Config 
    2323from jjigw.component import Component 
     24import sys 
     25import os.path 
     26 
     27config_dir,data_dir=".","." 
    2428 
    2529try: 
    26     config=Config("jjigw.xml") 
     30    try: 
     31        config=Config(config_dir,data_dir) 
     32    except: 
     33        print >>sys.stderr,"Couldn't load config file:",str(sys.exc_value) 
     34        sys.exit(1) 
    2735 
    2836    print "creating component..." 
  • trunk/jjigw.xml.example

    r76 r81  
    11<?xml version='1.0' encoding='utf-8'?> 
    2 <!DOCTYPE jjigw SYSTEM "jjigw.dtd"> 
     2<!DOCTYPE jjigw SYSTEM "http://jjigw.jabberstudio.org/dtd/jjigw.dtd"> 
    33<jjigw> 
    44 
  • trunk/jjigw/.cvsignore

    • Property svn:eol-style deleted
    • Property svn:keywords deleted
    r66 r81  
    11*.pyc 
     2version.py 
  • trunk/jjigw/config.py

    r73 r81  
    2222from pyxmpp import JID 
    2323from common import JJIGWFatalError,nick8_re,nick_re,normalize 
     24import os 
    2425 
    2526class ConnectConfig: 
     
    8889 
    8990class Config: 
    90     def __init__(self,filename): 
     91    def __init__(self,config_dir,data_dir): 
    9192        self.doc=None 
    92         parser=libxml2.createFileParserCtxt(filename) 
     93        self.config_dir=config_dir 
     94        self.data_dir=data_dir 
     95        os.chdir(data_dir) 
     96        libxml2.initializeCatalog() 
     97        libxml2.loadCatalog(os.path.join(data_dir,"catalog.xml")) 
     98        parser=libxml2.createFileParserCtxt(os.path.join(config_dir,"jjigw.xml")) 
    9399        parser.validate(1) 
    94100        parser.parseDocument() 
  • trunk/spidentd.py

    r71 r81  
    44 
    55import sys 
     6sys.path=sys.path[1:] 
     7 
    68import signal 
    79import socket