Update plone3 skeleton

[zope-bootstrap.git] / Makefile.buildout

diff --git a/Makefile.buildout b/Makefile.buildout
index 47c5738..4f71535 100644 (file)
--- a/Makefile.buildout
+++ b/Makefile.buildout
@@ -77,27 +77,52 @@ define buildout_opt
     _buildout_opt
 endef
 
-buildout-net.cfg: buildout.cfg
-       @$(buildout_opt) buildout.cfg add buildout download_cache $(DLCACHE)/downloads
-       @$(buildout_opt) buildout.cfg add buildout extends-cache $(DLCACHE)/extends
-       @$(buildout_opt) buildout.cfg set buildout install_from_cache true
-       @$(buildout_opt) buildout.cfg set buildout newest true
+buildout-net.cfg buildout-nonet.cfg: buildout.cfg
        mkdir -p $(DLCACHE)/downloads $(DLCACHE)/extends
-       @(                                      \
-           echo "[buildout]";                  \
-           echo "extends = buildout.cfg";      \
-           echo "install-from-cache = false";  \
-           echo "newest = true";               \
+       @(                                                      \
+           echo "[buildout]";                                  \
+           echo "extends = buildout.cfg";                      \
+           echo "download-cache = $(DLCACHE)/downloads";       \
+           echo "extends-cache = $(DLCACHE)/extends";          \
+           echo "install-from-cache = true";                   \
+           echo "newest = false";                              \
+       ) > buildout-nonet.cfg
+       @(                                                      \
+           echo "[buildout]";                                  \
+           echo "extends = buildout.cfg";                      \
+           echo "download-cache = $(DLCACHE)/downloads";       \
+           echo "extends-cache = $(DLCACHE)/extends";          \
+           echo "install-from-cache = false";                  \
+           echo "newest = true";                               \
        ) >  buildout-net.cfg
 
 BUILDOUT_OPTS = -c buildout-net.cfg
 
-init-nonet: BUILDOUT_OPTS =
-update-nonet: BUILDOUT_OPTS =
+init-nonet: BUILDOUT_OPTS = -c buildout-nonet.cfg
+update-nonet: BUILDOUT_OPTS = -c buildout-nonet.cfg
 
 bootstrap::
        sed -i -e '1s/^#!.*\/python/#!$(subst /,\/,$(PYTHON))/' $(PYTHON_DIR)/bin/*
        $(PYTHON) -c 'from zc.buildout.buildout import main; main(["bootstrap"])'
 
+update::
+       bin/buildout $(BUILDOUT_OPTS)
+
 .gitignore::
+       @$(gitignore) "*.egg-info/"
        @$(gitignore) "/buildout-net.cfg"
+       @$(gitignore) "/buildout-nonet.cfg"
+
+clean::
+       rm -f buildout-net.cfg buildout-nonet.cfg
+
+versions:
+       @echo "# Add the following lines to [versions] in buildout.cfg to pin all packages"
+       @bin/buildout -vvvvv | sed -ne 's/^Picked: //p' | sort | uniq 
+.PHONY: versions
+
+fullhelp::
+       @echo "    versions"
+       @echo "        Generate lines to be added to 'buildout.cfg' to pin all package"
+       @echo "        versions."
+       @echo