Update of /cvsroot/pywin32/pywin32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv707
Modified Files:
setup.py
Log Message:
Get things building with the various Python versions we support.
Index: setup.py
===================================================================
RCS file: /cvsroot/pywin32/pywin32/setup.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** setup.py 22 Oct 2005 01:41:26 -0000 1.24
--- setup.py 23 Oct 2005 11:33:52 -0000 1.25
***************
*** 58,62 ****
import _winreg
! pywin32_version='.'.join(sys.version.split('.')[:2])+'.'+build_id
print "Building pywin32", pywin32_version
--- 58,62 ----
import _winreg
! pywin32_version="%d.%d.%s" % (sys.version_info[0], sys.version_info[1], build_id)
print "Building pywin32", pywin32_version
***************
*** 350,354 ****
ver_fname = os.path.join(os.environ['temp'], "pywin32.version.txt")
try:
! f = open(ver_fname, "wU")
f.write("%s\n" % build_id)
f.close()
--- 350,354 ----
ver_fname = os.path.join(os.environ['temp'], "pywin32.version.txt")
try:
! f = open(ver_fname, "U")
f.write("%s\n" % build_id)
f.close()
***************
*** 419,423 ****
% (ext.windows_h_version, self.windows_h_version)
! look_dirs = self.include_dirs + self.compiler.get_msvc_paths("include")
for h in ext.optional_headers:
for d in look_dirs:
--- 419,428 ----
% (ext.windows_h_version, self.windows_h_version)
! try:
! get_msvc_paths = self.compiler.get_msvc_paths
! except AttributeError:
! # module method in early Python versions
! get_msvc_paths = msvccompiler.get_msvc_paths
! look_dirs = self.include_dirs + get_msvc_paths("include")
for h in ext.optional_headers:
for d in look_dirs:
***************
*** 892,915 ****
# Here seems a good place to stamp the version of the built
# target.
- import optparse
try:
import win32verstamp
except ImportError:
log.info('Unable to import verstamp, no version info will be added')
else:
! v=optparse.Values()
! v.ensure_value('version',pywin32_version)
! v.ensure_value('comments',"http://pywin32.sourceforge.net")
! v.ensure_value('company',None)
! v.ensure_value('description',None)
! v.ensure_value('internal_name',None)
! v.ensure_value('copyright',None)
! v.ensure_value('trademarks',None)
! v.ensure_value('original_filename',os.path.basename(output_filename))
! v.ensure_value('product','Pywin32')
! v.ensure_value('dll',None)
! v.ensure_value('debug',None)
! v.ensure_value('verbose','-v' in sys.argv)
! win32verstamp.stamp(output_filename, v)
finally:
if old_linker is not None:
--- 897,927 ----
# Here seems a good place to stamp the version of the built
# target.
try:
import win32verstamp
+ import optparse
except ImportError:
log.info('Unable to import verstamp, no version info will be added')
else:
! try:
! v=optparse.Values()
! v.ensure_value('version',pywin32_version)
! v.ensure_value('comments',"http://pywin32.sourceforge.net")
! v.ensure_value('company',None)
! v.ensure_value('description',None)
! v.ensure_value('internal_name',None)
! v.ensure_value('copyright',None)
! v.ensure_value('trademarks',None)
! v.ensure_value('original_filename',os.path.basename(output_filename))
! v.ensure_value('product','Pywin32')
! v.ensure_value('dll',None)
! v.ensure_value('debug',None)
! v.ensure_value('verbose','-v' in sys.argv)
! win32verstamp.stamp(output_filename, v)
! except:
! # Failure to stamp files means our build stops, which
! # isn't good!
! print "FAILED to stamp files"
! import traceback
! traceback.print_exc()
finally:
if old_linker is not None:
|
