Pack: Fixed pack description and generator script ...
... after adding new files to DSP component.
- Consider new Build section in Documentation
- Consider DSP ComputeLibrary and PrivateInclude
Change-Id: I52a44f609ab81dfcc24809e17d762dd5272c6fa3
diff --git a/ARM.CMSIS.pdsc b/ARM.CMSIS.pdsc
index cfd7317..642ea94 100644
--- a/ARM.CMSIS.pdsc
+++ b/ARM.CMSIS.pdsc
@@ -9,12 +9,12 @@
<releases>
<release version="5.7.0-dev5">
+ Active development...
CMSIS-NN: 1.3.0 (see revision history for details)
- Added MVE support
- Further optimizations for kernels using DSP extension
</release>
<release version="5.7.0-dev4">
- Active development...
CMSIS-DSP: 1.8.0 (see revision history for details)
- Added new functions and function groups
- Added MVE support
@@ -3097,7 +3097,7 @@
<!--file category="library" condition="ARMv8MML_DP_NOFPU_LE_GCC" name="CMSIS/DSP/Lib/GCC/libarm_ARMv8MMLlfdp_math.a" src="CMSIS/DSP/Source/GCC"/-->
<!--file category="library" condition="ARMv8MML_DSP_DP_LE_GCC" name="CMSIS/DSP/Lib/GCC/libarm_ARMv8MMLldfdp_math.a" src="CMSIS/DSP/Source/GCC"/-->
- <!-- IAR -->
+ <!-- IAR -->
<file category="library" condition="CM0_LE_IAR" name="CMSIS/DSP/Lib/IAR/iar_cortexM0l_math.a" src="CMSIS/DSP/Source/IAR"/>
<file category="library" condition="CM0_BE_IAR" name="CMSIS/DSP/Lib/IAR/iar_cortexM0b_math.a" src="CMSIS/DSP/Source/IAR"/>
<file category="library" condition="CM1_LE_IAR" name="CMSIS/DSP/Lib/IAR/iar_cortexM0l_math.a" src="CMSIS/DSP/Source/IAR"/>
@@ -3138,29 +3138,28 @@
<description>CMSIS-DSP Library for Cortex-M, SC000, and SC300</description>
<files>
<!-- CPU independent -->
- <file category="doc" name="CMSIS/Documentation/DSP/html/index.html"/>
- <file category="header" name="CMSIS/DSP/Include/arm_math.h"/>
- <file category="include" name="CMSIS/DSP/PrivateInclude"/>
-
- <file category="header" condition="ARMv7-A Device" name="CMSIS/DSP/ComputeLibrary/Include/NEMath.h"/>
-
- <file category="source" condition="ARMv7-A Device" name="CMSIS/DSP/ComputeLibrary/Source/arm_cl_tables.c"/>
+ <file category="doc" name="CMSIS/Documentation/DSP/html/index.html"/>
+ <file category="header" name="CMSIS/DSP/Include/arm_math.h"/>
+ <file category="include" name="CMSIS/DSP/PrivateInclude/"/>
<!-- DSP sources (core) -->
- <file category="source" name="CMSIS/DSP/Source/BasicMathFunctions/BasicMathFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/BayesFunctions/BayesFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/CommonTables/CommonTables.c"/>
- <file category="source" name="CMSIS/DSP/Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/ControllerFunctions/ControllerFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/DistanceFunctions/DistanceFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/FastMathFunctions/FastMathFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/FilteringFunctions/FilteringFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/MatrixFunctions/MatrixFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/StatisticsFunctions/StatisticsFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/SupportFunctions/SupportFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/SVMFunctions/SVMFunctions.c"/>
- <file category="source" name="CMSIS/DSP/Source/TransformFunctions/TransformFunctions.c"/>
-
+ <file category="source" name="CMSIS/DSP/Source/BasicMathFunctions/BasicMathFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/BayesFunctions/BayesFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/CommonTables/CommonTables.c"/>
+ <file category="source" name="CMSIS/DSP/Source/ComplexMathFunctions/ComplexMathFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/ControllerFunctions/ControllerFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/DistanceFunctions/DistanceFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/FastMathFunctions/FastMathFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/FilteringFunctions/FilteringFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/MatrixFunctions/MatrixFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/StatisticsFunctions/StatisticsFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/SupportFunctions/SupportFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/SVMFunctions/SVMFunctions.c"/>
+ <file category="source" name="CMSIS/DSP/Source/TransformFunctions/TransformFunctions.c"/>
+
+ <!-- Compute Library for Cortex-A -->
+ <file category="header" name="CMSIS/DSP/ComputeLibrary/Include/NEMath.h" condition="ARMv7-A Device"/>
+ <file category="source" name="CMSIS/DSP/ComputeLibrary/Source/arm_cl_tables.c" condition="ARMv7-A Device"/>
</files>
</component>
diff --git a/CMSIS/Utilities/gen_pack.bat b/CMSIS/Utilities/gen_pack.bat
index b039529..682c2c9 100644
--- a/CMSIS/Utilities/gen_pack.bat
+++ b/CMSIS/Utilities/gen_pack.bat
@@ -15,7 +15,6 @@
:: Tool path for mscgen utility
SET MSCGENPATH=C:\Program Files (x86)\Mscgen
-
:: These settings should be passed on to subprocesses as well
SET PATH=%ZIPPATH%;%DOXYGENPATH%;%MSCGENPATH%;%PATH%
@@ -60,8 +59,10 @@
XCOPY /Q /S /Y ..\..\CMSIS\Driver\*.* %RELEASE_PATH%\CMSIS\Driver\*.*
:: -- DSP files
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\ComputeLibrary\*.* %RELEASE_PATH%\CMSIS\DSP\ComputeLibrary\*.*
XCOPY /Q /S /Y ..\..\CMSIS\DSP\Include\*.* %RELEASE_PATH%\CMSIS\DSP\Include\*.*
XCOPY /Q /S /Y ..\..\CMSIS\DSP\Include\*.* %RELEASE_PATH%\CMSIS\Include\*.*
+XCOPY /Q /S /Y ..\..\CMSIS\DSP\PrivateInclude\*.* %RELEASE_PATH%\CMSIS\DSP\PrivateInclude\*.*
XCOPY /Q /S /Y ..\..\CMSIS\DSP\Source\*.* %RELEASE_PATH%\CMSIS\DSP\Source\*.*
XCOPY /Q /S /Y ..\..\CMSIS\DSP\Projects\*.* %RELEASE_PATH%\CMSIS\DSP\Projects\*.*
XCOPY /Q /S /Y ..\..\CMSIS\DSP\Examples\*.* %RELEASE_PATH%\CMSIS\DSP\Examples\*.*
@@ -108,13 +109,17 @@
ECHO Delete previous generated HTML files
PUSHD ..\Documentation
-FOR %%A IN (Core, Core_A, DAP, Driver, DSP, General, Pack, RTOS, RTOS2, SVD, Zone) DO IF EXIST %%A (RMDIR /S /Q %%A)
+FOR %%A IN (Build, Core, Core_A, DAP, Driver, DSP, General, Pack, RTOS, RTOS2, SVD, Zone) DO IF EXIST %%A (RMDIR /S /Q %%A)
POPD
:: -- Generate HTML Files
ECHO.
ECHO Generate HTML Files
+pushd Build
+doxygen Build.dxy
+popd
+
pushd Core
doxygen core.dxy
popd
@@ -166,7 +171,9 @@
:: -- Copy search style sheet
ECHO.
ECHO Copy search style sheets
-copy /Y Doxygen_Templates\search.css ..\Documentation\CORE\html\search\.
+copy /Y Doxygen_Templates\search.css ..\Documentation\Build\html\search\.
+copy /Y Doxygen_Templates\search.css ..\Documentation\Core\html\search\.
+copy /Y Doxygen_Templates\search.css ..\Documentation\Core_A\html\search\.
copy /Y Doxygen_Templates\search.css ..\Documentation\Driver\html\search\.
REM copy /Y Doxygen_Templates\search.css ..\Documentation\General\html\search\.
copy /Y Doxygen_Templates\search.css ..\Documentation\Pack\html\search\.
@@ -174,7 +181,6 @@
copy /Y Doxygen_Templates\search.css ..\Documentation\DSP\html\search\.
copy /Y Doxygen_Templates\search.css ..\Documentation\DAP\html\search\.
copy /Y Doxygen_Templates\search.css ..\Documentation\NN\html\search\.
-xcopy /E /I /Q /Y Zone\genmodel ..\Documentation\Zone\genmodel
ECHO.
POPD
@@ -184,7 +190,7 @@
:: -- Remove generated doxygen files
PUSHD ..\Documentation
-FOR %%A IN (Core, Core_A, DAP, Driver, DSP, General, NN, Pack, RTOS, RTOS2, SVD, Zone) DO IF EXIST %%A (RMDIR /S /Q %%A)
+FOR %%A IN (Build, Core, Core_A, DAP, Driver, DSP, General, NN, Pack, RTOS, RTOS2, SVD, Zone) DO IF EXIST %%A (RMDIR /S /Q %%A)
POPD
:: Checking
diff --git a/manifest b/manifest
index 38b424c..a365c65 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,7 @@
pdsc: ARM.CMSIS.pdsc
preproc:
- - clean: CMSIS/Documentation/(Core,Core_A,DAP,Driver,DSP,NN,General,Pack,RTOS,RTOS2,SVD,Zone)
+ - clean: CMSIS/Documentation/(Build,Core,Core_A,DAP,Driver,DSP,NN,General,Pack,RTOS,RTOS2,SVD,Zone)
+ - doxygen: CMSIS/DoxyGen/Build/Build.dxy
- doxygen: CMSIS/DoxyGen/Core/core.dxy
- doxygen: CMSIS/DoxyGen/Core_A/core_A.dxy
- doxygen: CMSIS/DoxyGen/DAP/dap.dxy
@@ -22,11 +23,13 @@
- CMSIS/Core_A/**/*
- CMSIS/DAP/**/*
- CMSIS/Driver/**/*
+ - CMSIS/DSP/ComputeLibrary/**/*
- CMSIS/DSP/Include/**/*
- CMSIS/DSP/Source/**/*
- CMSIS/DSP/Projects/**/*
- CMSIS/DSP/Examples/**/*
- CMSIS/DSP/Include/**/*: CMSIS/Include/
+ - CMSIS/DSP/PrivateInclude/**/*
- CMSIS/DSP/Lib/**/*
- CMSIS/NN/**/*
- CMSIS/Pack/**/*
@@ -40,6 +43,7 @@
- CMSIS/Utilities/Linux-gcc-4.4.4/**/*
- CMSIS/Utilities/Linux-gcc-4.8.3/**/*
- CMSIS/Documentation/**/*
+ - CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/Build/html/search/search.css
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/Core/html/search/search.css
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/Core_A/html/search/search.css
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/Driver/html/search/search.css
@@ -47,4 +51,4 @@
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/DSP/html/search/search.css
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/DAP/html/search/search.css
- CMSIS/DoxyGen/Doxygen_Templates/search.css: CMSIS/Documentation/NN/html/search/search.css
- - CMSIS/DoxyGen/Zone/genmodel/**/*: CMSIS/Documentation/Zone/genmodel/
+