From: Thomas H. <th...@us...> - 2005-04-12 13:49:03
|
Update of /cvsroot/py2exe/py2exe/py2exe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5745 Modified Files: build_exe.py Log Message: Refactoring: move code into separate methods. Index: build_exe.py =================================================================== RCS file: /cvsroot/py2exe/py2exe/py2exe/build_exe.py,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** build_exe.py 12 Apr 2005 13:43:33 -0000 1.45 --- build_exe.py 12 Apr 2005 13:48:53 -0000 1.46 *************** *** 353,374 **** self.mkpath(self.lib_dir) ! def create_binaries(self, py_files, extensions, dlls): ! dist = self.distribution ! ! # byte compile the python modules into the target directory ! print "*** byte compile python files ***" ! compiled_files = byte_compile(py_files, ! target_dir=self.collect_dir, ! optimize=self.optimize, ! force=0, ! verbose=self.verbose, ! dry_run=self.dry_run) ! ! self.lib_files = [] ! self.console_exe_files = [] ! self.windows_exe_files = [] ! self.service_exe_files = [] ! self.comserver_files = [] ! print "*** copy extensions ***" # copy the extensions to the target directory --- 353,357 ---- self.mkpath(self.lib_dir) ! def copy_extensions(self, extensions): print "*** copy extensions ***" # copy the extensions to the target directory *************** *** 392,413 **** dst = os.path.join(self.collect_dir, os.path.basename(src)) self.copy_file(src, dst) ! compiled_files.append(os.path.basename(dst)) ! ! # create the shared zipfile containing all Python modules ! if dist.zipfile is None: ! fd, archive_name = tempfile.mkstemp() ! os.close(fd) ! else: ! archive_name = os.path.join(self.lib_dir, ! os.path.basename(dist.zipfile)) ! ! arcname = self.make_lib_archive(archive_name, ! base_dir=self.collect_dir, ! files=compiled_files, ! verbose=self.verbose, ! dry_run=self.dry_run) ! if dist.zipfile is not None: ! self.lib_files.append(arcname) self.announce("*** copy dlls ***") for dll in dlls: --- 375,381 ---- dst = os.path.join(self.collect_dir, os.path.basename(src)) self.copy_file(src, dst) ! self.compiled_files.append(os.path.basename(dst)) + def copy_dlls(self, dlls): self.announce("*** copy dlls ***") for dll in dlls: *************** *** 435,438 **** --- 403,443 ---- self.lib_files.append(dst) + def create_binaries(self, py_files, extensions, dlls): + dist = self.distribution + + # byte compile the python modules into the target directory + print "*** byte compile python files ***" + self.compiled_files = byte_compile(py_files, + target_dir=self.collect_dir, + optimize=self.optimize, + force=0, + verbose=self.verbose, + dry_run=self.dry_run) + + self.lib_files = [] + self.console_exe_files = [] + self.windows_exe_files = [] + self.service_exe_files = [] + self.comserver_files = [] + + self.copy_extensions(extensions) + self.copy_dlls(dlls) + + # create the shared zipfile containing all Python modules + if dist.zipfile is None: + fd, archive_name = tempfile.mkstemp() + os.close(fd) + else: + archive_name = os.path.join(self.lib_dir, + os.path.basename(dist.zipfile)) + + arcname = self.make_lib_archive(archive_name, + base_dir=self.collect_dir, + files=self.compiled_files, + verbose=self.verbose, + dry_run=self.dry_run) + if dist.zipfile is not None: + self.lib_files.append(arcname) + for target in self.distribution.isapi: print "*** copy isapi support DLL ***" |