janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

Everywhere: Rename MODDIR -> JWBDIR

Browse source 
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:34:18 +00:00
commit b2d6e6f554
86 changed files with 279 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/Makefile
View file

@ -15,15 +15,15 @@ CACHED_VARS := WHICH PYTHON ECHO TEST BROWSER SED RM PWD ID CUT
#CACHED_VARS += DEVELOPMENT
include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/make.mk
include $(JWBDIR)/make/make.mk
ifneq ($(MAKECMDGOALS),install-links)
ifneq ($(MAKECMDGOALS),do-install-links)
include $(MODDIR)/make/dirs.mk
include $(JWBDIR)/make/dirs.mk
endif
endif
include $(MODDIR)/make/dev-utils.mk
#include $(MODDIR)/make/cache.mk
include $(JWBDIR)/make/dev-utils.mk
#include $(JWBDIR)/make/cache.mk
all:

4
make/bin.mk
View file

@ -3,8 +3,8 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-cpp.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/defs-cpp.mk
all install:
clean distclean:

2
make/cache.mk
View file

@ -10,7 +10,7 @@ CACHE_FILE_MK ?= .cache.mk
all: cache
ifneq ($(foreach g,all cache,$(findstring $(g),$(MAKECMDGOALS))),)
cache: $(CACHE_FILE_MK)
$(CACHE_FILE_MK): $(CACHED_FILES) $(MODDIR)/make/cache.mk
$(CACHE_FILE_MK): $(CACHED_FILES) $(JWBDIR)/make/cache.mk
ifeq ($(wildcard $(CACHE_FILE_MK)),)
@echo $(foreach v,$(CACHED_VARS),$v := $(value $(v))EOL) | $(SED) 's/EOL */\n/g;' | $(GREP) . | tee $@.tmp
mv $@.tmp $@

2
make/cleandirs.mk
View file

@ -5,7 +5,7 @@ install: do.install
clean: do.clean
distclean: do.distclean
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
SUBDIRS ?= $(FIND_SUBDIRS)

6
make/conf.mk
View file

@ -1,6 +1,6 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/dev-utils.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/dev-utils.mk
all:
clean: clean.conf

2
make/cpp.mk
View file

@ -1 +1 @@
include $(MODDIR)/make/tools.mk
include $(JWBDIR)/make/tools.mk

4
make/crontab.mk
View file

@ -1,5 +1,5 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/rules.mk
all:
clean: clean.conf

2
make/dav.mk
View file

@ -13,7 +13,7 @@ DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)
DAV_RSYNC_MODE ?= 664
DAV_RSYNC_DIRMODE ?= 775
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
all:
install:

16
make/defs-cpp.mk
View file

@ -460,7 +460,7 @@ BUILD_OBJ += $(addprefix $(FLAVOUR_PREFIX),$(patsubst %.sx,%.o
#PREREQ_CPP += $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.c)) \
# $(foreach dir,$(PREREQ_DIR),$(wildcard $(dir)/*.cpp))
#PREREQ_CSRC += $(PREREQ_H) $(PREREQ_C) $(PREREQ_CPP)
REQUIRED_DIR += $(patsubst %,$(MODDIR)/%,$(REQUIRED))
REQUIRED_DIR += $(patsubst %,$(JWBDIR)/%,$(REQUIRED))
REQUIRED_DONE += $(patsubst %,%/all.done,$(REQUIRED_DIR))
REQUIRED_H += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.h))
REQUIRED_C += $(foreach dir,$(REQUIRED_DIR),$(wildcard $(dir)/*.c))
@ -475,8 +475,8 @@ ALL_CSRC += $(LOCAL_CSRC) $(PREREQ_CSRC)
CORE += $(filter-out $(wildcard *.intern-state*),$(wildcard core core.* vgcore vgcore.*))
ifeq ($(USE_QT),true)
include $(MODDIR)/make/qtversion.mk
include $(MODDIR)/make/qt-defs.mk
include $(JWBDIR)/make/qtversion.mk
include $(JWBDIR)/make/qt-defs.mk
endif
ifeq ($(USE_X),true)
@ -499,10 +499,10 @@ endif
# ----- standard features, switched on with USE_XXX = true
#include $(MODDIR)/make/lib-deps.mk
#include $(JWBDIR)/make/lib-deps.mk
ifeq ($(USE_GFILTER),true)
GFILT = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
GFILT = sh $(firstword $(wildcard $(JWBDIR)/contrib/gfilt/gfilt $(JWBDIR)/bin/gfilt))
ifneq ($(strip $(GFILT)),sh)
GXX = $(GFILT)
endif
@ -598,7 +598,7 @@ ifeq ($(COMPILE_DEBUG_LOG),true)
endif
ifeq ($(USE_MPATROL),true)
FINAL_CPPFLAGS += -include $(MODDIR)/include/mpatrol.h
FINAL_CPPFLAGS += -include $(JWBDIR)/include/mpatrol.h
FINAL_LDFLAGS += -lmpatrolmt -lbfd -liberty
endif
@ -779,8 +779,8 @@ ifeq ($(USE_PROJECT_LIB),true)
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
#WINRES_RC_TMPL = $(MODDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(MODDIR)/make/winres.rc.tmpl
#WINRES_RC_TMPL = $(JWBDIR)/make/winres-minimal.rc.tmpl
WINRES_RC_TMPL = $(JWBDIR)/make/winres.rc.tmpl
WINRES_RC = $(BUILD_LIBDIR)/$(PROJECT).rc
WINRES_O = $(WINRES_RC).o
SO_SUFFIX ?= dll

10
make/defs-dev.mk
View file

@ -30,7 +30,7 @@ LOG_PREFIX ?= $(PREFIX)/log
JAVA_PREFIX ?= $(PREFIX)
HDR_SCOPE_PREFIX ?=
IMAGEDIR ?= $(MODDIR)/../../images
IMAGEDIR ?= $(JWBDIR)/../../images
CTRLDIR ?= $(ENV_PREFIX)$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
DAEMON_RUN_DIR ?= $(ENV_PREFIX)$(HOME)
PROFILE_DIR ?= $(ENV_PREFIX)$(HOME)/.profile.d$(FLAVOUR_PATH_SUFFIX)
@ -95,9 +95,9 @@ SCRIPTDIRMODE ?= $(EXEDIRMODE)
PYMODOWNER ?= $(BUILD_USER)
PYMODGROUP ?= $(BUILD_GROUP)
PYMODMODE ?= 644
PYMODDIROWNER ?= $(BUILD_USER)
PYMODDIRGROUP ?= $(BUILD_GROUP)
PYMODDIRMODE ?= 755
PYJWBDIROWNER ?= $(BUILD_USER)
PYJWBDIRGROUP ?= $(BUILD_GROUP)
PYJWBDIRMODE ?= 755
INITOWNER ?= $(EXEOWNER)
INITGROUP ?= $(EXEGROUP)
INITMODE ?= $(EXEMODE)
@ -253,7 +253,7 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options
# for using the dbmalloc lib, before you will need to do:
# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
#USE_BTOOLS ?= true
#USE_DSPFS ?= true

8
make/defs-dist.mk
View file

@ -95,9 +95,9 @@ SCRIPTDIRMODE ?= $(EXEDIRMODE)
PYMODOWNER ?= root
PYMODGROUP ?= root
PYMODMODE ?= 644
PYMODDIROWNER ?= root
PYMODDIRGROUP ?= root
PYMODDIRMODE ?= 755
PYJWBDIROWNER ?= root
PYJWBDIRGROUP ?= root
PYJWBDIRMODE ?= 755
INITDIRMODE ?= $(EXEDIRMODE)
INITOWNER ?= $(EXEOWNER)
INITGROUP ?= $(EXEGROUP)
@ -253,7 +253,7 @@ PKG_CONFIGDIRMODE ?= $(CFGDIRMODE)
# -- options
# for using the dbmalloc lib, before you will need to do:
# cd $(MODDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
# cd $(JWBDIR)/contrib/dbmalloc; tar -xzf dbmalloc-ver.sion.tar.gz
#USE_BTOOLS ?= true
#USE_DSPFS ?= true

16
make/defs.mk
View file

@ -13,7 +13,7 @@ comma := ,
# ----- executables
include $(MODDIR)/make/projects.mk
include $(JWBDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh
@ -252,7 +252,7 @@ CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
JW_BUILD_DIR = $(MODDIR)
JW_BUILD_DIR = $(JWBDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
# only works if checked out true to CVS, i.e. below proj
@ -263,19 +263,19 @@ endif
REV_SUBDIRS = $(call reverse $(SUBDIRS))
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
PCKG_DEFS_DIR = $(MODDIR)/make/defs.d
PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d
HDRDIR_SCOPE_SUFFIX ?= $(PROJECT)
CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS))
REQUIRED := $(CONTRIB_MOD) $(REQUIRED)
ifeq ($(DEVELOPMENT),true)
-include $(MODDIR)/make/defs-dev.mk
-include $(JWBDIR)/make/defs-dev.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dev.mk),)
include $(TOPDIR)/make/cfg_dev.mk
endif
else
-include $(MODDIR)/make/defs-dist.mk
-include $(JWBDIR)/make/defs-dist.mk
ifneq ($(wildcard $(TOPDIR)/make/cfg_dist.mk),)
include $(TOPDIR)/make/cfg_dist.mk
endif
@ -482,7 +482,7 @@ ifeq ($(CREATE_PKG_CONFIG),true)
INSTALLATION_FILE_TYPES += PKG_CONFIG
PKG_CONFIG += $(sort $(filter-out $(DONT_INSTALL),$(wildcard *.pc) $(LOCAL_PKG_CONFIG)))
ifeq ($(DEVELOPMENT),true)
BUILD_PKG_CONFIGDIR = $(MODDIR)/pkgconfig
BUILD_PKG_CONFIGDIR = $(JWBDIR)/pkgconfig
else
BUILD_PKG_CONFIGDIR = $(TOPDIR)/make
endif
@ -496,9 +496,9 @@ INSTALL_DIR ?= $(INSTALL)
# ----- local.mk
$(eval $(call try_include,$(MODDIR)/make/local.mk))
$(eval $(call try_include,$(JWBDIR)/make/local.mk))
#-include $(MODDIR)/make/local.mk
#-include $(JWBDIR)/make/local.mk
$(eval $(call try_include,$(TOPDIR)/make/local.mk))
$(eval $(call try_include,local.mk))

2
make/dev-utils.mk
View file

@ -48,6 +48,6 @@ cleanup-spaces:
--name-regex="$(CLEANUP_SPACES_NAME_REGEX)" \
--root=$(MAKEFILE_INDENT_ROOT)
include $(MODDIR)/make/list-files.mk
include $(JWBDIR)/make/list-files.mk
endif # ifndef DEV_UTILS_MK_INCLUDED

4
make/dirs.mk
View file

@ -10,8 +10,8 @@ ifneq ($(FORCE_REBUILD_SUBDIRS),)
.PHONY: dirs-all.done
endif
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/defs-dirs.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/defs-dirs.mk
ifeq ($(SUBDIRS_TO_ITERATE),)

8
make/dist.mk
View file

@ -10,7 +10,7 @@ TARGET_FILE_MODE = 755
TARGET_DIR_MODE = 755
DOWNLOAD_SERVER = https://www.jannet.de:443
URL_RELATIVE_PATH = $(CUSTOMER)/projects/$(LOCAL_PROJECT)/download
SSI_DOWNLOAD_TMPL = $(MODDIR)/doctmpl/html/ssi/ssi_download.html.tmpl
SSI_DOWNLOAD_TMPL = $(JWBDIR)/doctmpl/html/ssi/ssi_download.html.tmpl
DOWNLOAD_REFERRER_DIRS = $(addprefix $(UPLOAD_DOCUMENT_ROOT)/, \
$(UPLOAD_VIRTUAL_SERVER_ROOT)/$(URL_RELATIVE_PATH) \
)
@ -60,10 +60,10 @@ $(DIST_FILE): distclean
xargs tar -cf - | tar -C $(DISTDIR)/src/$(PROJECT) -xf -
echo $(DIST_VERSION) > $(DISTDIR)/src/$(PROJECT)/VERSION ;\
echo $(REQUIRED) | while read mod ;\
do make -C $(MODDIR)/$$mod clean ;\
cp -r $(MODDIR)/$$mod $(DISTDIR)/src/$(PROJECT)/mod/ ;\
do make -C $(JWBDIR)/$$mod clean ;\
cp -r $(JWBDIR)/$$mod $(DISTDIR)/src/$(PROJECT)/mod/ ;\
done ;\
cp $(MODDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ ;\
cp $(JWBDIR)/Makefile $(DISTDIR)/src/$(PROJECT)/mod/ ;\
tar -czv -C $(DISTDIR)/src/ -f $(DIST_FILE) $(PROJECT)
build.dist: $(DIST_FILE)

6
make/doc.mk
View file

@ -3,6 +3,6 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/doc-rules.mk

10
make/doxygen.mk
View file

@ -1,4 +1,4 @@
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
# broken by IMAGEDIR in rpmbuild
@ -7,13 +7,13 @@ GENERATE_DOXYGEN ?= true
endif
ifneq ($(GENERATE_DOXYGEN),true)
include $(MODDIR)/make/dummy.mk
include $(JWBDIR)/make/dummy.mk
else
UPLOAD_FILE_MODE ?= 644
UPLOAD_DIR_MODE ?= 755
include $(MODDIR)/make/upload-defs.mk
include $(JWBDIR)/make/upload-defs.mk
UPLOAD_URL ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
@ -23,7 +23,7 @@ DX_OUTPUT_DIR ?= html
DX_INSTALL_DIR ?= $(DOC_PREFIX)/devel
DX_DOC_FILES = $(DX_INCLUDE)
DX_DOXYGEN_CONF ?= doxygen.conf
DX_INCLUDE_TMPL_DIR ?= $(MODDIR)/tmpl/doxygen
DX_INCLUDE_TMPL_DIR ?= $(JWBDIR)/tmpl/doxygen
DX_FALLBACK_CONF_TMPL ?= $(DX_INCLUDE_TMPL_DIR)/doxygen.conf.tmpl
DX_BROWSER ?= $(BROWSER)
@ -91,7 +91,7 @@ $(DX_DOXYGEN_CONF): $(firstword $(wildcard $(DX_DOXYGEN_CONF).tmpl $(DX_FALLBACK
s%__PROJECT_SUMMARY__%$(PROJECT_SUMMARY)%g; \
s/__OUTPUT_DIR__/$(DX_OUTPUT_DIR)/g; \
s%__PROJECT_TOPDIR__%$(TOPDIR)%g; \
s%__MODDIR__%$(MODDIR)%g; \
s%__JWBDIR__%$(JWBDIR)%g; \
s%__FILE_PATTERNS__%$(DX_FILE_PATTERNS)%g; \
s%__INPUT_DIRS__%$(DX_INPUT_DIRS)%g; \
s%__SRC_IS_JAVA__%$(DX_SRC_IS_JAVA)%g; \

2
make/dummy.mk
View file

@ -3,7 +3,7 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(JWBDIR)/make/defs.mk
all:
clean:

6
make/exe.mk
View file

@ -3,9 +3,9 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/run.mk
include $(MODDIR)/make/depend.mk
include $(MODDIR)/make/dev-utils.mk
include $(JWBDIR)/make/run.mk
include $(JWBDIR)/make/depend.mk
include $(JWBDIR)/make/dev-utils.mk
all: $(EXE) $(BUILD_EXE_BIN) $(STRIP_DONE)
install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)

4
make/generic.mk
View file

@ -3,8 +3,8 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(JWBDIR)/make/defs.mk
include $(JWBDIR)/make/rules.mk
distclean: textclean localclean
clean: textclean localclean
install: # nothing to be done

Some files were not shown because too many files have changed in this diff Show more