Changeset 241

Show
Ignore:
Timestamp:
Mon Feb 6 06:57:08 2006
Author:
giovannibajo
Message:

Fix ticket #17: name of the COM server bootloader was wrong

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/Build.py

    r50 r241  
    484 484             return 1  
    485 485         return 0  
    486       def assemble(self):  
    487           print "building ELFEXE", os.path.basename(self.out)  
    488           trash = []  
    489           outf = open(self.name, 'wb')  
      486     def _bootloader_postfix(self, exe):  
    490 487         if iswin:  
    491               exe = 'support/loader/run_'  
      488             exe = exe + "_"  
    491 488             is24 = hasattr(sys, "version_info") and sys.version_info[:2] >= (2,4)  
    492 489             exe = exe + "67"[is24]  
    …… 
    495 492             exe = exe + "wc"[self.console]  
    496 493         else:  
    497               exe = 'support/loader/run'  
    498 494             if not self.console:  
    499 495                 exe = exe + 'w'  
    500 496             if self.debug:  
    501 497                 exe = exe + '_d'  
      498         return exe  
      499     def assemble(self):  
      500         print "building ELFEXE", os.path.basename(self.out)  
      501         trash = []  
      502         outf = open(self.name, 'wb')  
      503         exe = self._bootloader_postfix('support/loader/run')  
    502 504         exe = os.path.join(HOMEPATH, exe)  
    503 505         if iswin or cygwin:  
    …… 
    542 544         print "building DLL", os.path.basename(self.out)  
    543 545         outf = open(self.name, 'wb')  
    544           dll = 'support/loader/inprocsrvr'  
    545           if self.debug:  
    546               dll = dll + '_d'  
      546         dll = self._bootloader_postfix('support/loader/inprocsrvr')  
    547 547         dll = os.path.join(HOMEPATH, dll)  + '.dll'  
    548 548         self.copy(dll, outf)  

  • trunk/doc/CHANGES.txt

    r240 r241  
    9 9    the encodings are automatically found and included, so this problem should  
    10 10    be gone forever.  
      11  + Fix building of COM servers (was broken in 1.0 because of the new build  
      12    system).  
    11 13  + Mimic Python 2.4 behaviour with broken imports: sys.modules is cleaned up  
    12 14    afterwise. This allows to package SQLObject applications under Windows