Travis test
diff --git a/SVIncCompil/Design/DefParam.cpp b/SVIncCompil/Design/DefParam.cpp index 8a1a6db..c25136f 100644 --- a/SVIncCompil/Design/DefParam.cpp +++ b/SVIncCompil/Design/DefParam.cpp
@@ -46,3 +46,4 @@ } return name; } +
diff --git a/SVIncCompil/build3rdparty_mini.sh b/SVIncCompil/build3rdparty_mini.sh index a8f5114..aed8bed 100755 --- a/SVIncCompil/build3rdparty_mini.sh +++ b/SVIncCompil/build3rdparty_mini.sh
@@ -9,11 +9,6 @@ ./buildantlr_mini.sh ######################################################################### -# Build ccache -######################################################################### -./buildccache.sh - -######################################################################### # Build Python ######################################################################### ./buildpython.sh
diff --git a/SVIncCompil/nbproject/Makefile-AdvancedDebug.mk b/SVIncCompil/nbproject/Makefile-AdvancedDebug.mk index 1423b61..3bb26b8 100644 --- a/SVIncCompil/nbproject/Makefile-AdvancedDebug.mk +++ b/SVIncCompil/nbproject/Makefile-AdvancedDebug.mk
@@ -15,8 +15,8 @@ CCADMIN=CCadmin RANLIB=ranlib CC=gcc -CCC= ../ccache/ccache/bin/ccache g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes -CXX= ../ccache/ccache/bin/ccache g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes +CCC=${CCACHE} g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes +CXX=${CCACHE} g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes FC=gfortran AS=as
diff --git a/SVIncCompil/nbproject/Makefile-Debug.mk b/SVIncCompil/nbproject/Makefile-Debug.mk index 5d2cb06..41a7361 100644 --- a/SVIncCompil/nbproject/Makefile-Debug.mk +++ b/SVIncCompil/nbproject/Makefile-Debug.mk
@@ -15,8 +15,8 @@ CCADMIN=CCadmin RANLIB=ranlib CC=gcc -CCC=../ccache/ccache/bin/ccache g++ -Wall -Wno-attributes -CXX=../ccache/ccache/bin/ccache g++ -Wall -Wno-attributes +CCC=${CCACHE} g++ -Wall -Wno-attributes +CXX=${CCACHE} g++ -Wall -Wno-attributes FC=gfortran AS=as
diff --git a/SVIncCompil/nbproject/Makefile-Release.mk b/SVIncCompil/nbproject/Makefile-Release.mk index 38e4b98..be9afc3 100644 --- a/SVIncCompil/nbproject/Makefile-Release.mk +++ b/SVIncCompil/nbproject/Makefile-Release.mk
@@ -15,8 +15,8 @@ CCADMIN=CCadmin RANLIB=ranlib CC=gcc -CCC= ../ccache/ccache/bin/ccache g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes -CXX= ../ccache/ccache/bin/ccache g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes +CCC=${CCACHE} g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes +CXX=${CCACHE} g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes FC=gfortran AS=as
diff --git a/SVIncCompil/nbproject/Makefile-ReleaseNoTcMalloc.mk b/SVIncCompil/nbproject/Makefile-ReleaseNoTcMalloc.mk index a8e3f76..535b060 100644 --- a/SVIncCompil/nbproject/Makefile-ReleaseNoTcMalloc.mk +++ b/SVIncCompil/nbproject/Makefile-ReleaseNoTcMalloc.mk
@@ -15,8 +15,8 @@ CCADMIN=CCadmin RANLIB=ranlib CC=gcc -CCC=../ccache/ccache/bin/ccache g++ -Wall -O2 -fno-asm -Wno-attributes -CXX=../ccache/ccache/bin/ccache g++ -Wall -O2 -fno-asm -Wno-attributes +CCC=${CCACHE} g++ -Wall -O2 -fno-asm -Wno-attributes +CXX=${CCACHE} g++ -Wall -O2 -fno-asm -Wno-attributes FC=gfortran AS=as
diff --git a/SVIncCompil/nbproject/configurations.xml b/SVIncCompil/nbproject/configurations.xml index 15e7393..3f1e67b 100644 --- a/SVIncCompil/nbproject/configurations.xml +++ b/SVIncCompil/nbproject/configurations.xml
@@ -359,7 +359,7 @@ <ccTool> <architecture>2</architecture> <standard>8</standard> - <commandlineTool>../ccache/ccache/bin/ccache g++ -Wall -Wno-attributes</commandlineTool> + <commandlineTool>${CCACHE} g++ -Wall -Wno-attributes</commandlineTool> <incDir> <pElem>../antlr4/antlr4-4.7.2/runtime/Cpp/runtime/src</pElem> <pElem>../flatbuffers/include</pElem> @@ -381,36 +381,6 @@ </linkerLibItems> </linkerTool> </compileType> - <item path="Config/Config.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/Config.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Config/ConfigSet.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/ConfigSet.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Package/Precompiled.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Package/Precompiled.h" - ex="false" - tool="3" - flavor2="0"> - </item> <item path="API/PythonAPI.cpp" ex="false" tool="1" flavor2="0"> <ccTool> <additionalDep>API/slapi_wrap.cxx API/slapi.h</additionalDep> @@ -516,6 +486,14 @@ </item> <item path="Common/ClockingBlockHolder.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Config/Config.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/Config.h" ex="false" tool="3" flavor2="0"> + </item> + <item path="Config/ConfigSet.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/ConfigSet.h" ex="false" tool="3" flavor2="0"> + </item> <item path="Design/ClockingBlock.cpp" ex="false" tool="1" flavor2="0"> </item> <item path="Design/ClockingBlock.h" ex="false" tool="3" flavor2="0"> @@ -746,6 +724,10 @@ </item> <item path="Package/Package.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Package/Precompiled.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Package/Precompiled.h" ex="false" tool="3" flavor2="0"> + </item> <item path="README" ex="false" tool="3" flavor2="0"> </item> <item path="SourceCompile/AnalyzeFile.cpp" ex="false" tool="1" flavor2="0"> @@ -990,7 +972,7 @@ <developmentMode>0</developmentMode> <architecture>2</architecture> <standard>8</standard> - <commandlineTool> ../ccache/ccache/bin/ccache g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes</commandlineTool> + <commandlineTool>${CCACHE} g++ -Wall -O3 -fno-asm -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -Wno-attributes</commandlineTool> <incDir> <pElem>../antlr4/antlr4-4.7.2/runtime/Cpp/runtime/src</pElem> <pElem>../flatbuffers/include</pElem> @@ -1017,36 +999,6 @@ </linkerLibItems> </linkerTool> </compileType> - <item path="Config/Config.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/Config.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Config/ConfigSet.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/ConfigSet.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Package/Precompiled.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Package/Precompiled.h" - ex="false" - tool="3" - flavor2="0"> - </item> <item path="API/PythonAPI.cpp" ex="false" tool="1" flavor2="0"> <ccTool> <commandlineTool>g++ </commandlineTool> @@ -1155,6 +1107,14 @@ </item> <item path="Common/ClockingBlockHolder.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Config/Config.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/Config.h" ex="false" tool="3" flavor2="0"> + </item> + <item path="Config/ConfigSet.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/ConfigSet.h" ex="false" tool="3" flavor2="0"> + </item> <item path="Design/ClockingBlock.cpp" ex="false" tool="1" flavor2="0"> </item> <item path="Design/ClockingBlock.h" ex="false" tool="3" flavor2="0"> @@ -1385,6 +1345,10 @@ </item> <item path="Package/Package.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Package/Precompiled.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Package/Precompiled.h" ex="false" tool="3" flavor2="0"> + </item> <item path="README" ex="false" tool="3" flavor2="0"> </item> <item path="SourceCompile/AnalyzeFile.cpp" ex="false" tool="1" flavor2="0"> @@ -1625,7 +1589,7 @@ <developmentMode>0</developmentMode> <architecture>2</architecture> <standard>8</standard> - <commandlineTool>../ccache/ccache/bin/ccache g++ -Wall -O2 -fno-asm -Wno-attributes</commandlineTool> + <commandlineTool>${CCACHE} g++ -Wall -O2 -fno-asm -Wno-attributes</commandlineTool> <incDir> <pElem>../antlr4/antlr4-4.7.2/runtime/Cpp/runtime/src</pElem> <pElem>../flatbuffers/include</pElem> @@ -1652,36 +1616,6 @@ </linkerLibItems> </linkerTool> </compileType> - <item path="Config/Config.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/Config.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Config/ConfigSet.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/ConfigSet.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Package/Precompiled.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Package/Precompiled.h" - ex="false" - tool="3" - flavor2="0"> - </item> <item path="API/PythonAPI.cpp" ex="false" tool="1" flavor2="0"> <ccTool> <additionalDep>API/slapi_wrap.cxx API/slapi.h</additionalDep> @@ -1783,6 +1717,14 @@ </item> <item path="Common/ClockingBlockHolder.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Config/Config.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/Config.h" ex="false" tool="3" flavor2="0"> + </item> + <item path="Config/ConfigSet.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/ConfigSet.h" ex="false" tool="3" flavor2="0"> + </item> <item path="Design/ClockingBlock.cpp" ex="false" tool="1" flavor2="0"> </item> <item path="Design/ClockingBlock.h" ex="false" tool="3" flavor2="0"> @@ -2013,6 +1955,10 @@ </item> <item path="Package/Package.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Package/Precompiled.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Package/Precompiled.h" ex="false" tool="3" flavor2="0"> + </item> <item path="README" ex="false" tool="3" flavor2="0"> </item> <item path="SourceCompile/AnalyzeFile.cpp" ex="false" tool="1" flavor2="0"> @@ -2249,7 +2195,7 @@ <ccTool> <architecture>2</architecture> <standard>8</standard> - <commandlineTool> ../ccache/ccache/bin/ccache g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes</commandlineTool> + <commandlineTool>${CCACHE} g++ -Wall -D_GLIBCXX_DEBUG -fsanitize=address -fno-omit-frame-pointer -Wno-attributes</commandlineTool> <incDir> <pElem>../antlr4/antlr4-4.7.2/runtime/Cpp/runtime/src</pElem> <pElem>../flatbuffers/include</pElem> @@ -2270,36 +2216,6 @@ </linkerLibItems> </linkerTool> </compileType> - <item path="Config/Config.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/Config.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Config/ConfigSet.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Config/ConfigSet.h" - ex="false" - tool="3" - flavor2="0"> - </item> - <item path="Package/Precompiled.cpp" - ex="false" - tool="1" - flavor2="0"> - </item> - <item path="Package/Precompiled.h" - ex="false" - tool="3" - flavor2="0"> - </item> <item path="API/PythonAPI.cpp" ex="false" tool="1" flavor2="0"> <ccTool> <additionalDep>API/slapi_wrap.cxx API/slapi.h</additionalDep> @@ -2401,6 +2317,14 @@ </item> <item path="Common/ClockingBlockHolder.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Config/Config.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/Config.h" ex="false" tool="3" flavor2="0"> + </item> + <item path="Config/ConfigSet.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Config/ConfigSet.h" ex="false" tool="3" flavor2="0"> + </item> <item path="Design/ClockingBlock.cpp" ex="false" tool="1" flavor2="0"> </item> <item path="Design/ClockingBlock.h" ex="false" tool="3" flavor2="0"> @@ -2631,6 +2555,10 @@ </item> <item path="Package/Package.h" ex="false" tool="3" flavor2="0"> </item> + <item path="Package/Precompiled.cpp" ex="false" tool="1" flavor2="0"> + </item> + <item path="Package/Precompiled.h" ex="false" tool="3" flavor2="0"> + </item> <item path="README" ex="false" tool="3" flavor2="0"> </item> <item path="SourceCompile/AnalyzeFile.cpp" ex="false" tool="1" flavor2="0">
diff --git a/SVIncCompil/nbproject/private/private.xml b/SVIncCompil/nbproject/private/private.xml index ab84910..cec80cb 100644 --- a/SVIncCompil/nbproject/private/private.xml +++ b/SVIncCompil/nbproject/private/private.xml
@@ -6,6 +6,8 @@ </data> <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/> <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2"> - <group/> + <group> + <file>file:/home/alain/Surelog/SVIncCompil/Design/DefParam.cpp</file> + </group> </open-files> </project-private>