[Zope-Checkins] CVS: Zope/inst - Makefile.win.in:1.1.2.7

[Chris McDonough]

Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv19065/inst

Modified Files:
      Tag: chrism-install-branch
	Makefile.win.in 
Log Message:
Make Windows installs work again.


=== Zope/inst/Makefile.win.in 1.1.2.6 => 1.1.2.7 ===
--- Zope/inst/Makefile.win.in:1.1.2.6	Fri Jan  3 10:32:19 2003
+++ Zope/inst/Makefile.win.in	Mon Jan 13 14:28:38 2003
@@ -23,14 +23,14 @@
 .PHONY : default
 
 default: build
+
+build: hacklinks links
+	"$(PYTHON)" "$(INST_DIR)/setup.py" build_ext -i
 	@ echo.
 	@ echo Zope built.  Next, do 'nmake install' (or 'nmake instance'
 	@ echo to run a Zope instance directly from the build directory).
 	@ echo.
 
-build: hacklinks links
-	"$(PYTHON)" "$(INST_DIR)/setup.py" build_ext -i
-
 # Zope has a number of directories in its top-level source checkout
 # which should really be treated as subdirectories of two "skeleton"
 # directories which are copied wholesale during the 'make install' and
@@ -60,7 +60,6 @@
 	$(XCOPY) Extensions "$(SKEL_DIR)\Extensions"
 	$(XCOPY) import "$(SKEL_DIR)\import"
 	$(XCOPY) utilities "$(SKEL_DIR)\utilities"
-	$(XCOPY) bin "$(SKEL_DIR)\bin"
 	$(XCOPY) var "$(SKEL_DIR)\inst\skel\var"
 
 # links to reduce code duplication since both the zope_home installer
@@ -69,6 +68,7 @@
 links:
 	$(COPY) inst\file_from_infile.py "$(SKEL_DIR)\inst\file_from_infile.py"
 	$(COPY) inst\install.py "$(SKEL_DIR)\inst\install.py"
+        $(COPY) inst\versions.py "$(SKEL_DIR)\inst\versions.py"
 	$(WRITE_INFILE) inst\in\make_instance.py.in "$(SKEL_DIR)\inst\make_instance.py"
 
 install: build
@@ -84,6 +84,21 @@
 	"$(PYTHON)" "$(SKEL_DIR)\inst\make_instance.py" \
 	  --zopehome="$(BUILD_DIR)"
 
+# testinst makes an instance home in the build directory without asking
+# any questions.  this is useful when testing.  instances made with
+# this can be removed via "make untestinst"
+testinst: build
+	"$(PYTHON)" "$(SKEL_DIR)\inst\make_instance.py" \
+          --zopehome="$(BUILD_DIR)" --insthome="$(BUILD_DIR)" \
+          --inituser=
+
+# remove the instance files made with testinst (w/ prejudice)
+untestinst:
+	$(RM) "$(BUILD_DIR)\bin\zopectl.py"
+	$(RM) "$(BUILD_DIR)\bin\ntservice.py"
+	$(RM) "$(BUILD_DIR)\etc"
+	$(RM) "$(BUILD_DIR)\Products"
+
 uninstall:
 	$(RMDIR) "$(TARGET_DIR)"
 
@@ -93,12 +108,11 @@
 	$(RMDIR) "$(SKEL_DIR)\Extensions"
 	$(RMDIR) "$(SKEL_DIR)\import"
 	$(RMDIR) "$(SKEL_DIR)\utilities"
-	$(RMDIR) "$(SKEL_DIR)\bin"
 	$(RMDIR) "$(SKEL_DIR)\inst\skel\var"
+	$(RM) "$(SKEL_DIR)\inst\make_instance.py"
 	$(RM) "$(SKEL_DIR)\inst\file_from_infile.py"
 	$(RM) "$(SKEL_DIR)\inst\install.py"
-	$(RM) "$(SKEL_DIR)\inst\make_instance.py"
-	$(RMDIR) "$(BUILD_DIR)\lib\python\build"
+	$(RM) "$(SKEL_DIR)\inst\versions.py"
 
 test: build
 	$(CD) "$(BASE_DIR)\lib\python"