[pywin32-checkins] pywin32 setup.py,1.22,1.23
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
Menu
▾
▴
[pywin32-checkins] pywin32 setup.py,1.22,1.23
|
From: Mark H. <mha...@us...> - 2005-10-22 01:38:59
|
Update of /cvsroot/pywin32/pywin32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21346 Modified Files: setup.py Log Message: Assign each extension a DLL base address, and versionstamp the build DLLs at link time. Index: setup.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/setup.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** setup.py 21 Oct 2005 06:13:33 -0000 1.22 --- setup.py 22 Oct 2005 01:38:48 -0000 1.23 *************** *** 89,92 **** --- 89,96 ---- os.chdir(os.path.dirname(this_file)) + # Start address we assign base addresses from. See comment re + # dll_base_address later in this file... + dll_base_address = 0x1e200000 + # We need to know the platform SDK dir before we can list the extensions. def find_platform_sdk_dir(): *************** *** 184,187 **** --- 188,192 ---- # skip this extension optional_headers=[], + base_address = None, ): assert dsp_file or sources, "Either dsp_file or sources must be specified" *************** *** 209,212 **** --- 214,218 ---- self.optional_headers = optional_headers self.is_regular_dll = is_regular_dll + self.base_address = base_address Extension.__init__ (self, name, sources, include_dirs, *************** *** 350,379 **** print "Failed to open '%s': %s" % (ver_fname, why) - ## add version info to dll's, exe's, and pyd's - if 'install' not in sys.argv: - 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',None) - 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',None) - v.ensure_value('product','Pywin32') - v.ensure_value('dll',None) - v.ensure_value('debug',None) - v.ensure_value('verbose','-v' in sys.argv) - for dirname, subdirs, fnames in os.walk(self.build_base): - for fname in fnames: - if os.path.splitext(fname)[1].lower() in ('.dll','.exe','.pyd'): - win32verstamp.stamp(os.path.join(dirname,fname),v) - class my_build_ext(build_ext): --- 356,359 ---- *************** *** 682,685 **** --- 662,672 ---- ext.extra_compile_args.append("/Fp"+pch_name) + # Put our DLL base address in. + if not self.mingw32: + base = ext.base_address + if not base: + base = dll_base_addresses[ext.name] + ext.extra_link_args.append("/BASE:0x%x" % (base,)) + # some source files are compiled for different extensions # with special defines. So we cannot use a shared *************** *** 893,906 **** self.linker = new_compiler.linker try: ! return msvccompiler.MSVCCompiler.link( self, ! target_desc, ! objects, ! output_filename, ! output_dir, ! libraries, ! library_dirs, ! runtime_library_dirs, ! export_symbols, ! debug, *args, **kw) finally: if old_linker is not None: --- 880,915 ---- self.linker = new_compiler.linker try: ! msvccompiler.MSVCCompiler.link( self, ! target_desc, ! objects, ! output_filename, ! output_dir, ! libraries, ! library_dirs, ! runtime_library_dirs, ! export_symbols, ! debug, *args, **kw) ! # 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: *************** *** 1076,1080 **** --- 1085,1091 ---- pch_header = "stdafx.h", windows_h_version = 0x500, + base_address = dll_base_address, ) + dll_base_address += 0x80000 # pythoncom is large! com_extensions = [pythoncom] com_extensions += [ *************** *** 1121,1129 **** pythonwin_extensions = [ WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'], ! pch_header="stdafx.h"), WinExt_pythonwin("win32uiole", pch_header="stdafxole.h", windows_h_version = 0x500), WinExt_pythonwin("dde", pch_header="stdafxdde.h"), ] other_extensions = [] --- 1132,1143 ---- pythonwin_extensions = [ WinExt_pythonwin("win32ui", extra_compile_args = ['-DBUILD_PYW'], ! pch_header="stdafx.h", base_address=dll_base_address), WinExt_pythonwin("win32uiole", pch_header="stdafxole.h", windows_h_version = 0x500), WinExt_pythonwin("dde", pch_header="stdafxdde.h"), ] + # win32ui is large, so we reserve more bytes than normal + dll_base_address += 0x100000 + other_extensions = [] *************** *** 1302,1305 **** --- 1316,1335 ---- py_modules = expand_modules("win32\\lib") + ext_modules = win32_extensions + com_extensions + pythonwin_extensions + \ + other_extensions + + # Build a map of DLL base addresses. According to Python's PC\dllbase_nt.txt, + # we start at 0x1e200000 and go up in 0x00020000 increments. A couple of + # our modules just go over this limit, so we use 30000. We also do it sorted + # so each module gets the same addy each build. + # Note: If a module specifies a base address it still gets a slot reserved + # here which is unused. We can live with that tho. + names = [ext.name for ext in ext_modules] + names.sort() + dll_base_addresses = {} + for name in names: + dll_base_addresses[name] = dll_base_address + dll_base_address += 0x30000 + dist = setup(name="pywin32", version=str(build_id), *************** *** 1327,1332 **** scripts = ["pywin32_postinstall.py"], ! ext_modules = win32_extensions + com_extensions + pythonwin_extensions + \ ! other_extensions, package_dir = {"win32com": "com/win32com", --- 1357,1361 ---- scripts = ["pywin32_postinstall.py"], ! ext_modules = ext_modules, package_dir = {"win32com": "com/win32com", |
