[Zope-CVS] CVS: Packages/WinBuilders/mk - zeo.mk:1.4.2.3

[Tim Peters]

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

Modified Files:
      Tag: tim-zrs-branch
	zeo.mk 
Log Message:
Clean up the build tree before building an installer from it:

+ Remove embedded CVS directories.  It makes no sense to have these, and
  it's confusing to see them in the installed stuff.

+ Convert all .txt and .py files to have Windows line ends.  Since we're
  mostly extracting source from Unix tarballs, most of the text files
  the installer created were unintelligible when viewed with normal
  Windows tools.

XXX This probably ought to be a distinct makefile target, so other
installers could reuse the logic.


=== Packages/WinBuilders/mk/zeo.mk 1.4.2.2 => 1.4.2.3 ===
--- Packages/WinBuilders/mk/zeo.mk:1.4.2.2	Mon Feb  2 19:40:58 2004
+++ Packages/WinBuilders/mk/zeo.mk	Wed Feb  4 21:34:10 2004
@@ -19,6 +19,16 @@
 
 $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
 	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zeo.iss.in" | unix2dos > "$(BUILD_DIR)/zeo.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" | xargs unix2dos
+
+	# Build the Inno installer.
 	$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zeo.iss"
 
 $(BUILD_DIR)/lib/python/ExtensionClass.pyd: WIN_TMPDIR=tmp\zeotmp