X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/blobdiff_plain/5877130106aabc1e9593d240e0ff810599757e08..3d75c79c65c560208f461fdd103ba7e2065e58da:/Makefile

diff --git a/Makefile b/Makefile
index 21058dd..c48c425 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@
 # See http://processors.wiki.ti.com/index.php/Projects_-_Command_Line_Build/Create
 # and https://bugs.eclipse.org/bugs/show_bug.cgi?id=186847
 
+include rpp-lib/Makefile.var
+
 all: rpp-test-sw
 	$(call rmdir,$(TMP_WORKSPACE))
 
@@ -12,7 +14,7 @@ include rpp-lib/common.mk
 
 rpp-test-sw: $(TMP_WORKSPACE)
 	$(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-test-sw
-	$(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-lib
+	$(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectImport -ccs.location $(CURDIR)/rpp-lib/build/tms570_hdk
 	$(ECLIPSE) -noSplash -data $(TMP_WORKSPACE) -application com.ti.ccstudio.apps.projectBuild -ccs.projects rpp-test-sw
 # Previous commands do not always return non-zero exit code on build failure - invoke make directly to not miss a potential error
 	$(MAKE) -C $(CURDIR)/rpp-test-sw/Debug all
@@ -46,19 +48,31 @@ uncrustify:
 
 release: $(RELEASE_BASENAME).zip
 
+RELEASE_TARGET ?= tms570_hdk
+include rpp-lib/build/$(RELEASE_TARGET)/Makefile.config
+
+RELEASE_LIB_GIT_FILES = \
+	Makefile.var \
+	build/$(RELEASE_TARGET)/$(TARGET_LDCMD) \
+	build/Makefile.rules \
+	build/Makefile.rules.arm \
+	common.mk \
+	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 build/$(RELEASE_TARGET)/Debug/rpp-lib.lib
+
 $(RELEASE_BASENAME):: lib
-	@echo 'Get version from git'
+	@echo 'Generate version.h from git'
 	mkdir -p $@/rpp-test-sw/Debug
 	$(MAKE) -C $@/rpp-test-sw/Debug -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
 
-	mkdir -p $@/rpp-lib/rpp/
-	mkdir -p $@/rpp-lib/os/7.0.2_rm48
-
-	cp --parents rpp-lib/rpp-lib.lib rpp-lib/common.mk $@/
-	cp --parents rpp-lib/.ccsproject rpp-lib/.cproject rpp-lib/.project $@/
-	cp -r rpp-lib/rpp/include $@/rpp-lib/rpp/include
-	cp rpp-lib/rpp/RM48L952FlashLnk.cmd $@/rpp-lib/rpp/RM48L952FlashLnk.cmd
-	cp -r rpp-lib/os/7.0.2_rm48/include $@/rpp-lib/os/7.0.2_rm48/include
+	git --git-dir=rpp-lib/.git archive --worktree-attributes --prefix=$@/rpp-lib/ HEAD $(RELEASE_LIB_GIT_FILES) | tar xf -
+	cp --parents  $(RELEASE_LIB_GEN_FILES:%=rpp-lib/%) $@/
 
 lib:
-	$(MAKE) -C rpp-lib/Release
+	$(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Debug