[Zope-Checkins] SVN: Zope/trunk/inst/Makefile. Write version.txt to the right directory.

2007-07-23 Thread Chris McDonough 
Log message for revision 78301:
  Write version.txt to the right directory.
  

Changed:
  U   Zope/trunk/inst/Makefile.in
  U   Zope/trunk/inst/Makefile.win.in

-=-
Modified: Zope/trunk/inst/Makefile.in
===
--- Zope/trunk/inst/Makefile.in 2007-07-23 21:40:12 UTC (rev 78300)
+++ Zope/trunk/inst/Makefile.in 2007-07-23 23:00:22 UTC (rev 78301)
@@ -104,13 +104,13 @@
 clean: unbuild
${FIND} ${BASE_DIR} \
  -name '*.py[co]' -o -name '*.so' -o -name '*.o' | ${XARGS} ${RM}
-   ${RM} $(BASE_DIR)/lib/python/version.txt
+   ${RM} $(BASE_DIR)/lib/python/Zope2/version.txt
${RMRF} build
 
 # version_txt: create a version file in lib/python/version.txt
 version_txt:
printf Zope ${MAJOR_VERSION}.${MINOR_VERSION}-${RELEASE_TAG} \
-  ${BASE_DIR}/lib/python/version.txt
+  ${BASE_DIR}/lib/python/Zope2/version.txt
 
 sdist: clobber sdist_tgz
 

Modified: Zope/trunk/inst/Makefile.win.in
===
--- Zope/trunk/inst/Makefile.win.in 2007-07-23 21:40:12 UTC (rev 78300)
+++ Zope/trunk/inst/Makefile.win.in 2007-07-23 23:00:22 UTC (rev 78301)
@@ -105,13 +105,13 @@
 clean:
$(CD) $(BASE_DIR)
-$(RM) /s *.pyc *.pyo *.dll *.o *.obj *.pyd
-   -$(EXISTS) $(BASE_DIR)\lib\python\version.txt $(RM) 
$(BASE_DIR)\lib\python\version.txt
+   -$(EXISTS) $(BASE_DIR)\lib\python\Zope2\version.txt $(RM) 
$(BASE_DIR)\lib\python\Zope2\version.txt
-$(EXISTS) build $(RMRF) build
 
-# version_txt: create a version file in lib/python/version.txt
+# version_txt: create a version file in lib/python/Zope2/version.txt
 version_txt:
echo Zope $(MAJOR_VERSION).$(MINOR_VERSION)-$(RELEASE_TAG)  \
-  $(BASE_DIR)/lib/python/version.txt
+  $(BASE_DIR)/lib/python/Zope2/version.txt
 
 # sdist:   Create a source distribution file (implies clobber).
 #

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/doc/CHANGES.txt

2007-07-23 Thread Chris McDonough 
Log message for revision 78302:
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2007-07-23 23:00:22 UTC (rev 78301)
+++ Zope/trunk/doc/CHANGES.txt  2007-07-23 23:01:37 UTC (rev 78302)
@@ -128,6 +128,10 @@
 
 Bugs Fixed
 
+  - version.txt file was being written to the wrong place by the
+Makefile, causing Zope to report unreleased version even for
+released versions.
+
   - Collector #1306: Missing acquisition context on local roles screen.
 
   - Collector #2153: Supporting unquoted cookies with spaces.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins