From: <th...@us...> - 2003-09-25 10:42:37
|
Update of /cvsroot/py2exe/py2exe/sandbox/py2exe In directory sc8-pr-cvs1:/tmp/cvs-serv7787 Modified Files: build_exe.py Log Message: Remove the "lib_dir" option. It is now derived from the dirname if the distribution's zipfile. Index: build_exe.py =================================================================== RCS file: /cvsroot/py2exe/py2exe/sandbox/py2exe/build_exe.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** build_exe.py 25 Sep 2003 10:04:03 -0000 1.20 --- build_exe.py 25 Sep 2003 10:42:32 -0000 1.21 *************** *** 152,156 **** self.packages = None self.dist_dir = None - self.lib_dir = None self.dll_excludes = None self.typelibs = None --- 152,155 ---- *************** *** 180,186 **** self.temp_dir = abspath(os.path.join(self.bdist_dir, "temp")) self.dist_dir = abspath(self.dist_dir) - self.lib_dir = os.path.join(self.dist_dir, self.lib_dir or '') self.mkpath(self.temp_dir) self.mkpath(self.dist_dir) self.mkpath(self.lib_dir) --- 179,187 ---- self.temp_dir = abspath(os.path.join(self.bdist_dir, "temp")) self.dist_dir = abspath(self.dist_dir) self.mkpath(self.temp_dir) self.mkpath(self.dist_dir) + + self.lib_dir = os.path.join(self.dist_dir, + os.path.dirname(self.distribution.zipfile)) self.mkpath(self.lib_dir) *************** *** 260,264 **** self.copy_file(src, dst) ! archive_name = os.path.join(self.lib_dir, dist.zipfile) arcname = self.make_lib_archive(archive_name, base_dir=self.collect_dir, verbose=self.verbose, dry_run=self.dry_run) --- 261,266 ---- self.copy_file(src, dst) ! 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, verbose=self.verbose, dry_run=self.dry_run) |