[Zope-Checkins] CVS: Zope/inst - Makefile.win.in:1.6.2.3
configure.py:1.10.2.7
Sidnei da Silva
sidnei at awkly.org
Tue Apr 12 23:42:04 EDT 2005
Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv27740/inst
Modified Files:
Tag: Zope-2_7-branch
Makefile.win.in configure.py
Log Message:
Major service enhancements. Service cleanly shuts down child, and if child
fails the tail of the process output (which generally contains a traceback)
is
written to the event log.
Minor tweaks to the Windows build 'clean' process and documentation tweaks.
=== Zope/inst/Makefile.win.in 1.6.2.2 => 1.6.2.3 ===
--- Zope/inst/Makefile.win.in:1.6.2.2 Wed May 12 14:02:43 2004
+++ Zope/inst/Makefile.win.in Tue Apr 12 23:41:33 2005
@@ -31,14 +31,14 @@
XCOPY=xcopy /i /s /e /y
COPY=copy
-.PHONY: clean install build unbuild
-.PHONY: default
-
default: build
# default: The default step (invoked when make is called without a target)
@ echo.
@ echo Zope built. Next, do 'nmake install'.
- @ echo
+ @ echo.
+
+.PHONY: clean install build unbuild
+.PHONY: default
# build: Do whatever 'setup.py build' implies
build:
@@ -47,7 +47,7 @@
# unbuild: Remove the build directory (undo the make build step)
unbuild:
- $(RMRF) $(BUILD_BASE)
+ -$(RMRF) $(BUILD_BASE)
# install: Install a software home.
install: build
@@ -62,7 +62,7 @@
# the source directory for good measure.
clean: unbuild
$(CD) "$(BASE_DIR)
- $(RM) /s *.pyc *.pyo *.dll *.o *.obj *.pyd
+ -$(RM) /s *.pyc *.pyo *.dll *.o *.obj *.pyd
=== Zope/inst/configure.py 1.10.2.6 => 1.10.2.7 ===
--- Zope/inst/configure.py:1.10.2.6 Tue Oct 21 10:29:14 2003
+++ Zope/inst/configure.py Tue Apr 12 23:41:33 2005
@@ -23,7 +23,7 @@
if sys.platform == 'win32':
PREFIX = 'c:\\Zope-' + versions.ZOPE_MAJOR_VERSION
IN_MAKEFILE = 'Makefile.win.in'
- MAKE_COMMAND='the Visual C++ batch file "VCVARS32.bat" and then "nmake build"'
+ MAKE_COMMAND='the Visual C++ batch file "VCVARS32.bat" and then "nmake"'
else:
PREFIX = '/opt/Zope-' + versions.ZOPE_MAJOR_VERSION
IN_MAKEFILE = 'Makefile.in'
More information about the Zope-Checkins
mailing list