From 75bc87ad449d745fd0483916419c650e59e9a57a Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 16 Dec 2018 10:42:23 +0000 Subject: [PATCH] make, scripts: Rename CVS_PROJ_DIR to PROJECTS_DIR Signed-off-by: Jan Lindemann --- make/defs.mk | 2 +- make/js.mk | 4 ++-- make/projects.mk | 8 ++++---- make/run.mk | 2 +- make/standalone-exe.mk | 2 +- make/tex.mk | 2 +- scripts/jw-build-create-project.sh | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index b76ea9f7..be768666 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -40,7 +40,7 @@ BIN_INSTALL := /usr/bin/install SUDO ?= /usr/bin/sudo # ----- standard variables -CVSTOPDIR ?= $(CVS_PROJ_DIR)/.. +CVSTOPDIR ?= $(PROJECTS_DIR)/.. ifeq ($(PROJECT),) PROJECT := $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); $(PWD) | $(SED) 's/.*\///; s/-[0-9].*//'))) diff --git a/make/js.mk b/make/js.mk index 7bd4fed1..5c71ee21 100644 --- a/make/js.mk +++ b/make/js.mk @@ -3,8 +3,8 @@ JS_MINIFY_FILTER_IN ?= sed 's/console\.[a-z]\+([^)]\+) *;//g' JS_SRC ?= $(filter-out %.min.js,$(wildcard *.js)) JS_GENERATED ?= $(patsubst %.js,%.min.js,$(JS_SRC)) JS_EXTRA_EXTERNS ?= -JS_CC_BUILD_ROOT ?= $(CVS_PROJ_DIR)/closure-compiler/contrib/closure-compiler/install-root -JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(CVS_PROJ_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs)) +JS_CC_BUILD_ROOT ?= $(PROJECTS_DIR)/closure-compiler/contrib/closure-compiler/install-root +JS_EXTERNS_DIRS ?= $(firstword $(wildcard $(JS_CC_BUILD_ROOT)/$(realpath $(PROJECTS_DIR))/closure-compiler/share/externs /opt/closure-compiler/share/externs)) JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) JS_EXTERN_PATHS ?= $(wildcard $(foreach d,$(JS_EXTERNS_DIRS),$(addprefix $d/,$(JS_EXTERNS)))) JS_MINIFY_OPTS ?= $(addprefix --externs ,$(JS_EXTERN_PATHS)) --compilation_level ADVANCED --strict_mode_input diff --git a/make/projects.mk b/make/projects.mk index 1c3e2cc8..6fd9b5c8 100644 --- a/make/projects.mk +++ b/make/projects.mk @@ -5,17 +5,17 @@ VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION)) DEVELOPMENT ?= $(shell grep -q 'dev' $(VERSION_FILE) && echo true) # -- Conclude the build system's location: -CVS_PROJ_DIR ?= $(TOPDIR)/.. +PROJECTS_DIR ?= $(TOPDIR)/.. ifeq ($(DEVELOPMENT),true) - PROJECTS_DIR ?= $(CVS_PROJ_DIR) + PRJS_DIR ?= $(PROJECTS_DIR) else - PROJECTS_DIR ?= /opt + PRJS_DIR ?= /opt endif MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin)) # -- Query the build system about other projects: PYTHON ?= /usr/bin/python2 -proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) +proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PRJS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query = $(shell $(proj_query_cmd) $(1)) proj_dir = $(call proj_query,proj-dir $(1)) htdocs_dir = $(call proj_query,htdocs-dir $(1)) diff --git a/make/run.mk b/make/run.mk index 76b41c5d..ca16fe38 100644 --- a/make/run.mk +++ b/make/run.mk @@ -26,7 +26,7 @@ endif endif EXE_PATH ?= ./$(EXE) -CHECK_CONF_EXE ?= $(firstword $(wildcard $(CVS_PROJ_DIR)/valdi/bin/checkconf) checkconf) +CHECK_CONF_EXE ?= $(firstword $(wildcard $(PROJECTS_DIR)/valdi/bin/checkconf) checkconf) LOCAL_CFLAGS += -DEXE_NAME=\"$(EXE)\" LOCAL_CPPFLAGS += -DEXE_NAME=\"$(EXE)\" diff --git a/make/standalone-exe.mk b/make/standalone-exe.mk index da2f7286..d3900748 100644 --- a/make/standalone-exe.mk +++ b/make/standalone-exe.mk @@ -8,7 +8,7 @@ DIST_VERSION ?= $(VERSION) #USE_CFG_XXX_MK ?= false USE_PROJECT_LIB ?= false DEVELOPMENT ?= true -CVS_PROJ_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. +PROJECTS_DIR := $(dir $(lastword $(MAKEFILE_LIST)))/../.. ifeq ($(PROJECT),) PROJECT = $(notdir $(shell $(PWD))) diff --git a/make/tex.mk b/make/tex.mk index 147c2a39..d9bdb699 100644 --- a/make/tex.mk +++ b/make/tex.mk @@ -38,7 +38,7 @@ TEX_TMPL_BASE_DIR ?= $(MODDIR)/tmpl/tex TEX_TMPL_STYLE ?= de_technical TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) -WWW_IMAGEDIR ?= $(CVS_PROJ_DIR)/jw-build/htdocs/images/logo-janware/ +WWW_IMAGEDIR ?= $(PROJECTS_DIR)/jw-build/htdocs/images/logo-janware/ FRONTLOGO_PDF ?= logo-janware.pdf FRONTLOGO_EPS ?= janware-frontpage-top-right.png FRONTLOGO_WEB ?= janware-frontpage-top-right.png diff --git a/scripts/jw-build-create-project.sh b/scripts/jw-build-create-project.sh index 00b34b9d..a367cdb6 100644 --- a/scripts/jw-build-create-project.sh +++ b/scripts/jw-build-create-project.sh @@ -54,12 +54,12 @@ cat_make_proj_mk() cat <<-EOT # to be included from inside the project directory - CVS_PROJ_DIR ?= \$(TOPDIR)/.. + PROJECTS_DIR ?= \$(TOPDIR)/.. ifeq (\$(TARGET),mingw) FLAVOUR_PATH_PREFIX = win32/ endif - MODDIR = \$(firstword \$(wildcard \$(CVS_PROJ_DIR)/jw-build /opt/\$(FLAVOUR_PATH_PREFIX)jw-build)) + MODDIR = \$(firstword \$(wildcard \$(PROJECTS_DIR)/jw-build /opt/\$(FLAVOUR_PATH_PREFIX)jw-build)) USE_PROJECT_LIB = false HDRDIR_SCOPE_SUFFIX = \$(PROJECT)