Update plone3 skeleton

[zope-bootstrap.git] / Makefile.zope3-buildout

diff --git a/Makefile.zope3-buildout b/Makefile.zope3-buildout
index 6bb86c8..9febf85 100644 (file)
--- a/Makefile.zope3-buildout
+++ b/Makefile.zope3-buildout
@@ -16,28 +16,13 @@ buildout.cfg:
        ) || ( rm -rf temp-project; false )
        @echo
        @(rm -rf $(BASEDIR)/temp-project)
-       @sed -i -e '/\[buildout\]/ba' -eb -e:a                  \
-           -ea\\ -e 'download-cache = $(DLCACHE)/downloads'    \
-           -ea\\ -e 'install-from-cache = true'                \
-           -ea\\ -e 'extends-cache = $(DLCACHE)/extends'       \
-                buildout.cfg || ( rm -f buildout.cfg; false )
-       @mkdir -p $(DLCACHE)/downloads $(DLCACHE)/extends || ( rm -f buildout.cfg; false )
-
-buildout-net.cfg:
-       @(                                      \
-           echo "[buildout]";                  \
-           echo "extends = buildout.cfg";      \
-           echo "install-from-cache = false";  \
-           echo "newest = true";               \
-       ) >  buildout-net.cfg
-
 
 ###########################################################################
 
 eggs::
        @$(install) zopeproject
 
-buildout:: buildout.cfg buildout-net.cfg
+buildout:: buildout.cfg buildout-net.cfg buildout-nonet.cfg
 
 bootstrap::
        @[ -n "$(PROJECTNAME)" ] || (echo "PROJECTNAME not set"; exit 2)
@@ -53,22 +38,37 @@ bootstrap::
                echo "Generated script '$(BASEDIR)/bin/$$script'.";     \
            done                                                        \
        )
+       mkdir -p $(BASEDIR)/var $(BASEDIR)/log
 
 .gitignore::
        @$(gitignore) "/bin/"
        @$(gitignore) "/develop-eggs/"
-       @$(gitignore) "/downloads/"
+       @$(gitignore) "/$(EGGDIR)/"
        @$(gitignore) "/log/"
        @$(gitignore) "/var/"
+       @$(gitignore) "/parts/"
        @$(gitignore) "/.installed.cfg"
 
 .env::
        @$(env) PATH $(BASEDIR)/bin
 
 clean::
-       rm -rf log var develop-eggs parts
+       rm -rf bin develop-eggs $(EGGDIR) parts .installed.cfg
 
-BUILDOUT_OPTS = -c buildout-net.cfg
-
-init-nonet: BUILDOUT_OPTS =
-update-nonet: BUILDOUT_OPTS =
+varhelp::
+       @echo "    PROJECTNAME ($(PROJECTNAME))"
+       @echo "        Name of the project egg. Must be set before creating the initial"
+       @echo "         buildout."
+       @echo
+       @echo "    ADMINUSER ($(ADMINUSER))"
+       @echo "        Name of the default zope3 administrator. Only honored when creating"
+       @echo "        a new buildout. Later, configure in 'site.zcml'."
+       @echo
+       @echo "    ADMINPWD ($(ADMINPWD))"
+       @echo "        Password of the default zope3 administrator. Only honored when"
+       @echo "        creating a new buildout. Later, configure in 'site.zcml'."
+       @echo
+       @echo "    EGGDIR ($(EGGDIR))"
+       @echo "        Directory for eggs downloaded by 'buildout'. Only honored when"
+       @echo "        creating a new buildout. Later, configure in 'buildout.cfg'."
+       @echo