Log message for revision 41283:
Remove compiled Python files from the tree before packaging.
Convert line ends on more kinds of files.
Changed:
U Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk
-=-
Modified: Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk
===================================================================
--- Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk
2006-01-11 20:24:37 UTC (rev 41282)
+++ Zope/branches/tim-2.9-windows-installer/inst/WinBuilders/mk/zope.mk
2006-01-11 20:29:07 UTC (rev 41283)
@@ -26,14 +26,19 @@
$(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.
+ # Remove CVS directories and compiled Python files from the build tree.
find $(BUILD_DIR) -name CVS -type d -exec $(RMRF) {} \; -prune
+ find $(BUILD_DIR) -name "*.pyc" -o -name "*.pyo" | xargs $(RM)
# 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
+ find $(BUILD_DIR) -name "*.py" | xargs unix2dos
+ find $(BUILD_DIR) -name "*.txt" | xargs unix2dos
+ find $(BUILD_DIR) -name "*.bat" | xargs unix2dos
+ find $(BUILD_DIR) -name "*.conf" | xargs unix2dos
+ find $(BUILD_DIR) -name "*.xml" | xargs unix2dos
+ find $(BUILD_DIR) -name "*.in" | xargs unix2dos
# Build the Inno installer.
$(CD) "$(BUILD_DIR)";"$(ISS_COMPILER)" /cc "$(WIN_BUILD_DIR)\zope.iss"
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
