[zopeorg-checkins] CVS: NZO_SiteLayout - szodb_recipes.mk:1.1 szodb_targets.mk:1.1 Makefile.zope:1.2 Makefile.zss:1.2 zeo_recipes.mk:1.3 zeo_targets.mk:1.3

[Tres Seaver]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv10277

Modified Files:
	Makefile.zope Makefile.zss zeo_recipes.mk zeo_targets.mk 
Added Files:
	szodb_recipes.mk szodb_targets.mk 
Log Message:


  - Unfutz confusion between ZEO targets for server (which uses
    StandaloneZODB) and client (which uses ZEO, linked into the software
    home).


=== Added File NZO_SiteLayout/szodb_recipes.mk ===
#=======================================================================
#   StandaloneZODB targets
#
#   Dependencies:
#
#     - ZEO_CHECKOUT should be set to the version-qualified name, under
#       'src', of the StandaloneZODB software package, e.g.
#       'src/StandaloneZODB-1.0-final'.
#       This value is normally spelled out in the main makefile, and
#       must correspond to one of the checkouts in 'cvs.mk'.
#
#     - COPY_FROM_SRC should be set either to ${CPR} (if you plan to
#       remove the 'src' tree after building) or to ${LNDIR} (if you
#       want to be able to refresh the sources and automagically update
#       the site).
#=======================================================================

${ZEO_CHECKOUT}: ${BASE_DIR}/src
	${CD} ${BASE_DIR}/src \
      && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}

ZEO_SETUP_SRC=${ZEO_CHECKOUT:%=%/setup.py}

${ZEO_SETUP_SRC}: %/setup.py : %

ZEO_BUILD=${ZEO_CHECKOUT:src/%=opt/%}

ZEO_SETUP=${ZEO_BUILD:%=%/setup.py}

${ZEO_BUILD}: % : %/setup.py

${ZEO_SETUP}: opt/%: src/%
	${RM} ${@D}
	${MKDIR} ${@D}
	${COPY_FROM_SRC} ${BASE_DIR}/${<D} ${BASE_DIR}/${@D}

opt/StandaloneZODB: ${ZEO_BUILD}
	${CD} ${BASE_DIR}/${@D} && ${LNSF} ${<F} ${@F}

opt/StandaloneZODB/setup.py: ${ZEO_SETUP} opt/StandaloneZODB

opt/Python2/lib/python2.1/site-packages/Acquisition.so: opt/StandaloneZODB/setup.py
	${CD} ${BASE_DIR}/opt/StandaloneZODB && \
		${BASE_DIR}/bin/python setup.py build
	${CD} ${BASE_DIR}/opt/StandaloneZODB && \
		${BASE_DIR}/bin/python setup.py install

zeo: opt/StandaloneZODB/setup.py \
     opt/Python2/lib/python2.1/site-packages/Acquisition.so

zeo_usage:
	@${ECHO} "   zeo -- Build ZEO pseudo-binary."
	@${ECHO}

.PHONY: zeo zeo_usage


=== Added File NZO_SiteLayout/szodb_targets.mk ===
#=======================================================================
#	StandaloneZODB package targets
#=======================================================================

ZEO_OPT_TARGETS=\
opt/StandaloneZODB \
opt/Python2/lib/python2.1/site-packages/Acquisition.so \


=== NZO_SiteLayout/Makefile.zope 1.1.1.1 => 1.2 ===
 include cmf_targets.mk
 include zas_targets.mk
-include zss_targets.mk
 
 #-----------------------------------------------------------------------
 #   Target selectors
@@ -53,15 +52,12 @@
 BIN_TARGETS=\
 ${PYTHON_BIN_TARGETS} \
 ${ZAS_BIN_TARGETS} \
-${ZSS_BIN_TARGETS} \
 
 ETC_TARGETS=\
 ${ZAS_ETC_TARGETS} \
-${ZSS_ETC_TARGETS} \
 
 VAR_TARGETS=\
 ${ZAS_VAR_TARGETS}\
-${ZSS_VAR_TARGETS}\
 
 USAGE_TARGETS=\
 python_usage \
@@ -75,7 +71,6 @@
 ${ZEO_DOC_TARGETS} \
 ${CMF_DOC_TARGETS} \
 ${ZAS_DOC_TARGETS}\
-${ZSS_DOC_TARGETS}\
 
 include standard_targets.mk
 
@@ -88,7 +83,6 @@
 include zope_recipes.mk
 include cmf_recipes.mk
 include zas_recipes.mk
-include zss_recipes.mk
 
 #-----------------------------------------------------------------------
 #	Generic rules


=== NZO_SiteLayout/Makefile.zss 1.1 => 1.2 ===
 #-----------------------------------------------------------------------
 include python_targets.mk
-include zeo_targets.mk
+include szodb_targets.mk
 include zss_targets.mk
 
 #-----------------------------------------------------------------------
@@ -95,7 +95,7 @@
 #=======================================================================
 
 include python_recipes.mk
-include zeo_recipes.mk
+include szodb_recipes.mk
 include zss_recipes.mk
 
 #-----------------------------------------------------------------------


=== NZO_SiteLayout/zeo_recipes.mk 1.2 => 1.3 ===
 #
 #     - ZEO_CHECKOUT should be set to the version-qualified name, under
-#       'src', of the StandaloneZODB software package, e.g.
-#       'src/StandaloneZODB-1.0-final'.
+#       'src', of the ZEO software package, e.g.  'src/ZEO-1.0-head'.
 #       This value is normally spelled out in the main makefile, and
 #       must correspond to one of the checkouts in 'cvs.mk'.
 #
@@ -19,34 +18,27 @@
 	${CD} ${BASE_DIR}/src \
       && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}
 
-ZEO_SETUP_SRC=${ZEO_CHECKOUT:%=%/setup.py}
+ZEO_CHANGES_SRC=${ZEO_CHECKOUT:%=%/CHANGES.txt}
 
-${ZEO_SETUP_SRC}: %/setup.py : %
+${ZEO_CHANGES_SRC}: %/CHANGES.txt : %
 
 ZEO_BUILD=${ZEO_CHECKOUT:src/%=opt/%}
 
-ZEO_SETUP=${ZEO_BUILD:%=%/setup.py}
+ZEO_CHANGES=${ZEO_BUILD:%=%/CHANGES.txt}
 
-${ZEO_BUILD}: % : %/setup.py
+${ZEO_BUILD}: % : %/CHANGES.txt
 
-${ZEO_SETUP}: opt/%: src/%
+${ZEO_CHANGES}: opt/%: src/%
 	${RM} ${@D}
 	${MKDIR} ${@D}
 	${COPY_FROM_SRC} ${BASE_DIR}/${<D} ${BASE_DIR}/${@D}
 
-opt/StandaloneZODB: ${ZEO_BUILD}
+opt/ZEO: ${ZEO_BUILD}
 	${CD} ${BASE_DIR}/${@D} && ${LNSF} ${<F} ${@F}
 
-opt/StandaloneZODB/setup.py: ${ZEO_SETUP} opt/StandaloneZODB
+opt/ZEO/CHANGES.txt: ${ZEO_CHANGES} opt/ZEO
 
-opt/Python2/lib/python2.1/site-packages/Acquisition.so: opt/StandaloneZODB/setup.py
-	${CD} ${BASE_DIR}/opt/StandaloneZODB && \
-		${BASE_DIR}/bin/python setup.py build
-	${CD} ${BASE_DIR}/opt/StandaloneZODB && \
-		${BASE_DIR}/bin/python setup.py install
-
-zeo: opt/StandaloneZODB/setup.py \
-     opt/Python2/lib/python2.1/site-packages/Acquisition.so
+zeo: opt/ZEO/CHANGES.txt
 
 zeo_usage:
 	@${ECHO} "   zeo -- Build ZEO pseudo-binary."


=== NZO_SiteLayout/zeo_targets.mk 1.2 => 1.3 ===
-#	StandaloneZODB package targets
+#	Standard ZEO package targets
 #=======================================================================
 
 ZEO_OPT_TARGETS=\
-opt/StandaloneZODB \
-opt/Python2/lib/python2.1/site-packages/Acquisition.so \
+opt/ZEO \