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

make: Add dev-utils.mk for convenience targets

Browse source 
dev-utils.mk is meant to provide targets like install-to-system,
which will be invoked during development

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-27 15:10:18 +00:00
commit d684f198b2
16 changed files with 37 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/Makefile
View file

@ -13,6 +13,8 @@ include $(MODDIR)/make/dirs.mk
endif
endif
include $(MODDIR)/make/dev-utils.mk
ifeq ($(TARGET),mingw)
install: $(INSTALL_MAKEDIR)/winres.rc.tmpl
endif

1
make/conf.mk
View file

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

9
make/defs.mk
View file

@ -1082,15 +1082,6 @@ all:
nothing:
echo-vars:
make -p nothing | grep -B1 "^[A-Z_]* *[?:+]*="
echo-makefiles:
$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
cat-makefiles:
Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; sed 's/^include/#cat include/' $$f; done
doc-module:
$(BROWSER) $(JANWARE_URL_DOC_MODULE)

23
make/dev-utils.mk Normal file
View file

@ -0,0 +1,23 @@
all:
install:
clean distclean:
echo-vars:
make -p nothing | grep -B1 "^[A-Z_]* *[?:+]*="
echo-makefiles:
$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
cat-makefiles:
Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; sed 's/^include/#cat include/' $$f; done
link-in:
DEVELOPMENT=false INSTALL_LINK=1 make install
install-to-system:
sudo make DEVELOPMENT=false install
for s in $(RESTART_SERVICES); do \
sudo systemctl restart $$s ;\
done

1
make/exe.mk
View file

@ -5,6 +5,7 @@
include $(MODDIR)/make/run.mk
include $(MODDIR)/make/depend.mk
include $(MODDIR)/make/dev-utils.mk
all: $(EXE) $(BUILD_EXE_BIN) $(STRIP_DONE)
install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)

1
make/htdocs.mk
View file

@ -5,6 +5,7 @@ LESS_CPY ?= lesscpy
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/js.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/dev-utils.mk
all: $(LESS_GENERATED_CSS)
install: install_HTML

1
make/include.mk
View file

@ -1,4 +1,5 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/dev-utils.mk
# variables
SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)

2
make/install-files.mk
View file

@ -5,7 +5,9 @@ SOURCE_BASE ?= .
RELPATHS = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f"))
INSTALLED_FILES = $(addprefix $(TARGET_DIR)/,$(RELPATHS))
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/dev-utils.mk
ifeq ($(DEVELOPMENT),true)
TARGET_OWNER ?= $(shell id -un)

1
make/lib.mk
View file

@ -5,6 +5,7 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/dev-utils.mk
all:
ifeq ($(USE_PROJECT_LIB),false)

1
make/plugin.mk
View file

@ -10,6 +10,7 @@ include $(MODDIR)/make/plugin-defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/depend.mk
include $(MODDIR)/make/backup.mk
include $(MODDIR)/make/dev-utils.mk
LOCAL_CPPFLAGS += -D_PLUGIN
LOCAL_CFLAGS += -D_PLUGIN

4
make/py-mod.mk
View file

@ -1,6 +1,7 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/py-defs.mk
include $(MODDIR)/make/dirs.mk
include $(MODDIR)/make/dev-utils.mk
PY_INIT_TMPL = $(wildcard __init__.py.tmpl)
PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*//
@ -17,9 +18,6 @@ py.clean:
$(RM) -f *.done *.pyc
/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
link-in:
DEVELOPMENT=false INSTALL_SYMLINK=1 make install
install-dirs.done:
$(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIR)
touch $@

9
make/rules.mk
View file

@ -61,15 +61,6 @@ installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS)
installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH)
link-in:
DEVELOPMENT=false INSTALL_LINK=1 make install
install-to-system:
sudo make DEVELOPMENT=false install
for s in $(RESTART_SERVICES); do \
sudo systemctl restart $$s ;\
done
pckgclean:
$(RM) -rf *.zip *.tar.gz *.rpm *.deb

2
make/scripts.mk
View file

@ -6,4 +6,4 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/scripts-targets.mk
include $(MODDIR)/make/dev-utils.mk

2
make/svg.mk
View file

@ -50,5 +50,3 @@ copied-%.svg: $(SVG)
%.ico: %.png
icotool -o $@ -c $<

1
make/swig.mk
View file

@ -1,4 +1,5 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/dev-utils.mk
ifeq ($(SWIG_TARGET),php)

1
make/tools.mk
View file

@ -9,6 +9,7 @@ include $(MODDIR)/make/targets-tools.mk
include $(MODDIR)/make/cpp-extra-targets.mk
include $(MODDIR)/make/depend.mk
include $(MODDIR)/make/backup.mk
include $(MODDIR)/make/dev-utils.mk
LOCAL_CFLAGS += -D_USRDLL -DALL_EXPORTS
LOCAL_CPPFLAGS += -D_USRDLL -DALL_EXPORTS