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

Chris McDonough chrism at zope.com
Wed Aug 20 17:54:22 EDT 2003


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

Modified Files:
	zeo.mk 
Log Message:
Make ZEO buildout nominally work.


=== Packages/WinBuilders/mk/zeo.mk 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/mk/zeo.mk:1.1.1.1	Tue Aug 12 14:41:21 2003
+++ Packages/WinBuilders/mk/zeo.mk	Wed Aug 20 16:53:51 2003
@@ -11,10 +11,11 @@
 	$(RMRF) src/$(ZODBDIRNAME)
 
 install_zeo: src/$(ZODBDIRNAME)/setup.py install_python \
-              $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe
+             $(BUILD_DIR)/lib/python/version.txt \
+             $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe \
 
 ESCAPED=$(shell sh $(MAKEFILEDIR)/bin/escape.sh '$(WIN_MAKEFILEDIR)')
-SEDSCRIPT="s@<<VERSION>>@$(ZOPEVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
+SEDSCRIPT="s@<<VERSION>>@$(ZODBVERSION)@g;s@<<MAKEFILEDIR>>@$(ESCAPED)@g"
 
 $(BUILD_DIR)/ZEO-$(ZODBDIRNAME)-win32.exe: $(BUILD_DIR)/lib/python/version.txt
 	$(SED) $(SEDSCRIPT) < "$(MAKEFILEDIR)/etc/zeo.iss.in" | unix2dos > "$(BUILD_DIR)/zeo.iss"
@@ -36,8 +37,27 @@
 	$(XCOPY) "$(WIN_TMPDIR)\Scripts\*.py" "$(WIN_BUILD_DIR)\bin"
 	$(RMRF) $(shell cygpath -u $(WIN_TMPDIR))
 
-$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/ExtensionClass.pyd
-	@echo ZEO $(ZODBDIRNAME) > "$(BUILD_DIR)/lib/python/version.txt"
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_REPOSITORY=$(ZOPE_CVS_REPOSITORY)
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_MODULE=Zope/lib/python/nt_svcutils
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py: CVS_TAG=-r HEAD
+
+$(BUILD_DIR)/lib/python/nt_svcutils/__init__.py:
+	${CD} ${BUILD_DIR}/lib/python && \
+	${CVS} -d ${CVS_REPOSITORY} export ${CVS_TAG} -d \
+        $(shell basename $(@D)) ${CVS_MODULE}
+
+$(BUILD_DIR)/skel/README.txt:
+	$(MKDIR) "$(@D)"
+	$(CPR) $(MAKEFILEDIR)/zeo_addons/skel/* $(@D)
+	$(TOUCH) "$@"
+
+$(BUILD_DIR)/bin/mkzeoinstance.py:
+	$(MKDIR) "$(@D)"
+	$(CPR) $(MAKEFILEDIR)/zeo_addons/utilities/* $(@D)
+	$(TOUCH) "$(@)"
+
+$(BUILD_DIR)/lib/python/version.txt: $(BUILD_DIR)/lib/python/ExtensionClass.pyd $(BUILD_DIR)/lib/python/nt_svcutils/__init__.py $(BUILD_DIR)/skel/README.txt $(BUILD_DIR)/bin/mkzeoinstance.py
+	@echo ZEO $(ZODBVERSION) > "$(BUILD_DIR)/lib/python/version.txt"
 	$(TOUCH) $@
 
 src/$(ZODBDIRNAME)/setup.py:




More information about the Zope-CVS mailing list