[[ Buildbot ]] Group new definitions with existing ones, and make them clearer

livecodesebastien · livecodesebastien · commit 444fad4a29be · 2015-07-10T14:32:35.000+01:00
diff --git a/buildbot.mk b/buildbot.mk
@@ -85,7 +85,15 @@ BUILDTOOL_STACK = builder/builder_tool.livecodescript
 
 WKHTMLTOPDF ?= $(shell which wkhtmltopdf 2>/dev/null)
 
-bin_dir = $(BUILD_PLATFORM)-bin
+# Those directories are given to the tool builder, and they might get passed
+# (like private-dir) to engine functions, to which a path relative to this file
+# becomes invalid).
+top_src_dir=$(pwd)
+engine_dir=${top_src_dir}
+output_dir=${top_src_dir}
+work_dir=${top_src_dir}/_cache/builder_tool
+private_dir=${top_src_dir}/..
+bin_dir = ${top_src_dir}/$(BUILD_PLATFORM)-bin
 
 ifeq ($(BUILD_PLATFORM),mac)
   LIVECODE = $(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community
@@ -96,18 +104,10 @@ else ifeq ($(BUILD_PLATFORM),linux-x86)
 endif
 
 # FIXME add --warn-as-error
-# Those directories are given to the tool builder, and they might get passed
-# (like private-dir) to engine functions, to which a path relative to this file
-# becomes invalid).
-ENGINE_DIR=$(pwd)
-OUTPUT_DIR=$(pwd)
-WORK_DIR=-$(pwd)/_cache/builder_tool
-PRIVATE_DIR=$(pwd)/..
-
 buildtool_command = $(LIVECODE) -ui $(BUILDTOOL_STACK) \
 	--build $(BUILD_STABILITY) \
-	--engine-dir ${ENGINE_DIR} --output-dir ${OUTPUT_DIR} --work-dir ${WORK_DIR} \
-	--private-dir ${PRIVATE_DIR}
+	--engine-dir ${engine_dir} --output-dir ${output_dir} --work-dir ${work_dir} \
+	--private-dir ${private_dir}
 
 # Settings for upload
 RSYNC ?= rsync
