modify how variables are processed

we want to have release specific vars.mk file. in the current implementation
vars.mk is sourced in the makefile and we can't have more than one. let's split
the variable processing in their own shell script, so that we can have several
vars.mk files.

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

3 files changed, 16 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index ad185ab..70d11aa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 # required so that further += assignment are immediate, not defered...
 TEXTILE:=
 include ubuntu/boards/snapdragon/Makefile
-include vars.mk
 
 HTML=$(subst .textile,.html,$(TEXTILE))
 
@@ -19,4 +18,4 @@ clean:
 %.textile: %.textile.in vars.mk Makefile
 	@echo "Processing $< to $@"
 	@cp $< $@
-	@perl -p -e 's/##(\w+)##/$$ENV{$$1}/eg' < $< > $@
+	@./vars.sh ./vars.mk $< $@
diff --git a/vars.mk b/vars.mk
index 6408784..4035040 100644
--- a/vars.mk
+++ b/vars.mk
@@ -1,11 +1,11 @@
-export RELEASE:=15.04
-export VERSION:=20150417-100
-export UBUNTU_REL:=14.10
-export KERNEL_VER:=3.19.0
-export UBUNTU_REL_NICK:=utopic
-export INFORCE_VERSION:=Inforce IFC6410 Android BSP Rel v1.5
-export INFORCE_FILE:=Inforce-IFC6410_AndroidBSP_880160_Rel_Beta_V1.5.zip
-export INFORCE_STRIP:=--strip-components 8 proprietary/prebuilt/target/product/msm8960/system/etc/firmware/
-export EINFOCHIPS_VERSION:=eInfochips-ERAGON600-Ubuntu-Linux-BSP-Relv1.0
-export EINFOCHIPS_FILE:=firmware-eragon600-v1.0.img
-export LINARO_GCC:=http://releases.linaro.org/14.11/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf.tar.xz
+export RELEASE="15.04"
+export VERSION="20150417-100"
+export UBUNTU_REL="14.10"
+export KERNEL_VER="3.19.0"
+export UBUNTU_REL_NICK="utopic"
+export INFORCE_VERSION="Inforce IFC6410 Android BSP Rel v1.5"
+export INFORCE_FILE="Inforce-IFC6410_AndroidBSP_880160_Rel_Beta_V1.5.zip"
+export INFORCE_STRIP="--strip-components 8 proprietary/prebuilt/target/product/msm8960/system/etc/firmware/"
+export EINFOCHIPS_VERSION="eInfochips-ERAGON600-Ubuntu-Linux-BSP-Relv1.0"
+export EINFOCHIPS_FILE="firmware-eragon600-v1.0.img"
+export LINARO_GCC="http://releases.linaro.org/14.11/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2014.11-x86_64_arm-linux-gnueabihf.tar.xz"
diff --git a/vars.sh b/vars.sh
new file mode 100755
index 0000000..d0c2579
--- /dev/null
+++ b/vars.sh
@@ -0,0 +1,4 @@
+#/bin/sh
+source "$1"
+perl -p -e 's/##(\w+)##/$ENV{$1}/eg' < $2 > $3
+