janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make, scripts: Rename CVS_PROJ_DIR to PROJECTS_DIR

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-16 10:42:23 +00:00
commit 75bc87ad44
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -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].*//')))

4
make/js.mk
View file

@ -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

8
make/projects.mk
View file

@ -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))

2
make/run.mk
View file

@ -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)\"

2
make/standalone-exe.mk
View file

@ -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)))

2
make/tex.mk
View file

@ -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

4
scripts/jw-build-create-project.sh
View file

@ -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)