Update makefile.

collective · Apr 15, 2019 · 04879bd · 04879bd
1 parent 96802b1
commit 04879bd
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -13,20 +13,21 @@ RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
 all: .installed.cfg
-	bin/test
 
 # Add the following 'help' target to your Makefile
 # And add help text after each target name starting with '\#\#'
 .PHONY: help
 help: ## This help message
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
-update:
+.PHONY: Update Makefile and Buildout
+update: ## Update Make and Buildout
 	wget -O Makefile https://raw.githubusercontent.com/kitconcept/buildout/master/Makefile
 	wget -O requirements.txt https://raw.githubusercontent.com/kitconcept/buildout/master/requirements.txt
 	wget -O plone-4.3.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-4.3.x.cfg
 	wget -O plone-5.1.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.1.x.cfg
 	wget -O plone-5.2.x.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/plone-5.2.x.cfg
+	wget -O versions.cfg https://raw.githubusercontent.com/kitconcept/buildout/master/versions.cfg
 
 .installed.cfg: bin/buildout *.cfg
 	bin/buildout
@@ -36,27 +37,32 @@ bin/buildout: bin/pip
 	bin/pip install -r requirements.txt
 	@touch -c $@
 
-build-plone-4.3: .installed.cfg
+.PHONY: Build Plone 4.3
+build-plone-4.3: .installed.cfg ## Build Plone 4.3
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-4.3.x.cfg
 
-build-plone-5.0: .installed.cfg
+.PHONY: Build Plone 5.0
+build-plone-5.0: .installed.cfg ## Build Plone 5.0
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-5.0.x.cfg
 
-build-plone-5.1: .installed.cfg
+.PHONY: Build Plone 5.1
+build-plone-5.1: .installed.cfg  ## Build Plone 5.1
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-5.1.x.cfg
-
-build-plone-5.2: .installed.cfg
+
+.PHONY: Build Plone 5.2
+build-plone-5.2: .installed.cfg  ## Build Plone 5.2
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
 	bin/buildout -c plone-5.2.x.cfg
 
-build-py3:
+ ## Build Plone 5.2 with Python 3
+build-py3:  ## Build Plone 5.2 with Python 3
 	virtualenv --python=python3 .
 	bin/pip install --upgrade pip
 	bin/pip install -r requirements.txt
@@ -65,13 +71,20 @@ build-py3:
 bin/python bin/pip:
 	virtualenv --clear --python=python$(version) .
 
-test:
+.PHONY: Test
+test:  ## Test
 	bin/test
 
-release:
+.PHONY: Code Analysis
+code-analysis:  ## Code Analysis
+	bin/code-analysis
+
+.PHONY: Release
+release:  ## Release
 	bin/fullrelease
 
-clean:
+.PHONY: Clean
+clean:  ## Clean
 	git clean -Xdf
 
 .PHONY: all clean
diff --git a/plone-4.3.x.cfg b/plone-4.3.x.cfg
@@ -9,4 +9,3 @@ pytz = 2017.3
 zope.interface = 4.1.0
 # fixes zlib failure: https://stackoverflow.com/questions/34631806/fail-during-installation-of-pillow-python-module-in-linux
 Pillow = 5.4.1
-future = 0.17.1
diff --git a/plone-5.1.x.cfg b/plone-5.1.x.cfg
@@ -1,5 +1,5 @@
 [buildout]
 extends =
     base.cfg
-    http://dist.plone.org/release/5.1.2/versions.cfg
+    http://dist.plone.org/release/5.1.5/versions.cfg
     versions.cfg