Changeset 2345

Show
Ignore:
Timestamp:
07/09/05 16:19:49 (19 years ago)
Author:
jerome
Message:

Removed the outdated and confusing autoconf/automake stuff.
pkpgcounter is now distributed separately ONLY.
Severity : Installing this version without downloading and installing
pkpgcounter v1.56 or higher first WILL BREAK your PyKota setup.

Location:
pykota/trunk
Files:
23 removed
8 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/checkdeps.py

    r2322 r2345  
    7777                       ("Python-Imaging", "PIL.Image", "Python-Imaging is required if you plan to have PyKota generate banners.\nSee http://www.pythonware.com/downloads/"), 
    7878                       ("Python-Psyco", "psyco", "Python-Psyco speedups parsing of print files, you should use it.\nSee http://psyco.sourceforge.net/"), 
     79                       ("Python-pkpgcounter", "pkpgpdls", "Python-pkpgcounter is mandatory.\nGrab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download"), 
    7980                     ] 
    8081    commandstocheck = [ ("GhostScript", "gs", "Depending on your configuration, GhostScript may be needed in different parts of PyKota."), 

  • pykota/trunk/conf/pykota.conf.sample

    r2326 r2345  
    413413#                   accounter: software() 
    414414# 
    415 #                 which uses PyKota's internal parser to compute 
     415#                 which uses pkpgcounter's code internally to compute 
    416416#                 the size of the job. 
     417#                 NB : YOU MUST NOW INSTALL pkpgcounter FOR PyKota TO WORK. 
    417418# 
    418419#                 You could obtain exactly the same result with : 
    … …  
    421422# 
    422423#                 But in this case the job would be passed through 
    423 #                 PyKota's internal parser a second time. 
    424 # 
    425 #                 pkpgcounter is a command line tool which is 
    426 #                 part of PyKota and which can handle both 
    427 #                 DSC compliant or binary PostScript, PCL5, PCL6 (aka PCLXL) 
    428 #                 and PDF documents. More file formats will be added 
    429 #                 in the future, as time permits. 
     424#                 pkpgcounter's parser a second time. 
     425# 
     426#                 pkpgcounter is a command line tool which was 
     427#                 part of PyKota and which can handle several types 
     428#                 of documents. It is now distributed separately. 
    430429# 
    431430#                 while pkpgcounter is the recommended value if you want 
    … …  
    444443# 
    445444# The following, software without any argument, works since PyKota 1.21  
    446 # and uses PyKota's internal parser. 
     445# and uses pkpgcounter's code internally. 
    447446accounter: software() 
    448447 

  • pykota/trunk/MANIFEST.in

    r2332 r2345  
    1 include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh checkdeps.py bin/pkmail bin/pkbanner bin/autopykota bin/dumpykota bin/lprngpykota bin/cupspykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkhint bin/pkpgcounter bin/pkbcodes bin/snmpprinterstatus bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README 
     1include README FAQ COPYING LICENSE TODO NEWS CREDITS SECURITY MANIFEST.in clean.sh checkdeps.py bin/pkmail bin/pkbanner bin/autopykota bin/dumpykota bin/lprngpykota bin/cupspykota bin/edpykota bin/warnpykota bin/repykota bin/pykotme bin/pykosd bin/pkprinters bin/pkhint bin/pkbcodes bin/snmpprinterstatus bin/waitprinter.sh bin/papwaitprinter.sh bin/mailandpopup.sh bin/README 
    22recursive-include po README *.sh *.po *.mo *.pot 
    33recursive-include man README *.sh *.1 

  • pykota/trunk/NEWS

    r2344 r2345  
    2222PyKota NEWS : 
    2323        
     24    - 1.23alpha17 : 
     25     
     26        - pkpgcounter is now distributed separately only. This 
     27          means that people must now download and install pkpgcounter 
     28          v1.56 or higher prior to being able to run PyKota. 
     29           
     30        - Removed all the autoconf/automake stuff which was outdated   
     31          and confusing. 
     32           
    2433    - 1.23alpha16 : 
    2534       

  • pykota/trunk/pykota/tool.py

    r2344 r2345  
    4040from mx import DateTime 
    4141 
    42 from pykota import config, storage, logger, accounter, pdlanalyzer 
     42from pykota import config, storage, logger, accounter 
    4343from pykota.version import __version__, __author__, __years__, __gplblurb__ 
    4444 
     45try : 
     46    from pkpgpdls import analyzer, pdlparser 
     47except ImportError :     
     48    sys.stderr.write("ERROR: pkpgcounter is now distributed separately, please grab it from http://www.librelogiciel.com/software/pkpgcounter/action_Download\n") 
     49     
    4550def N_(message) : 
    4651    """Fake translation marker for translatable strings extraction.""" 
    … …  
    759764        self.jobdatastream.seek(0) 
    760765        try : 
    761             parser = pdlanalyzer.PDLAnalyzer(self.jobdatastream) 
     766            parser = analyzer.PDLAnalyzer(self.jobdatastream) 
    762767            jobsize = parser.getJobSize() 
    763         except pdlanalyzer.PDLAnalyzerError, msg :     
     768        except pdlparser.PDLParserError, msg :     
    764769            # Here we just log the failure, but 
    765770            # we finally ignore it and return 0 since this 

  • pykota/trunk/pykota/version.py

    r2344 r2345  
    2222# 
    2323 
    24 __version__ = "1.23alpha16_unofficial" 
     24__version__ = "1.23alpha17_unofficial" 
    2525 
    2626__doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng." 

  • pykota/trunk/README

    r2303 r2345  
    7070           
    7171        - Supports DSC compliant and binary PostScript, PDF, PCL5 (up to),  
    72           PCLXL (aka PCL6) and ESC/P2 printers natively for software 
    73           accounting methods. More formats to come. 
     72          PCLXL (aka PCL6), ESC/P2, DVI, TIFF, OpenOffice.org Writer and  
     73          OpenOffice.org Impress printers natively (through pkpgcounter)  
     74          for software accounting methods. More formats to come. 
    7475             
    7576    Quota systems :         
    … …  
    224225    or Netatalk or any other method of your choice) for its total pages  
    225226    counter. 
    226      
    227227    This is done both at the beginning and at the end of a 
    228228    print job. The counters difference is then immediately used to  
    … …  
    233233    The command can read the job's data from its standard input and MUST 
    234234    output the job's size on its standard output. Changes to the user 
    235     account are reported immediately. PyKota features an internal 
    236     software accounting method which handles several Page Description 
    237     Languages : DSC compliant and binary PostScript, PDF, PCLXL (aka PCL6), 
    238     PCL3/4/5 and ESC/P2. 
     235    account are reported immediately. 
     236     
     237    PyKota featured an internal software accounting method which handles  
     238    several Page Description Languages : DSC compliant and binary PostScript, 
     239    PDF, PCLXL (aka PCL6), PCL3/4/5, ESC/P2, DVI, TIFF, OpenOffice.org Writer 
     240    and OpenOffice.org Impress. This software is now distributed separately 
     241    as 'pkpgcounter', and not included anymore in PyKota, so you must now 
     242    download and install it before running PyKota. 
    239243     
    240244PyKota is known to work fine with most laser printers, either with 
    … …  
    302306    - Python v2.1 or above (http://www.python.org) 
    303307    - eGenix' mxDateTime Python extension (http://www.egenix.com) 
     308    - The pkpgcounter command line tool, version 1.56 or higher. This 
     309      tool is now mandatory for PyKota to work.  
     310      (http://www.librelogiciel.com/software/) 
    304311    - The JAXML Python module to be able to dump datas in the XML format. 
    305312      (http://www.librelogiciel.com/software/) 
    … …  
    395402    of PyKota dependencies are already included, excepted 
    396403    for the PySNMP (http://pysnmp.sourceforge.net) module 
    397     which for now has to be downloaded separately. 
     404    and the pkpgcounter utility which for now have to be downloaded 
     405    and installed separately. 
    398406 
    399407Then :    

  • pykota/trunk/setup.py

    r2332 r2345  
    101101      url = "http://www.librelogiciel.com/software/", 
    102102      packages = [ "pykota", "pykota.storages", "pykota.loggers", "pykota.accounters", "pykota.reporters" ], 
    103       scripts = [ "bin/pkbcodes", "bin/pkmail", "bin/pkbanner", "bin/autopykota", "bin/dumpykota", "bin/pkpgcounter", "bin/snmpprinterstatus", "bin/pykosd", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint" ], 
     103      scripts = [ "bin/pkbcodes", "bin/pkmail", "bin/pkbanner", "bin/autopykota", "bin/dumpykota", "bin/snmpprinterstatus", "bin/pykosd", "bin/edpykota", "bin/repykota", "bin/warnpykota", "bin/pykotme", "bin/pkprinters", "bin/pkhint" ], 
    104104      data_files = data_files)