Update plone3 skeleton

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

diff --git a/Makefile.zope3-buildout b/Makefile.zope3-buildout
index 5f6edb7..9febf85 100644 (file)
--- a/Makefile.zope3-buildout
+++ b/Makefile.zope3-buildout
@@ -13,16 +13,16 @@ buildout.cfg:
            echo "zopeproject --no-buildout \"$(PROJECTNAME)\"" &&                                                         \
            (echo "$(ADMINUSER)"; echo "$(ADMINPWD)"; echo "$(EGGDIR)") | $(ZOPEPROJECT) --no-buildout "$(PROJECTNAME)" && \
            mv $(PROJECTNAME)/* $(BASEDIR)/                                                                                \
-       ) || ( rm -f temp-project; false )
-       @(rm -rf $(BASEDIR)/temp-project)
+       ) || ( rm -rf temp-project; false )
        @echo
+       @(rm -rf $(BASEDIR)/temp-project)
 
 ###########################################################################
 
 eggs::
-       $(EASY_INSTALL) zopeproject
+       @$(install) zopeproject
 
-buildout:: buildout.cfg
+buildout:: buildout.cfg buildout-net.cfg buildout-nonet.cfg
 
 bootstrap::
        @[ -n "$(PROJECTNAME)" ] || (echo "PROJECTNAME not set"; exit 2)
@@ -38,18 +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
+
+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