X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-test-sw.git/blobdiff_plain/8a881095e2d5960513e203866512c6fdce17709c..9c52fa3be093456e383bb5fc96c7282ddae64b56:/Makefile

diff --git a/Makefile b/Makefile
index 835aad4..165a428 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,13 @@ include rpp-lib/Makefile.var
 all: rpp-test-sw
 	$(call rmdir,$(TMP_WORKSPACE))
 
-RELEASE_PREFIX = rpp-test-sw
 include rpp-lib/common.mk
 
+TARGET ?= $(error TARGET variable not defined)
+
 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/$(TARGET)
 	$(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,28 +47,33 @@ uncrustify:
 	git diff --quiet # Check that the tree is clean
 	$(UNCRUSTIFY_ALL)
 
+$(eval $(call release_rules,rpp-test-sw))
+
 release: $(RELEASE_BASENAME).zip
 
+RELEASE_TARGET = $(TARGET)
+
+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/
+
+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/$(rpp_lib_OS)
+	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)),)
-	mkdir -p $@/rpp-lib/lwip/src
+	git --git-dir=rpp-lib/lwip/.git archive --worktree-attributes --prefix=$@/rpp-lib/lwip/ HEAD src/include/ | tar xf -
 endif
-
-	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/$(rpp_lib_$(TARGET)_LD_SCRIPT) $@/rpp-lib/rpp/$(rpp_lib_$(TARGET)_LD_SCRIPT)
-	cp -r rpp-lib/os/$(rpp_lib_OS)/include $@/rpp-lib/os/$(rpp_lib_OS)/include
-ifneq ($(filter lwip/src/include,$(rpp_lib_INCLUDES)),)
-	cp -r rpp-lib/lwip/src/include $@/rpp-lib/lwip/src/include
-endif
-
+	cp --parents  $(RELEASE_LIB_GEN_FILES:%=rpp-lib/%) $@/
 
 lib:
-	$(MAKE) -C rpp-lib/Release
+	$(MAKE) -C rpp-lib .git/info/attributes # Setup ignored files
+	$(MAKE) -C rpp-lib/build/$(RELEASE_TARGET)/Debug