Log message for revision 69119: > - Restore buildout into functioning >
Changed: U Zope/branches/2.10/inst/Makefile.win.in A Zope/branches/2.10/inst/WinBuilders/bin/makezope.bat U Zope/branches/2.10/inst/WinBuilders/etc/zope.iss.in U Zope/branches/2.10/inst/WinBuilders/mk/common.mk U Zope/branches/2.10/inst/WinBuilders/mk/python.mk U Zope/branches/2.10/inst/WinBuilders/mk/zope.mk U Zope/branches/2.10/inst/tar.py -=- Modified: Zope/branches/2.10/inst/Makefile.win.in =================================================================== --- Zope/branches/2.10/inst/Makefile.win.in 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/Makefile.win.in 2006-07-13 23:23:55 UTC (rev 69119) @@ -7,7 +7,8 @@ MAJOR_VERSION=<<ZOPE_MAJOR_VERSION>> MINOR_VERSION=<<ZOPE_MINOR_VERSION>> RELEASE_TAG=<<VERSION_RELEASE_TAG>> -PACKAGE_NAME=$(NAME)-$(MAJOR_VERSION).$(MINOR_VERSION)-$(RELEASE_TAG) +ZOPEVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)-$(RELEASE_TAG) +PACKAGE_NAME=$(NAME)-$(ZOPEVERSION) PYTHON="<<PYTHON>>" TMPDIR="<<TMP_DIR>>" @@ -31,7 +32,9 @@ CD=cd XCOPY=xcopy /i /s /e /y COPY=copy +MOVE=move EXISTS=IF EXIST +NOT_EXISTS=IF NOT EXIST default: build # default: The default step (invoked when make is called without a target) @@ -59,6 +62,16 @@ @ echo Zope binaries installed successfully. @ echo Now run '$(PYTHON) $(PREFIX)\bin\mkzopeinstance.py' + +$(BASE_DIR)/inst/tmp/$(PACKAGE_NAME).tgz: + $(MAKE) sdist + $(NOT_EXISTS) inst\tmp $(MKDIR) inst\tmp + $(MOVE) $(PACKAGE_NAME).tgz inst\tmp + +# installer: Create the Zope Installer. +installer: $(BASE_DIR)/inst/tmp/$(PACKAGE_NAME).tgz + $(CD) inst && sh Winbuilders/buildout zope ZOPEVERSION=$(ZOPEVERSION) + # inplace: Do an in-place build inplace: $(MAKE) install PREFIX="$(BASE_DIR)" Copied: Zope/branches/2.10/inst/WinBuilders/bin/makezope.bat (from rev 69118, Zope/branches/2.9/inst/WinBuilders/bin/makezope.bat) Modified: Zope/branches/2.10/inst/WinBuilders/etc/zope.iss.in =================================================================== --- Zope/branches/2.10/inst/WinBuilders/etc/zope.iss.in 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/WinBuilders/etc/zope.iss.in 2006-07-13 23:23:55 UTC (rev 69119) @@ -33,7 +33,7 @@ Source:"doc\*.*"; DestDir: "{app}\doc"; Flags: ignoreversion recursesubdirs Source:"lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs Source:"skel\*.*"; DestDir: "{app}\skel"; Flags: ignoreversion recursesubdirs -Source:"zopeskel\*.*"; DestDir: "{app}\zopeskel"; Flags: ignoreversion recursesubdirs + ; these are required to be put into the bin directory for proper function of NT services Source:"bin\Lib\site-packages\win32\PythonService.exe"; DestDir: "{app}\bin"; Flags: ignoreversion Source:"bin\Lib\site-packages\pywin32_system32\PyWinTypes24.dll"; DestDir: "{app}\bin"; Flags: ignoreversion Modified: Zope/branches/2.10/inst/WinBuilders/mk/common.mk =================================================================== --- Zope/branches/2.10/inst/WinBuilders/mk/common.mk 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/WinBuilders/mk/common.mk 2006-07-13 23:23:55 UTC (rev 69119) @@ -39,8 +39,8 @@ NMAKE=nmake CSCRIPT=cscript ECHO=echo -ISS_DIR=$(CYGROOT)/Progra~1/Inno Setup 5 -ISS_COMPILER=$(ISS_DIR)/Compil32.exe +ISS_DIR=$(PROGRAMFILES)\\Inno Setup 5 +ISS_COMPILER=$(ISS_DIR)\\Compil32.exe # We need a version that understands cygwin paths, so /bin/ UNZIP=/bin/unzip Modified: Zope/branches/2.10/inst/WinBuilders/mk/python.mk =================================================================== --- Zope/branches/2.10/inst/WinBuilders/mk/python.mk 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/WinBuilders/mk/python.mk 2006-07-13 23:23:55 UTC (rev 69119) @@ -72,7 +72,7 @@ $(ARB_PYSRCDIR): tmp/$(PYDIRNAME).tgz $(MKDIR) "$(SRC_DIR)" - $(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(PYDIRNAME).tgz + $(CD) "$(SRC_DIR)" && $(TAR) xzf ../tmp/$(PYDIRNAME).tgz $(TOUCH) "$(ARB_PYSRCDIR)" # unzip warns about .exe not being exactly a .zip, then succeeds in Modified: Zope/branches/2.10/inst/WinBuilders/mk/zope.mk =================================================================== --- Zope/branches/2.10/inst/WinBuilders/mk/zope.mk 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/WinBuilders/mk/zope.mk 2006-07-13 23:23:55 UTC (rev 69119) @@ -1,15 +1,15 @@ -ZOPEVERSION := 2.10.0-b1 +ZOPEVERSION = 2.10.0-b1 ZOPEDIRNAME := Zope-$(ZOPEVERSION) ZOPE_REQUIRED_FILES=tmp/$(ZOPEDIRNAME).tgz -REQUIRED_FILES=$(PYTHON_REQUIRED_FILES)\ +REQUIRED_FILES=$(PYTHON_REQUIRED_FILES) \ $(ZOPE_REQUIRED_FILES) clean_zope: $(RMRF) src/$(ZOPEDIRNAME) -install_zope: src/$(ZOPEDIRNAME)/install.py \ +install_zope: src/$(ZOPEDIRNAME)/inst/configure.py \ install_python \ $(BUILD_DIR)/lib/python/Zope2/version.txt \ $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe @@ -40,27 +40,16 @@ # Build the Inno installer. $(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss" +MAKEZOPE="$(MAKEFILEDIR)/bin/makezope.bat" "$(WIN_SRC_DIR)\\$(ZOPEDIRNAME)" + # This builds Zope, then installs it into the build directory, then # creates lib/python/Zope2/version.txt in the build directory. -# -# Yuck: for whatever reason, distutils refuses to allow an absolute -# path for the --home option, so this hardcodes "build" as the name of -# the build directory, and assumes "build" is a sibling of SRC_DIR. -# -# Yuck: the --no-compile option here has no effect: the install step -# creates oodles of unwanted .pyc files. They're removed by the -# $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe target, though, before -# building the installer. -# -# Yuck: no matter what I pass to --install-headers, it throws away the -# last path component. We actually want to copy the Zope/ZODB headers -# into bin/Include. The "nonsense" at the end gets thrown away, and that -# smells like a bug. When it gets fixed, I suppose this will copy the -# headers to bin/Include/nonsense/. $(BUILD_DIR)/lib/python/Zope2/version.txt: $(BUILD_DIR)/bin/python.exe cd "$(SRC_DIR)/$(ZOPEDIRNAME)" && \ - "$<" install.py install --no-compile --home=../../build \ - --install-headers=../../build/bin/Include/nonsense + "$<" inst/configure.py \ + --prefix="$(WIN_BUILD_DIR)" \ + --no-compile + $(MAKEZOPE) echo Zope $(ZOPEVERSION) > $@ $(TOUCH) $@ @@ -68,6 +57,7 @@ $(TOUCH) tmp/$(ZOPEDIRNAME).tgz # This merely unpacks the Zope tarball. -src/$(ZOPEDIRNAME)/install.py: tmp/$(ZOPEDIRNAME).tgz +src/$(ZOPEDIRNAME)/inst/configure.py: tmp/$(ZOPEDIRNAME).tgz $(MKDIR) "$(SRC_DIR)" - $(CD) "$(SRC_DIR)" && $(TAR) xvzf ../tmp/$(ZOPEDIRNAME).tgz + $(CD) "$(SRC_DIR)" && $(TAR) xzf ../tmp/$(ZOPEDIRNAME).tgz + $(TOUCH) $@ Modified: Zope/branches/2.10/inst/tar.py =================================================================== --- Zope/branches/2.10/inst/tar.py 2006-07-13 23:21:48 UTC (rev 69118) +++ Zope/branches/2.10/inst/tar.py 2006-07-13 23:23:55 UTC (rev 69119) @@ -19,7 +19,9 @@ INCLUDES = tuple('.*'.split()) EXCLUDES = tuple(r""".*.svn\\ .*CVS\\ .*.tgz - .*makefile .*Makefile inst\\tmp\\.* .*build-base\\ + .*makefile$ .*Makefile$ + .*inst\\tmp\\.* .*inst\\src\\.* + .*build-base\\ .*build\\ .*~ .*.#.*""".split()) def collect(top_dir, includes=INCLUDES, excludes=EXCLUDES): @@ -41,8 +43,9 @@ def tar_it_up(dest, files): tar = tarfile.open(dest, mode='w:gz') + basename = os.path.splitext(os.path.basename(dest))[0] for fname in files: - tar.add(fname, recursive=False) + tar.add(fname, os.path.join(basename, fname), recursive=False) tar.close() def main(options, args): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins