Rewrite Makefile to look the same as the one for RM48

diff --git a/Makefile b/Makefile
index 084d152e291b23f08f9ed56094aacbf64d6a2ca5..84541b62f24eacf91eba048f72ca6b2df79e9afc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,25 +3,29 @@ RELEASE_PREFIX = rpp-simulink
 include rpp/lib/common.mk
 
 release: $(RELEASE_BASENAME).zip
-       $(MAKE) -C rpp/lib release
        cp rpp/lib/rpp-lib-*.zip .
        $(MAKE) -C doc/test-sw release
        cp doc/test-sw/rpp-test-*.zip .
        cp doc/rpp_simulink.pdf rpp_simulink-$(RELEASE_VERSION).pdf
 
+cp_lib = cd rpp/lib/$(LIB_RELEASE_BASENAME) && cp --parents $(1) ../../../$(@)/rpp/lib/
+
+$(RELEASE_BASENAME):: LIB_RELEASE_BASENAME:=$(shell make -C rpp/lib --silent print-release-basename)
 $(RELEASE_BASENAME):: lib
-       mkdir -p $@/rpp/lib/rpp
-       mkdir -p $@/rpp/lib/os/7.0.2
-       mkdir -p $@/rpp/lib/lwip/src
+# Copy compiled library
+       mkdir -p $@/rpp/lib
        cp --parents rpp/lib/rpp-lib.lib $@/
-       cp -r rpp/lib/rpp/include $@/rpp/lib/rpp/include
-       cp rpp/lib/rpp/TMS570LS313xFlashLnk.cmd $@/rpp/lib/rpp/TMS570LS313xFlashLnk.cmd
-       cp rpp/lib/rpp/TMS570LS3137.ccxml $@/rpp/lib/rpp/TMS570LS3137.ccxml
-       cp -r rpp/lib/os/7.0.2/include $@/rpp/lib/os/7.0.2/include
-       cp -r rpp/lib/lwip/src/include $@/rpp/lib/lwip/src/include
+# Copy library headers and linkes scripts
+       $(call cp_lib,rpp/TMS570LS313xFlashLnk.cmd)
+       $(call cp_lib,-r rpp/include)
+       $(call cp_lib,-r os/7.0.2/include)
+       $(call cp_lib,-r lwip/src/include)
+       cp --parents rpp/loadti/TMS570LS3137.ccxml $@/
+# Compile and include the PDF documentation
        $(MAKE) -C doc
        mkdir -p $@/doc
        cp doc/rpp_simulink.pdf $@/doc
 
 lib:
-       $(MAKE) -C rpp/lib/Release
+       $(MAKE) -C rpp/lib/Release # Compile the lib
+       $(MAKE) -C rpp/lib release # Create release zip and directory

diff --git a/doc/test-sw b/doc/test-sw
index 2bcb6f920a48631c64ebaa3bdf816c28ca6e8366..ceb024f41dd73a21f7305563a208d6f5b37ab9ec 160000 (submodule)
--- a/doc/test-sw
+++ b/doc/test-sw
@@ -1 +1 @@
-Subproject commit 2bcb6f920a48631c64ebaa3bdf816c28ca6e8366
+Subproject commit ceb024f41dd73a21f7305563a208d6f5b37ab9ec

diff --git a/rpp/lib b/rpp/lib
index 84387148f18f67f1c9509ec7537c761a4e4a5b55..8c4b1e5b6874e89807a7d5061c6646c77c38933e 160000 (submodule)
--- a/rpp/lib
+++ b/rpp/lib
@@ -1 +1 @@
-Subproject commit 84387148f18f67f1c9509ec7537c761a4e4a5b55
+Subproject commit 8c4b1e5b6874e89807a7d5061c6646c77c38933e

diff --git a/rpp/loadti/TMS570LS3137.ccxml b/rpp/loadti/TMS570LS3137.ccxml
new file mode 100644 (file)
index 0000000..5068b36
--- /dev/null
+++ b/rpp/loadti/TMS570LS3137.ccxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<configurations XML_version="1.2" id="configurations_0">
+    <configuration XML_version="1.2" id="configuration_0">
+        <instance XML_version="1.2" desc="Texas Instruments XDS100v2 USB Emulator" href="connections/TIXDS100v2_Connection.xml" id="Texas Instruments XDS100v2 USB Emulator" xml="TIXDS100v2_Connection.xml" xmlpath="connections"/>
+        <connection XML_version="1.2" id="Texas Instruments XDS100v2 USB Emulator">
+            <instance XML_version="1.2" href="drivers/tixds100v2icepick_c.xml" id="drivers" xml="tixds100v2icepick_c.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cs_dap.xml" id="drivers" xml="tixds100v2cs_dap.xml" xmlpath="drivers"/>
+            <instance XML_version="1.2" href="drivers/tixds100v2cortexR.xml" id="drivers" xml="tixds100v2cortexR.xml" xmlpath="drivers"/>
+            <platform XML_version="1.2" id="platform_0">
+                <instance XML_version="1.2" desc="TMS570LS3137" href="devices/tms570ls3137.xml" id="TMS570LS3137" xml="tms570ls3137.xml" xmlpath="devices"/>
+            </platform>
+        </connection>
+    </configuration>
+</configurations>