Windows powershell support on CI.

8b7b1ca5 · Norby, Tom · 6e8e8add · 8b7b1ca5 · 8b7b1ca5 · 8b7b1ca5
Commit 8b7b1ca5 authored May 12, 2020 by Norby, Tom
--- a/.gitignore
+++ b/.gitignore
-TriBITS
-googletest
-testframework
 CMakeLists.txt.user
 .vscode
 build/

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
+variables:
+  GIT_SUBMODULE_STRATEGY: normal
+
 stages:
  - test
  - analysis

-.windows_before_script: &windows_before_script
-  before_script:
-    - set PATH=%PATH%;c:\vendors\mingw-w64\x86_64-4.8.5-posix-seh-rt_v4-rev0\mingw64\bin;c:\vendors\mingw-w64\qt\5.9.1\bin
-.windows_msvc_before_script: &windows_msvc_before_script
-  before_script:
-    - set PATH=c:\Qt\5.9.1\msvc2013_64\bin;%PATH%;c:\Program Files (x86)\NSIS\Bin
-
 mac_gcc_testing:
  tags:
    - mac
  script:
    - which git
    - git --version
-    - git clone https://github.com/lefebvre/TriBITS.git TriBITS
    - module load cmake gcc/4.8.5 qt/5.9.1 vtk/8.1.0
    - which cmake
    - which python
@@ -32,7 +27,6 @@ mac_llvm_testing:
  script:
    - which git
    - git --version
-    - git clone https://github.com/lefebvre/TriBITS.git TriBITS
    - module load cmake qt/5.9.1 vtk/8.1.0
    - which python
    - python --version
@@ -51,7 +45,6 @@ linux_gcc_testing:
  script:
    - which git
    - git --version
-    - git clone https://github.com/lefebvre/TriBITS.git TriBITS
    - which python
    - python --version
    - python TriBITS/tribits/ci_support/clone_extra_repos.py
@@ -70,7 +63,6 @@ linux_analysis:
  script:
    - which git
    - git --version
-    - git clone https://github.com/lefebvre/TriBITS.git TriBITS
    - which python
    - python --version
    - python TriBITS/tribits/ci_support/clone_extra_repos.py
@@ -89,7 +81,6 @@ linux_openmpi_testing:
  script:
    - which git
    - git --version
-    - git clone https://github.com/lefebvre/TriBITS.git TriBITS
    - which python
    - python --version
    - python TriBITS/tribits/ci_support/clone_extra_repos.py
@@ -103,54 +94,17 @@ linux_openmpi_testing:
 windows_mingw_testing:
  tags:
    - windows
-  <<: *windows_before_script
  script:
-   - where git
-   - git --version
-   - where cmake
-   - cmake --version
-   - git clone https://github.com/lefebvre/TriBITS.git TriBITS
-   - git clone https://github.com/lefebvre/testframework testframework
-   - git clone https://github.com/lefebvre/googletest googletest
-   - mkdir build
-   - cd build
-   - cmake -DTasmanian_DIR=c:/vendors/mingw-w64/tasmanian/6.0/ -DDEBUG_OUTPUT=1 -DTPL_LAPACK_LIBRARIES=c:/vendors/mingw-w64/lapack/3.5.0/lib/liblapack.a\\\;c:/vendors/mingw-w64/lapack/3.5.0/lib/libblas.a\\\;-lgfortran -DBUILDNAME=Windows-MinGW-GCC-4.8.5-Debug-%CI_BUILD_REF_NAME% -DCMAKE_BUILD_TYPE=DEBUG -Dradix_ENABLE_COVERAGE_TESTING=ON -Dradix_ENABLE_TESTS=ON -Dradix_ENABLE_SECONDARY_TESTED_CODE=ON -Dradix_ENABLE_TESTS=ON -Dradix_ENABLE_radixplot=OFF -Dradix_ENABLE_radixwidgets=OFF -G "MinGW Makefiles" ..
-   - ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
+    - ci\windows_mingw_testing.bat

 windows_msvc_testing:
  tags:
    - nsmwin10
-  <<: *windows_msvc_before_script
  script:
-   - 'call "c:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat" amd64'
-   - where git
-   - git --version
-   - cmake --version
-   - git clone https://github.com/lefebvre/TriBITS.git TriBITS
-   - git clone https://github.com/lefebvre/testframework testframework
-   - git clone https://github.com/lefebvre/googletest googletest
-   - mkdir build
-   - cd build
-   - SET VTK_DIR=c:\vendors\cl\vtk\8.1.0\
-   - SET radix_ENABLE_Fortran=OFF
-   - cmake -DTasmanian_DIR=c:/vendors/cl/tasmanian/6.0/ -DBUILD_SHARED_LIBS=ON -DBUILDNAME=Windows-CL-18-Release-%CI_BUILD_REF_NAME% -DCMAKE_BUILD_TYPE=RELEASE -Dradix_ENABLE_SECONDARY_TESTED_CODE=ON -Dradix_ENABLE_TESTS=ON -DTPL_ENABLE_VTK=ON -Dradix_ENABLE_radixplot=OFF -Dradix_ENABLE_radixwidgets=OFF -Dradix_ENABLE_radixglls=OFF -G "NMake Makefiles" ..
-   - ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
+    - ci\windows_msvc_testing.bat

 windows_intel_shared_testing:
  tags:
    - nsmwin10
-  <<: *windows_msvc_before_script
  script:
-   - 'call "c:/Program Files (x86)/Intel/Composer XE 2015/bin/ipsxe-comp-vars.bat" intel64 vs2013'
-   - where git
-   - git --version
-   - where cmake
-   - cmake --version
-   - git clone https://github.com/lefebvre/TriBITS.git TriBITS
-   - git clone https://github.com/lefebvre/testframework testframework
-   - git clone https://github.com/lefebvre/googletest googletest
-   - mkdir build
-   - cd build
-   - SET VTK_DIR=c:\vendors\cl\vtk\8.1.0\
-   - cmake -DTasmanian_DIR=c:/vendors/cl/tasmanian/6.0/ -DBUILD_SHARED_LIBS=ON -DTPL_LAPACK_LIBRARIES=c:/vendors/intel/lapack/3.5.0/lib/lapack.lib\\\;c:/vendors/intel/lapack/3.5.0/lib/blas.lib -DBUILDNAME=Windows-Intel-15-Release-%CI_BUILD_REF_NAME% -DCMAKE_C_COMPILER=icl -DCMAKE_CXX_COMPILER=icl -DCMAKE_BUILD_TYPE=RELEASE -Dradix_ENABLE_SECONDARY_TESTED_CODE=ON -Dradix_ENABLE_TESTS=ON -DTPL_ENABLE_VTK=ON -Dradix_ENABLE_radixplot=OFF -Dradix_ENABLE_radixwidgets=OFF -G "NMake Makefiles" ..
-   - ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
+    - ci\windows_intel_testing.bat
--- a/.gitmodules
+++ b/.gitmodules
+[submodule "submodules/googletest"]
+	path = submodules/googletest
+	url = https://github.com/lefebvre/googletest.git
+[submodule "submodules/testframework"]
+	path = submodules/testframework
+	url = https://github.com/lefebvre/testframework.git
+[submodule "TriBITS"]
+	path = TriBITS
+	url = https://github.com/lefebvre/TriBITS.git
--- a/PackagesList.cmake
+++ b/PackagesList.cmake
@@ -12,8 +12,8 @@
 ##---------------------------------------------------------------------------##

 TRIBITS_REPOSITORY_DEFINE_PACKAGES(
-  googletest googletest/googletest PT
-  testframework testframework PT
+  googletest submodules/googletest/googletest PT
+  testframework submodules/testframework PT
  radix  . PT
 )


--- a/TriBITS @ 45a6ab1e
+++ b/TriBITS @ 45a6ab1e
+Subproject commit 45a6ab1e69c1e65a8e1d61e4de7db5e53340245d
--- a/ci/windows_intel_testing.bat
+++ b/ci/windows_intel_testing.bat
+set PATH=c:\Qt\5.9.1\msvc2013_64\bin;%PATH%;c:\Program Files (x86)\NSIS\Bin
+call "c:/Program Files (x86)/Intel/Composer XE 2015/bin/ipsxe-comp-vars.bat" intel64 vs2013
+where git
+git --version
+where qmake
+qmake -version
+where cmake
+cmake --version
+mkdir build
+cd build
+SET VTK_DIR=c:\vendors\cl\vtk\8.1.0\
+cmake -DTasmanian_DIR=c:/vendors/cl/tasmanian/6.0/ ^
+-DBUILD_SHARED_LIBS=ON ^
+-DTPL_LAPACK_LIBRARIES=c:/vendors/intel/lapack/3.5.0/lib/lapack.lib\\\;c:/vendors/intel/lapack/3.5.0/lib/blas.lib ^
+-DBUILDNAME=Windows-Intel-15-Release-%CI_BUILD_REF_NAME% ^
+-DCMAKE_C_COMPILER=icl ^
+-DCMAKE_CXX_COMPILER=icl ^
+-DCMAKE_BUILD_TYPE=RELEASE ^
+-Dradix_ENABLE_SECONDARY_TESTED_CODE=ON ^
+-Dradix_ENABLE_TESTS=ON ^
+-DTPL_ENABLE_VTK=ON ^
+-Dradix_ENABLE_radixplot=OFF ^
+-Dradix_ENABLE_radixwidgets=OFF ^
+-G "NMake Makefiles" ..
+ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
\ No newline at end of file
--- a/ci/windows_mingw_testing.bat
+++ b/ci/windows_mingw_testing.bat
+set PATH=%PATH%;c:\vendors\mingw-w64\x86_64-4.8.5-posix-seh-rt_v4-rev0\mingw64\bin;c:\vendors\mingw-w64\qt\5.9.1\bin
+where git
+git --version
+where qmake
+qmake -version
+where cmake
+cmake --version
+mkdir build
+cd build
+cmake -DTasmanian_DIR=c:/vendors/mingw-w64/tasmanian/6.0/ ^
+-DDEBUG_OUTPUT=1 ^
+-DTPL_LAPACK_LIBRARIES=c:/vendors/mingw-w64/lapack/3.5.0/lib/liblapack.a\\\;c:/vendors/mingw-w64/lapack/3.5.0/lib/libblas.a\\\;-lgfortran ^
+-DBUILDNAME=Windows-MinGW-GCC-4.8.5-Debug-%CI_BUILD_REF_NAME% ^
+-DCMAKE_BUILD_TYPE=DEBUG ^
+-Dradix_ENABLE_COVERAGE_TESTING=ON ^
+-Dradix_ENABLE_TESTS=ON ^
+-Dradix_ENABLE_SECONDARY_TESTED_CODE=ON ^
+-Dradix_ENABLE_TESTS=ON ^
+-Dradix_ENABLE_radixplot=OFF ^
+-Dradix_ENABLE_radixwidgets=OFF ^
+-G "MinGW Makefiles" ..
+ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
\ No newline at end of file
--- a/ci/windows_msvc_testing.bat
+++ b/ci/windows_msvc_testing.bat
+set PATH=c:\Qt\5.9.1\msvc2013_64\bin;%PATH%;c:\Program Files (x86)\NSIS\Bin
+call "c:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat" amd64
+where git
+git --version
+where qmake
+qmake -version
+where cmake
+cmake --version
+mkdir build
+cd build
+SET VTK_DIR=c:\vendors\cl\vtk\8.1.0\
+SET radix_ENABLE_Fortran=OFF
+cmake -DTasmanian_DIR=c:/vendors/cl/tasmanian/6.0/ ^
+-DBUILD_SHARED_LIBS=ON ^
+-DBUILDNAME=Windows-CL-18-Release-%CI_BUILD_REF_NAME% ^
+-DCMAKE_BUILD_TYPE=RELEASE ^
+-Dradix_ENABLE_SECONDARY_TESTED_CODE=ON ^
+-Dradix_ENABLE_TESTS=ON ^
+-DTPL_ENABLE_VTK=ON ^
+-Dradix_ENABLE_radixplot=OFF ^
+-Dradix_ENABLE_radixwidgets=OFF ^
+-Dradix_ENABLE_radixglls=OFF ^
+-G "NMake Makefiles" ..
+ctest -D ExperimentalStart -D ExperimentalBuild -D ExperimentalTest -D ExperimentalSubmit
\ No newline at end of file
--- a/cmake/CallbackSetupExtraOptions.cmake
+++ b/cmake/CallbackSetupExtraOptions.cmake
@@ -15,7 +15,7 @@ MACRO(TRIBITS_REPOSITORY_SETUP_EXTRA_OPTIONS)
  #
  # Include the testframework setup
  #
-  ADD_SUBDIRECTORY(${radix_SOURCE_DIR}/testframework/setup)
+  ADD_SUBDIRECTORY(${radix_SOURCE_DIR}/submodules/testframework/setup)

  # Set CXX11 to be enabled by default.
  SET(${PROJECT_NAME}_ENABLE_CXX11_DEFAULT TRUE)

--- a/googletest @ fbc5670a
+++ b/googletest @ fbc5670a
+Subproject commit fbc5670a34d8b186f60f6c19183a3772698eec12
--- a/testframework @ f47c3cb7
+++ b/testframework @ f47c3cb7
+Subproject commit f47c3cb7694528fbd17d1226817e5e278fd901e2