Merge branch 'master' of https://github.com/codac-team/codac into dev

bneveu · Feb 10, 2021 · 3c8ba98 · 3c8ba98
2 parents fa3b928 + d8f27a9
commit 3c8ba98
Showing 1 changed file with 30 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,7 @@ _vs_specific: &vs_specific
     - cmake --build . --config Debug --target install
     - if [ "${WITH_PYTHON}" = "ON" ]; then cmake --build . --config Debug --target pip_package ; cp `ls *.whl` ../`ls *.whl | sed "s/py3-none-any/cp${PY_V_MM}-cp${PY_V_MM}${CPCFG}/"` ; pip install ../*.whl ; python -c "import sys; print(sys.version)" ; python ../examples/tuto/01_getting_started/01_getting_started.py ; fi
     - cd ..
-    - if [ "${WITH_CPP_BUNDLE}" = "ON" ]; then wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv ; 7z x tubex_test_win.zip -y ; rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd .. ; 7z a -y tubex_test_${CFG}.zip tubex_test_win ; cd tubex_test_win/test ; cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} . ; cmake --build . --config Release ; cmd //c "Release\my_project.exe" ; cd ../.. ; fi
+    - if [ "${WITH_CPP_BUNDLE}" = "ON" ]; then wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv ; 7z x codac_test_win.zip -y ; rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd .. ; 7z a -y codac_test_${CFG}.zip codac_test_win ; cd codac_test_win/test ; cmake -G "${CMAKE_PARAM_G}" -A ${CMAKE_PARAM_A} . ; cmake --build . --config Release ; cmd //c "Release\my_project.exe" ; cd ../.. ; fi
 
 matrix:
   include:
@@ -99,13 +99,13 @@ matrix:
         - cmake --build . --target install
         - cd ..
         # Test C++ program and bundle...
-        - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv
-        - unzip -q -o tubex_test_win.zip
-        - rm -Rf tubex_test_win.zip
-        - cd tubex_test_win
+        - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv
+        - unzip -q -o codac_test_win.zip
+        - rm -Rf codac_test_win.zip
+        - cd codac_test_win
         - mv test ..
         - cd ../test
-        - rm -Rf ../tubex_test_win
+        - rm -Rf ../codac_test_win
         - cmake .
         - cmake --build .
         - ./my_project
@@ -162,13 +162,13 @@ matrix:
 #        - python ../examples/tuto/01_getting_started/01_getting_started.py
 #        - cd ..
 #        # Test C++ program and bundle...
-#        - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv
-#        - unzip -q -o tubex_test_win.zip
-#        - rm -Rf tubex_test_win.zip
-#        - cd tubex_test_win
+#        - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv
+#        - unzip -q -o codac_test_win.zip
+#        - rm -Rf codac_test_win.zip
+#        - cd codac_test_win
 #        - mv test ..
 #        - cd ../test
-#        - rm -Rf ../tubex_test_win
+#        - rm -Rf ../codac_test_win
 #        - cmake .
 #        - cmake --build .
 #        - ./my_project
@@ -184,7 +184,7 @@ matrix:
       cache:
       install:
       script: 
-         - "docker run -i -v \"${PWD}/..:${PWD}/..\" lebarsfa/pi:buster-ibex /bin/bash -c \"uname -a && cat /etc/os-release && cd ${PWD} && lsb_release -a && sudo apt-get -q update ; sudo apt-get -y install libeigen3-dev ; mkdir build ; cd build && cmake -D CMAKE_PREFIX_PATH=../ibex -D CMAKE_INSTALL_PREFIX=../../codac .. && cmake --build . --target install && cd ../.. && wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv && unzip -q -o tubex_test_win.zip && rm -Rf tubex_test_win.zip && cd tubex_test_win && mv test .. && cd ../test && rm -Rf ../tubex_test_win && cmake . && cmake --build . && ./my_project \""
+         - "docker run -i -v \"${PWD}/..:${PWD}/..\" lebarsfa/pi:buster-ibex /bin/bash -c \"uname -a && cat /etc/os-release && cd ${PWD} && lsb_release -a && sudo apt-get -q update ; sudo apt-get -y install libeigen3-dev ; mkdir build ; cd build && cmake -D CMAKE_PREFIX_PATH=../ibex -D CMAKE_INSTALL_PREFIX=../../codac .. && cmake --build . --target install && cd ../.. && wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv && unzip -q -o codac_test_win.zip && rm -Rf codac_test_win.zip && cd codac_test_win && mv test .. && cd ../test && rm -Rf ../codac_test_win && cmake . && cmake --build . && ./my_project \""
 
     - name: "Mac OS Xcode 10.1"
       os: osx
@@ -199,13 +199,13 @@ matrix:
         - cmake --build . --target install
         - cd ..
         # Test C++ program and bundle...
-        - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip -nv
-        - unzip -q -o tubex_test_win.zip
-        - rm -Rf tubex_test_win.zip
-        - cd tubex_test_win
+        - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip -nv
+        - unzip -q -o codac_test_win.zip
+        - rm -Rf codac_test_win.zip
+        - cd codac_test_win
         - mv test ..
         - cd ../test
-        - rm -Rf ../tubex_test_win
+        - rm -Rf ../codac_test_win
         - cmake .
         - cmake --build .
         - ./my_project
@@ -306,15 +306,15 @@ matrix:
       script: 
         - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -G "${CMAKE_PARAM_G}" -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" -D INTERVAL_LIB=filib .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi
         - mkdir build ; cd build
-        - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" ..
+        - cmake -G "${CMAKE_PARAM_G}" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" ..
         - cmake --build . --target install
         - cd ..
         # Test C++ program and bundle...
-        - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv
-        - 7z x tubex_test_win.zip -y
-        - rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd ..
-        - 7z a -y tubex_test_${CFG}.zip tubex_test_win
-        - cd tubex_test_win/test
+        - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv
+        - 7z x codac_test_win.zip -y
+        - rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd ..
+        - 7z a -y codac_test_${CFG}.zip codac_test_win
+        - cd codac_test_win/test
         - cmake -G "${CMAKE_PARAM_G}" .
         - cmake --build .
         - ./my_project.exe
@@ -333,15 +333,15 @@ matrix:
       script: 
         - if [ ! -e "ibex/include/ibex.h" ]; then ( git clone https://github.com/ibex-team/ibex-lib.git ; cd ibex-lib ; mkdir build ; cd build ; cmake -G "${CMAKE_PARAM_G}" -D CMAKE_INSTALL_PREFIX="../../ibex" -D CMAKE_CXX_FLAGS="-fPIC" -D CMAKE_C_FLAGS="-fPIC" -D INTERVAL_LIB=filib .. ; cmake --build . --target install ; cd ../.. ) else echo "Using cached directory." ; fi
         - mkdir build ; cd build
-        - cmake -G "MSYS Makefiles" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" ..
+        - cmake -G "${CMAKE_PARAM_G}" -D CMAKE_PREFIX_PATH="ibex" -D CMAKE_INSTALL_PREFIX="../codac" ..
         - cmake --build . --target install
         - cd ..
         # Test C++ program and bundle...
-        - wget http://www.ensta-bretagne.fr/lebars/Share/tubex_test_win.zip --no-check-certificate -nv
-        - 7z x tubex_test_win.zip -y
-        - rm -Rf tubex_test_win.zip ; cd tubex_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd ..
-        - 7z a -y tubex_test_${CFG}.zip tubex_test_win
-        - cd tubex_test_win/test
+        - wget http://www.ensta-bretagne.fr/lebars/Share/codac_test_win.zip --no-check-certificate -nv
+        - 7z x codac_test_win.zip -y
+        - rm -Rf codac_test_win.zip ; cd codac_test_win; rm -Rf ibex codac ; cp -Rf ../ibex . ; cp -Rf ../codac .; cd ..
+        - 7z a -y codac_test_${CFG}.zip codac_test_win
+        - cd codac_test_win/test
         - cmake -G "${CMAKE_PARAM_G}" .
         - cmake --build .
         - ./my_project.exe
@@ -511,7 +511,7 @@ deploy:
     api_key:
       secure: ILyVRxUJHYAYHY6aGeY0QSVpwRF/Nm5piue7jkOArZXvwwjavPT8Gm/ZpXeor5rOQV/7rY4ACoOgMyhcFFKrL7BnKmzJUPPGyLez6aZz5ZT0I7YsQIG9CPPko0nIihSOircAjii8XaYwTntFAL9AqCgQk2PQ9HajzhbQrur4RPXFIwhJd9DDSCf8gO1WRyqRkL3gZSaq3GjQP++ZGFR9S5YlpCWVaG88Vq+ygrR9894tQ2on8FnOeE4bS768I36yT/w8IzES2o3oDh1bVECI2oEkwb2IYL5J5si1b0Wo6ZQdKNLu/50mohHbtKYzGfWiliRMXikXVwSXA/Y5G8ou1SCNLb7fM1s2E8KpjeOBHJJzC6syYaQzRZ611Srt3DpdlFa+s4aivgaKQ+AK+gromXwinE61FLEpUMglu7+3jFs6sMNNeYLgpGLjpnquyClljHmms79gm3T7dCm8C5ZFsyCDJq3ETEGDfIxN256dqLE6nu/oWuU6koQ3aMlVytMKG/veMb+jJY/J+f7upkUIBDtw0RKxk08gKX84wnl2brcHOOWAkSxcRINe/KUVDoR/7B3LAiarOyglazdEfRAmTE2o+te82/T0Wv0LoBn5/zXHZvtlpJYDuXndJ8HB8NWQl7sLOiqh4KbYkoyjPt9bn5XHvbQM/E7LLYIzpiOWPT4=
     on:
-      repo: lebarsfa/tubex-lib
+      repo: lebarsfa/codac
       all_branches: true
     skip_cleanup: true
     overwrite: true