Merge pull request #231 from Yaskawa-Global/introduce_lib_dir

Use separate directory for external dependencies (platform lib, CMOS parameter lib, etc)
Yaskawa-Global · Apr 8, 2024 · b3972ed · b3972ed
2 parents b066b5f + 77a2903
commit b3972ed
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 39 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -20,11 +20,11 @@ Files: src/*.mps
 Copyright: 2022-2023 Yaskawa America, Inc.
 License: Apache-2.0
 
-Files: src/ParameterExtraction.*
+Files: lib/ParameterExtraction.*
 Copyright: 2013-2023 Yaskawa America, Inc.
 License: BSD-3-Clause
 
-Files: src/MotoROS_PlatformLib.*Lib
+Files: lib/MotoROS_PlatformLib.*Lib
 Copyright: 2023 Yaskawa America, Inc.
   2023, Delft University of Technology
 License: Apache-2.0

diff --git a/src/CmosParameterExtraction.h → lib/CmosParameterExtraction.h b/src/CmosParameterExtraction.h → lib/CmosParameterExtraction.h
diff --git a/src/CmosParameterTypes.h → lib/CmosParameterTypes.h b/src/CmosParameterTypes.h → lib/CmosParameterTypes.h
diff --git a/src/MotoPlusExterns.h → lib/MotoPlusExterns.h b/src/MotoPlusExterns.h → lib/MotoPlusExterns.h
diff --git a/src/MotoROS_PlatformLib.dnLib → lib/MotoROS_PlatformLib.dnLib b/src/MotoROS_PlatformLib.dnLib → lib/MotoROS_PlatformLib.dnLib
diff --git a/src/MotoROS_PlatformLib.h → lib/MotoROS_PlatformLib.h b/src/MotoROS_PlatformLib.h → lib/MotoROS_PlatformLib.h
diff --git a/src/MotoROS_PlatformLib.yrcLib → lib/MotoROS_PlatformLib.yrcLib b/src/MotoROS_PlatformLib.yrcLib → lib/MotoROS_PlatformLib.yrcLib
diff --git a/src/MotoROS_PlatformLib.yrcmLib → lib/MotoROS_PlatformLib.yrcmLib b/src/MotoROS_PlatformLib.yrcmLib → lib/MotoROS_PlatformLib.yrcmLib
diff --git a/src/ParameterExtraction.dnLib → lib/ParameterExtraction.dnLib b/src/ParameterExtraction.dnLib → lib/ParameterExtraction.dnLib
diff --git a/src/ParameterExtraction.yrcLib → lib/ParameterExtraction.yrcLib b/src/ParameterExtraction.yrcLib → lib/ParameterExtraction.yrcLib
diff --git a/src/ParameterExtraction.yrcmLib → lib/ParameterExtraction.yrcmLib b/src/ParameterExtraction.yrcmLib → lib/ParameterExtraction.yrcmLib
diff --git a/src/MotoROS2_AllControllers.vcxproj b/src/MotoROS2_AllControllers.vcxproj
diff --git a/src/MotoROS2_AllControllers.vcxproj.filters b/src/MotoROS2_AllControllers.vcxproj.filters
@@ -109,22 +109,22 @@
     <None Include="YRC1000_humbleLinkerArguments.mps">
       <Filter>Compile Settings</Filter>
     </None>
-    <None Include="ParameterExtraction.dnLib">
+    <None Include="..\lib\ParameterExtraction.dnLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
-    <None Include="ParameterExtraction.yrcLib">
+    <None Include="..\lib\ParameterExtraction.yrcLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
-    <None Include="ParameterExtraction.yrcmLib">
+    <None Include="..\lib\ParameterExtraction.yrcmLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
-    <None Include="MotoROS_PlatformLib.dnLib">
+    <None Include="..\lib\MotoROS_PlatformLib.dnLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
-    <None Include="MotoROS_PlatformLib.yrcLib">
+    <None Include="..\lib\MotoROS_PlatformLib.yrcLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
-    <None Include="MotoROS_PlatformLib.yrcmLib">
+    <None Include="..\lib\MotoROS_PlatformLib.yrcmLib">
       <Filter>MotoPlus Libraries</Filter>
     </None>
     <None Include="..\config\motoros2_config.yaml">
@@ -410,13 +410,13 @@
     <ClInclude Include="MathConstants.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CmosParameterTypes.h">
+    <ClInclude Include="..\lib\CmosParameterTypes.h">
       <Filter>MotoPlus Libraries</Filter>
     </ClInclude>
-    <ClInclude Include="CmosParameterExtraction.h">
+    <ClInclude Include="..\lib\CmosParameterExtraction.h">
       <Filter>MotoPlus Libraries</Filter>
     </ClInclude>
-    <ClInclude Include="MotoROS_PlatformLib.h">
+    <ClInclude Include="..\lib\MotoROS_PlatformLib.h">
       <Filter>MotoPlus Libraries</Filter>
     </ClInclude>
     <ClInclude Include="TimeConversionUtils.h">