cleanup by moving variables into a single file

Author: Cerem Cem ASLAN

Makefile

@@ -1,7 +1,14 @@
-VENV_NAME := scadajs1
+DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
+
+include $(DIR)/venv-version.txt
+VENV_NAME := $(VENV_NAME)
+$(eval VENV_PATH := $(shell echo "$$$(VENV_VERSION)"))
 APP := main
 CONFIG := ../dcs-modules.txt
 
+__test_variables:
+	@echo $(VENV_VERSION) path is set to $(VENV_PATH)
+
 .PHONY: test-es6-compat update-deps update-app-version
 
 # Check if we are in a VIRTUAL_ENV:
@@ -56,7 +63,7 @@ freeze-venv: __c
 	freeze ./requirements.txt
 
 create-venv:
-	$(if $(SCADAJS_1_ENV),$(error SCADAJS_1_ENV variable is set, use it instead: $(SCADAJS_1_ENV)))
+	$(if $(VENV_PATH),$(error $(VENV_VERSION) variable is set, use it instead: $(VENV_PATH)))
 	$(eval NODE_VERSION := $(shell echo `grep "^#node@" nodeenv.txt | cut -d@ -f2` | sed 's/^$$/system/'))
 	nodeenv --requirement=./nodeenv.txt --node=$(NODE_VERSION) --prompt="($(VENV_NAME))" --jobs=4 nodeenv
 

venv

@@ -11,7 +11,9 @@ set -e -o pipefail
 safe_source () { [[ ! -z ${1:-} ]] && source $1; _dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"; _sdir=$(dirname "$(readlink -f "$0")"); }; safe_source
 _sdir=$(dirname $(realpath ${BASH_SOURCE[0]}))
 
-ENV_VERSION="SCADAJS_1_ENV"
+source $_sdir/venv-version.txt
+
+ENV_VERSION="$VENV_VERSION"
 VENV_PATH=
 LOCAL_VENV="$_sdir/nodeenv"
 

venv-version.txt

@@ -0,0 +1,4 @@
+#VENV_NAME=scadajs2
+#VENV_VERSION=SCADAJS_2_ENV
+VENV_NAME=scadajs1
+VENV_VERSION=SCADAJS_1_ENV