Update hydctr_init block

[jenkicar/rpp-simulink.git] / Makefile

diff --git a/Makefile b/Makefile
index 3851d72a95e452d1c1f57414375fb2c9a96ddbd1..f0b90f428985a69d804f10aab99a0d3b1e1351d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,35 @@
-RELEASE_PREFIX = rpp-simulink
 
-include rpp/lib/Makefile.var   # for rpp_lib_* variables
-include rpp/lib/common.mk
+release4eaton:
+       $(MAKE) release RELEASE_TARGET=tms570_hydctr RELEASE_ATTR=eaton
+
+release4us:
+       $(MAKE) release RELEASE_TARGET=tms570_rpp RELEASE_ATTR=
+
+.PHONY: commit-lib-update
+commit-lib-update:
+       test $$($(TESTSW_LIB_COMMIT)) = $$($(SIMULINK_LIB_COMMIT))
+       if git --git-dir=doc/test-sw/.git diff-index --quiet HEAD -- rpp-lib; \
+       then echo "Nothing to commit in test-sw"; \
+       else git --git-dir=doc/test-sw/.git commit -m "Update lib submodule" rpp-lib; \
+       fi
+       git commit  -m "Update lib submodule" doc/test-sw rpp/lib
 
 TESTSW_LIB_COMMIT = git --git-dir=doc/test-sw/rpp-lib/.git rev-parse HEAD
 SIMULINK_LIB_COMMIT = git --git-dir=rpp/lib/.git rev-parse HEAD
 
+
+ifeq ($(or $(release_in_progress),$(MAKECMDGOALS)),release)
+export release_in_progress = release
+
+include rpp/lib/Makefile.var   # for rpp_lib_* variables
+include rpp/lib/common.mk
+
+RELEASE_TARGET = $(error Please set RELEASE_TARGET variable on command line)
+
+include rpp/lib/build/$(RELEASE_TARGET)/Makefile.config
+
+$(eval $(call release_rules,rpp-simulink))
+
 release: $(RELEASE_BASENAME).zip
        if [ $$($(SIMULINK_LIB_COMMIT)) != $$($(TESTSW_LIB_COMMIT)) ]; then echo >&2 "Library version mismatch"; exit 1; fi
        cp rpp/lib/$(shell make -C rpp/lib --silent print-release-basename).zip .
@@ -13,14 +37,8 @@ release: $(RELEASE_BASENAME).zip
        cp doc/test-sw/$(shell make -C doc/test-sw --silent print-release-basename).zip .
        cp doc/rpp_simulink.pdf rpp_simulink-$(RELEASE_VERSION).pdf
 
-
-ifneq ($(RELEASE_TARGET),)
-include rpp/lib/build/$(RELEASE_TARGET)/Makefile.config
-endif
-
-RELEASE_TARGET = $(error Please set RELEASE_TARGET variable on command line)
-
 RELEASE_LIB_GIT_FILES = \
+       common.mk \
        Makefile.var \
        build/$(RELEASE_TARGET)/$(TARGET_CCXML) \
        build/$(RELEASE_TARGET)/$(TARGET_LDCMD) \
@@ -29,16 +47,15 @@ RELEASE_LIB_GIT_FILES = \
        os/$(rpp_lib_OS)/include/ \
        rpp/include/
 
-ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
-RELEASE_LIB_GIT_FILES += lwip/src/include/
-endif
-
 RELEASE_LIB_GEN_FILES = Makefile.config rpp-lib.lib
 
 $(RELEASE_BASENAME):: LIB_RELEASE_BASENAME:=$(shell make -C rpp/lib --silent print-release-basename)
 $(RELEASE_BASENAME):: release-lib
 # Copy library headers and binaries
        git --git-dir=rpp/lib/.git archive --worktree-attributes --prefix=$@/rpp/lib/ HEAD $(RELEASE_LIB_GIT_FILES) | tar xf -
+ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
+       git --git-dir=rpp/lib/lwip/.git archive --worktree-attributes --prefix=$@/rpp/lib/lwip/ HEAD src/include/ | tar xf -
+endif
        cp --parents  $(RELEASE_LIB_GEN_FILES:%=rpp/lib/%) $@/
 # Compile and include the PDF documentation
        $(MAKE) -C doc
@@ -46,5 +63,11 @@ $(RELEASE_BASENAME):: release-lib
        cp doc/rpp_simulink.pdf $@/doc
 
 release-lib:
-       $(MAKE) -C rpp/lib/build/$(RELEASE_TARGET)/Release # Compile the lib
-       $(MAKE) -C rpp/lib release # Create release zip and directory
+# Compile the lib
+       $(MAKE) -C rpp/lib/build/$(RELEASE_TARGET)/Release
+# Create release zip and directory. Note that this also setups ignored
+# files, which is required for correct function of $(RELEASE_BASENAME)
+# target.
+       $(MAKE) -C rpp/lib release
+
+endif # release