Update build scripts

.gitignore

@@ -1,6 +1,5 @@
 # Java
 .idea/
-target/
 dependency-reduced-pom.xml
 
 # Node

.templates/go/default.mk

@@ -3,14 +3,41 @@ GOPATH := $(shell go env GOPATH)
 GO_SOURCE_FILES = $(shell find . -name "*.go")
 
 SUBREPO := $(shell cat .subrepo)
+LIBNAME := $(shell cat .subrepo | cut -d'/' -f2)
+GOX_LDFLAGS := "-X main.version=${TRAVIS_TAG}"
+EXES := $(shell find dist -name '$(LIBNAME)-*')
+UPX_EXES = $(patsubst dist/$(LIBNAME)-%,dist_compressed/$(LIBNAME)-%,$(EXES))
 IN_GOPATH := $(shell [[ "$$(pwd)" == ${GOPATH}/* ]] && echo 1 || echo 0)
 ifeq ($(IN_GOPATH), 0)
 .deps: .linked
 endif
 
+ifneq (,$(wildcard ./cli))
+default: .dist
+endif
+
 default: .tested
 .PHONY: default
 
+.dist: .deps
+	mkdir -p dist
+	gox -ldflags $(GOX_LDFLAGS) -output "dist/$(LIBNAME)-{{.OS}}-{{.Arch}}" -rebuild ./cli
+	touch $@
+
+dist/$(LIBNAME)-%: .dist
+
+.dist-compressed: $(UPX_EXES)
+	touch $@
+
+dist_compressed/$(LIBNAME)-%: dist/$(LIBNAME)-%
+	mkdir -p dist_compressed
+	# requires upx in PATH to compress supported binaries
+	# may produce an error ARCH not supported
+	-upx $< -o $@
+
+	# Test the integrity
+	if [ -f "$@" ]; then upx -t $@ || rm $@; fi
+
 # Symlink this dir to GOPATH
 .linked:
 	mkdir -p $$(dirname ${GOPATH}/src/github.com/${SUBREPO})
@@ -33,5 +60,5 @@ clean: clean-go
 .PHONY: clean
 
 clean-go:
-	rm -f .deps .linked .tested
+	rm -rf .deps .linked .tested dist/* dist_compressed
 .PHONY: clean-go

.templates/java/default.mk

@@ -0,0 +1,26 @@
+SHELL := /usr/bin/env bash
+JAVA_SOURCE_FILES = $(shell find . -name "*.java")
+
+ifdef TRAVIS_BRANCH
+	LIBRARY_VERSION=$(TRAVIS_BRANCH)
+endif
+ifdef TRAVIS_TAG
+	LIBRARY_VERSION=$(TRAVIS_TAG)
+endif
+ifndef LIBRARY_VERSION
+	LIBRARY_VERSION=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+default: .tested
+.PHONY: default
+
+.tested: pom.xml $(JAVA_SOURCE_FILES) .deps
+	mvn install
+	touch $@
+
+clean: clean-java
+.PHONY: clean
+
+clean-java:
+	rm -rf target .deps .tested
+.PHONY: clean-java

.templates/s3-download

@@ -3,6 +3,9 @@
 # Downloads cross-compiled go executables for bundling inside platform-
 # specific packages such as gem, jar, npm module etc.
 #
+# If the files are available locally, they are copied. If not, they
+# are downloaded from S3.
+#
 set -euf -o pipefail
 
 basename=$1
@@ -35,10 +38,16 @@ for platform in \
   windows-386.exe \
   windows-amd64.exe
 do
-  # cURL occasionaly fails. Try up to 3 times with a 5 sec sleep in-betweeen.
-  for i in 1 2 3; do 
-    url="${baseurl}/${basename}/${version}/${basename}-${platform}"
-    file="${basename}/${basename}-${platform}"
-    curl "${url}" -o "${file}" && chmod +x "${file}" && break || sleep 5;
-  done
+  src_url="${baseurl}/${basename}/${version}/${basename}-${platform}"
+  src_file="../go/dist/${basename}-${platform}"
+  file="${basename}/${basename}-${platform}"
+
+  if [ -e ${src_file} ]; then
+    cp ${src_file} ${file}
+  else
+    # cURL occasionaly fails. Try up to 3 times with a 5 sec sleep in-betweeen.
+    for i in 1 2 3; do 
+      curl "${src_url}" -o "${file}" && chmod +x "${file}" && break || sleep 5;
+    done
+  fi
 done

config/java/.gitignore

@@ -3,3 +3,5 @@
 target/
 release.properties
 pom.xml.releaseBackup
+.deps
+.tested

config/java/Makefile

@@ -1,10 +1,4 @@
-default: .built
-.PHONY: default
+include default.mk
 
-.built: pom.xml
-	mvn install
-	touch $@
-
-clean:
-	rm -rf target .built
-.PHONY: clean
+.deps:
+	touch $@

config/java/default.mk

@@ -0,0 +1,26 @@
+SHELL := /usr/bin/env bash
+JAVA_SOURCE_FILES = $(shell find . -name "*.java")
+
+ifdef TRAVIS_BRANCH
+	LIBRARY_VERSION=$(TRAVIS_BRANCH)
+endif
+ifdef TRAVIS_TAG
+	LIBRARY_VERSION=$(TRAVIS_TAG)
+endif
+ifndef LIBRARY_VERSION
+	LIBRARY_VERSION=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+default: .tested
+.PHONY: default
+
+.tested: pom.xml $(JAVA_SOURCE_FILES) .deps
+	mvn install
+	touch $@
+
+clean: clean-java
+.PHONY: clean
+
+clean-java:
+	rm -rf target .deps .tested
+.PHONY: clean-java

cucumber-expressions/go/default.mk

@@ -3,14 +3,41 @@ GOPATH := $(shell go env GOPATH)
 GO_SOURCE_FILES = $(shell find . -name "*.go")
 
 SUBREPO := $(shell cat .subrepo)
+LIBNAME := $(shell cat .subrepo | cut -d'/' -f2)
+GOX_LDFLAGS := "-X main.version=${TRAVIS_TAG}"
+EXES := $(shell find dist -name '$(LIBNAME)-*')
+UPX_EXES = $(patsubst dist/$(LIBNAME)-%,dist_compressed/$(LIBNAME)-%,$(EXES))
 IN_GOPATH := $(shell [[ "$$(pwd)" == ${GOPATH}/* ]] && echo 1 || echo 0)
 ifeq ($(IN_GOPATH), 0)
 .deps: .linked
 endif
 
+ifneq (,$(wildcard ./cli))
+default: .dist
+endif
+
 default: .tested
 .PHONY: default
 
+.dist: .deps
+	mkdir -p dist
+	gox -ldflags $(GOX_LDFLAGS) -output "dist/$(LIBNAME)-{{.OS}}-{{.Arch}}" -rebuild ./cli
+	touch $@
+
+dist/$(LIBNAME)-%: .dist
+
+.dist-compressed: $(UPX_EXES)
+	touch $@
+
+dist_compressed/$(LIBNAME)-%: dist/$(LIBNAME)-%
+	mkdir -p dist_compressed
+	# requires upx in PATH to compress supported binaries
+	# may produce an error ARCH not supported
+	-upx $< -o $@
+
+	# Test the integrity
+	if [ -f "$@" ]; then upx -t $@ || rm $@; fi
+
 # Symlink this dir to GOPATH
 .linked:
 	mkdir -p $$(dirname ${GOPATH}/src/github.com/${SUBREPO})
@@ -33,5 +60,5 @@ clean: clean-go
 .PHONY: clean
 
 clean-go:
-	rm -f .deps .linked .tested
+	rm -rf .deps .linked .tested dist/* dist_compressed
 .PHONY: clean-go

cucumber-expressions/java/.gitignore

@@ -3,3 +3,5 @@
 target/
 release.properties
 pom.xml.releaseBackup
+.deps
+.tested

cucumber-expressions/java/Makefile

@@ -1,10 +1,4 @@
-default: .built
-.PHONY: default
+include default.mk
 
-.built: pom.xml
-	mvn install
-	touch $@
-
-clean:
-	rm -rf target .built
-.PHONY: clean
+.deps:
+	touch $@

cucumber-expressions/java/default.mk

@@ -0,0 +1,26 @@
+SHELL := /usr/bin/env bash
+JAVA_SOURCE_FILES = $(shell find . -name "*.java")
+
+ifdef TRAVIS_BRANCH
+	LIBRARY_VERSION=$(TRAVIS_BRANCH)
+endif
+ifdef TRAVIS_TAG
+	LIBRARY_VERSION=$(TRAVIS_TAG)
+endif
+ifndef LIBRARY_VERSION
+	LIBRARY_VERSION=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+default: .tested
+.PHONY: default
+
+.tested: pom.xml $(JAVA_SOURCE_FILES) .deps
+	mvn install
+	touch $@
+
+clean: clean-java
+.PHONY: clean
+
+clean-java:
+	rm -rf target .deps .tested
+.PHONY: clean-java

cucumber-expressions/ruby/.gitignore

@@ -1,3 +1,4 @@
 coverage/
 Gemfile.lock
 pkg/
+.tested

datatable/java/.gitignore

@@ -1,3 +1,7 @@
+.idea/
 *.iml
 target/
-dependency-reduced-pom.xml
+release.properties
+pom.xml.releaseBackup
+.deps
+.tested

datatable/java/Makefile

@@ -1,10 +1,4 @@
-default: .built
-.PHONY: default
+include default.mk
 
-.built: pom.xml
-	mvn install
-	touch $@
-
-clean:
-	rm -rf target .built
-.PHONY: clean
+.deps:
+	touch $@

datatable/java/default.mk

@@ -0,0 +1,26 @@
+SHELL := /usr/bin/env bash
+JAVA_SOURCE_FILES = $(shell find . -name "*.java")
+
+ifdef TRAVIS_BRANCH
+	LIBRARY_VERSION=$(TRAVIS_BRANCH)
+endif
+ifdef TRAVIS_TAG
+	LIBRARY_VERSION=$(TRAVIS_TAG)
+endif
+ifndef LIBRARY_VERSION
+	LIBRARY_VERSION=$(shell git rev-parse --abbrev-ref HEAD)
+endif
+
+default: .tested
+.PHONY: default
+
+.tested: pom.xml $(JAVA_SOURCE_FILES) .deps
+	mvn install
+	touch $@
+
+clean: clean-java
+.PHONY: clean
+
+clean-java:
+	rm -rf target .deps .tested
+.PHONY: clean-java

dots-formatter/go/Makefile

@@ -1,10 +1,5 @@
 include default.mk
 
-EXES := $(shell find dist -name 'dots-formatter-go-*')
-UPX_EXES = $(patsubst dist/dots-formatter-go-%,dist_compressed/dots-formatter-go-%,$(EXES))
-
-default: bin/dots-formatter
-
 .deps:
 	go get github.com/fatih/color
 	go get github.com/gogo/protobuf/io
@@ -14,28 +9,3 @@ default: bin/dots-formatter
 	# https://github.com/mitchellh/gox/pull/112
 	go get github.com/aslakhellesoy/gox
 	touch $@
-
-.dist: .deps
-	mkdir -p dist
-	gox -ldflags "-X main.version=${CIRCLE_TAG}" -output "dist/dots-formatter-go-{{.OS}}-{{.Arch}}" -rebuild ./cli
-	touch $@
-
-dist/dots-formatter-go-%: .dist
-
-.dist-compressed: $(UPX_EXES)
-	touch $@
-
-dist_compressed/dots-formatter-go-%: dist/dots-formatter-go-%
-	mkdir -p dist_compressed
-	# requires upx in PATH to compress supported binaries
-	# may produce an error ARCH not supported
-	-upx $< -o $@
-
-	# Test the integrity
-	if [ -f "$@" ]; then upx -t $@ || rm $@; fi
-
-bin/dots-formatter: .deps $(GO_SOURCE_FILES)
-	go build -o $@ ./cli
-
-clean:
-	rm -rf bin/dots-formatter dist/* dist_compressed