]> rtime.felk.cvut.cz Git - rpp-test-sw.git/commitdiff
Fix version in release package
authorMichal Horn <hornmich@fel.cvut.cz>
Thu, 11 Dec 2014 13:26:20 +0000 (14:26 +0100)
committerMichal Horn <hornmich@fel.cvut.cz>
Thu, 11 Dec 2014 13:26:20 +0000 (14:26 +0100)
The version has been unknown when built from the repeased project,
because no git files are distributed in the package.

The version.h file is generated when making the release package and copied
to the cmdproc/include directory, the Makefile.version is removed as it is
not needed anymore in the released package.

Makefile

index d75a09e204849f3383f7bb872426872c63828fc3..e08d7a5d0e42fc06a5ae8f6a34f9fba09e41d80b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,18 +47,20 @@ uncrustify:
 release: $(RELEASE_BASENAME).zip
 
 $(RELEASE_BASENAME):: lib
+       @echo 'Get version from git'
+       $(MAKE) -f $(CURDIR)/rpp-test-sw/Makefile.version version.h
+       @echo ' '
+
        mkdir -p $@/rpp-lib/rpp/
-       mkdir -p $@/rpp-lib/os/7.0.2_tms570
-       mkdir -p $@/rpp-lib/lwip/src
+       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/TMS570LS313xFlashLnk.cmd $@/rpp-lib/rpp/TMS570LS313xFlashLnk.cmd
-       cp -r rpp-lib/os/7.0.2_tms570/include $@/rpp-lib/os/7.0.2_tms570/include
-       cp -r rpp-lib/lwip/src/include $@/rpp-lib/lwip/src/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
+       mv version.h $@/rpp-test-sw/cmdproc/include/version.h
+       rm $@/rpp-test-sw/Makefile.version
 
 lib:
        $(MAKE) -C rpp-lib/Release