[Zope-CVS] CVS: Packages/WinBuilders/mk - zeo.mk:1.4.2.5 zope.mk:1.5.2.1

[Tim Peters]

Update of /cvs-repository/Packages/WinBuilders/mk
In directory cvs.zope.org:/tmp/cvs-serv21879/mk

Modified Files:
      Tag: tim-zrs-branch
	zeo.mk zope.mk 
Log Message:
Fiddle zope.mk to use the Python in the build tree instead of the one
from the src tree (since we no longer compile Python in the src tree,
that one no longer exists, and it's important to exercise the Python
setup in the build tree regardless).

Also added code from zeo.mak to clean up the build tree before building
the installer:  purge all embedded CVS directories, and convert .txt,
.py and .bat files to use Windows line ends.


=== Packages/WinBuilders/mk/zeo.mk 1.4.2.4 => 1.4.2.5 ===
--- Packages/WinBuilders/mk/zeo.mk:1.4.2.4	Wed Feb  4 22:31:34 2004
+++ Packages/WinBuilders/mk/zeo.mk	Wed Feb  4 23:19:54 2004
@@ -26,7 +26,8 @@
 	# Convert text files to Windows line ends.  unix2dos has the nice
 	# property that it leaves lines with \r\n alone, so it doesn't hurt
 	# to do this on files already converted to Windows convention.
-	find $(BUILD_DIR) -name "*.py" -o -name "*.txt" | xargs unix2dos
+	find $(BUILD_DIR) -name "*.py" -o -name "*.txt" -o -name "*.bat" | \
+		xargs unix2dos
 
 	# Build the Inno installer.
 	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zeo.iss"


=== Packages/WinBuilders/mk/zope.mk 1.5 => 1.5.2.1 ===
--- Packages/WinBuilders/mk/zope.mk:1.5	Wed Jan 28 11:13:53 2004
+++ Packages/WinBuilders/mk/zope.mk	Wed Feb  4 23:19:54 2004
@@ -8,7 +8,7 @@
 
 MAKEZOPE="$(MAKEFILEDIR)/bin/makezope.bat" "$(WIN_BUILD_DIR)"
 # run the Zope tests
-test_zope: 
+test_zope:
 	$(CD) "$(BASE_DIR)/src/Zope"
 	"$(PYPCBUILDDIR)/python.exe" utilities/testrunner.py -a
 	$(CD) "$(BASE_DIR)"
@@ -24,11 +24,22 @@
 
 $(BUILD_DIR)/Zope-$(ZOPEVERSION)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
 	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zope.iss.in" | unix2dos > "$(BUILD_DIR)/zope.iss"
+
+	# Remove CVS directories from the build tree.
+	find $(BUILD_DIR) -name CVS -type d -exec $(RMRF) {} \; -prune
+
+	# Convert text files to Windows line ends.  unix2dos has the nice
+	# property that it leaves lines with \r\n alone, so it doesn't hurt
+	# to do this on files already converted to Windows convention.
+	find $(BUILD_DIR) -name "*.py" -o -name "*.txt" -o -name "*.bat" | \
+		xargs unix2dos
+
+	# Build the Inno installer.
 	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss"
 
 $(BUILD_DIR)/lib/python/Zope/Startup/run.py:
 	$(CD) "$(BUILD_DIR)"; \
-	$(PYPCBUILDDIR)/python.exe \
+	bin/python.exe \
             "$(WIN_SRC_DIR)\$(ZOPEDIRNAME)\inst\configure.py" \
             --prefix="$(WIN_BUILD_DIR)" --no-compile
 	$(MAKEZOPE)