HGROOT now default to parent of directory containing makefile. Added more instruction in Dockerfile
--- a/Dockerfile Tue Dec 05 00:11:48 2017 +0100
+++ b/Dockerfile Wed Dec 06 09:56:32 2017 +0100
@@ -1,8 +1,17 @@
# Builds Beremiz windows installer
-# usage :
+# initialize :
# docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g) -t beremiz_builder .
+#
+# build installer as-is :
# docker run -v ~/src:/home/devel/src -v ~/build/:/home/devel/build --rm beremiz_builder
+#
+# to use on code-build-test cycle :
+# docker create --name current -v ~/src:/home/devel/src -v ~/build/:/home/devel/build -i -t beremiz_builder /bin/bash
+# docker start -i current
+# # call build operations from here
+# docker stop current
+# docker rm current
FROM ubuntu:xenial
--- a/Makefile Tue Dec 05 00:11:48 2017 +0100
+++ b/Makefile Wed Dec 06 09:56:32 2017 +0100
@@ -27,8 +27,9 @@
version = 1.2-rc1
+src := $(shell dirname $(lastword $(MAKEFILE_LIST)))
HGREMOTE ?= https://hg.beremiz.org/
-HGROOT ?= $(abspath $(CURDIR)/..)
+HGROOT ?= $(abspath $(src)/..)
GITROOT := $(HGROOT)
DIST =
CPUS = 8
@@ -45,7 +46,6 @@
cp $(CROSS_COMPILE_LIBS_DIR)/libstdc++-6.dll $(1)
endef
-src := $(shell dirname $(lastword $(MAKEFILE_LIST)))
distfiles = $(src)/distfiles
sfmirror = downloads
tmp := $(shell mktemp -d)