[Zope-CVS] CVS: Packages/WinBuilders/mk - spreadwrapper.mk:1.1.2.3

[Tim Peters]

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

Modified Files:
      Tag: tim-zrs-branch
	spreadwrapper.mk 
Log Message:
Ensure intermediate directories get created when needed.
Install spread.pyd into lib/python instead of bin/.
Install the Spread wrapper module tests, into a directory made up for
    this purpose (lib/python/SpreadTest) -- the Spread wrapper module
    consists solely of spread.pyd, and there's no Python code associated
    with it, so no natural place to put the tests.  Nevertheless, if
    things go wrong after installation, being able to run these basic
    tests is vital.


=== Packages/WinBuilders/mk/spreadwrapper.mk 1.1.2.2 => 1.1.2.3 ===
--- Packages/WinBuilders/mk/spreadwrapper.mk:1.1.2.2	Tue Feb  3 14:58:24 2004
+++ Packages/WinBuilders/mk/spreadwrapper.mk	Tue Feb  3 16:14:00 2004
@@ -7,8 +7,6 @@
 # Store it in tmp/.  NOTE:  May need to rename it to .tgz (depends on how
 # it's downloaded).  The name is of the form SpreadModule-n.n.tgz
 
-# XXX We should install the Spread wrapper's test suite.  Where?
-
 # XXX There's no natural way to clean up SPREADWRAPPER_TMPDIR here.
 
 SPREADWRAPPER_VERSION=1.4
@@ -24,7 +22,8 @@
 build_spreadwrapper: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/spreadmodule.c
 
 # Copy the Windows stuff into the build tree.
-install_spreadwrapper: $(BUILD_DIR)/bin/spread.pyd \
+install_spreadwrapper: $(BUILD_DIR)/lib/python/spread.pyd \
+		       $(BUILD_DIR)/lib/python/SpreadTest/testspread.py \
 		       $(BUILD_DIR)/doc/spreadwrapper_doc.txt \
 		       $(BUILD_DIR)/doc/SPREADWRAPPER_LICENSE.txt \
 		       $(BUILD_DIR)/doc/SPREADWRAPPER_README.txt
@@ -38,29 +37,42 @@
 # A dumb trick so we don't unpack the tarball multiple times.
 $(SRC_DIR)/$(SPREADWRAPPER_DIR)/doc.txt \
 $(SRC_DIR)/$(SPREADWRAPPER_DIR)/LICENSE \
-$(SRC_DIR)/$(SPREADWRAPPER_DIR)/README : $(SRC_DIR)/$(SPREADWRAPPER_DIR)/spreadmodule.c
+$(SRC_DIR)/$(SPREADWRAPPER_DIR)/README \
+$(SRC_DIR)/$(SPREADWRAPPER_DIR)/testspread.py \
+		: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/spreadmodule.c
 	$(TOUCH) $@
 
+
 $(SPREADWRAPPER_TMPDIR)/Lib/site-packages/spread.pyd: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/spreadmodule.c
 	$(CD) $(SRC_DIR)/$(SPREADWRAPPER_DIR); \
 		$(BUILD_DIR)/bin/python.exe setup.py install \
 			--prefix=../../$(SPREADWRAPPER_TMPDIR)
 
-$(BUILD_DIR)/bin/spread.pyd: $(SPREADWRAPPER_TMPDIR)/Lib/site-packages/spread.pyd
+$(BUILD_DIR)/lib/python/spread.pyd: $(SPREADWRAPPER_TMPDIR)/Lib/site-packages/spread.pyd
+	$(MKDIR) $(@D)
 	$(CP) $< $@
 	$(TOUCH) $@
 
 $(BUILD_DIR)/doc/spreadwrapper_doc.txt: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/doc.txt
+	$(MKDIR) $(@D)
 	$(CP) $< $@
 	unix2dos $@
 	$(TOUCH) $@
 
 $(BUILD_DIR)/doc/SPREADWRAPPER_LICENSE.txt: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/LICENSE
+	$(MKDIR) $(@D)
 	$(CP) $< $@
 	unix2dos $@
 	$(TOUCH) $@
 
 $(BUILD_DIR)/doc/SPREADWRAPPER_README.txt: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/README
+	$(MKDIR) $(@D)
+	$(CP) $< $@
+	unix2dos $@
+	$(TOUCH) $@
+
+$(BUILD_DIR)/lib/python/SpreadTest/testspread.py: $(SRC_DIR)/$(SPREADWRAPPER_DIR)/testspread.py
+	$(MKDIR) $(@D)
 	$(CP) $< $@
 	unix2dos $@
 	$(TOUCH) $@