Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
5c709933
Commit
5c709933
authored
Sep 09, 2021
by
LEFEBVREJP email
Browse files
Added deployment artifacts for Linux and Windows.
parent
ce837aef
Pipeline
#163308
failed with stages
in 60 minutes and 3 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
5c709933
...
...
@@ -108,12 +108,38 @@ linux_gcc_testing:
-Dradix_ENABLE_TESTS=ON
-DENABLE_PYTHON_WRAPPERS=ON
-Dradix_ENABLE_SECONDARY_TESTED_CODE=ON
-Dradix_ENABLE_TESTS=ON
-DTPL_ENABLE_VTK=ON
-DTPL_ENABLE_VTK=ON
-Dradix_ENABLE_radixplot=OFF
-Dradix_ENABLE_radixwidgets=OFF ..
-
cmake --build .
-
ctest --output-junit ctest-results.xml
linux_deployment
:
tags
:
-
linux
artifacts
:
name
:
${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}-linux-deployment
paths
:
-
bin/
script
:
-
which git
-
git --version
-
mkdir build
-
cd build
-
module load cmake/3.21.0
-
which cmake
-
cmake
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_BUILD_TYPE=Release
-Dradix_ENABLE_TESTS=OFF
-DENABLE_PYTHON_WRAPPERS=OFF
-Dradix_ENABLE_ALL_PACKAGES=OFF
-Dradix_ENABLE_radixplot=OFF
-Dradix_ENABLE_radixwidgets=OFF
-Dradix_ENABLE_radixio=ON
-DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} ..
-
cmake --build . --target bundle_install
linux_analysis
:
stage
:
analysis
tags
:
...
...
@@ -184,6 +210,15 @@ windows_msvc_testing:
-
nsmwin10
script
:
-
ci\windows_msvc_testing.bat
windows_msvc_deployment
:
tags
:
-
nsmwin10
artifacts
:
name
:
${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}-windows-deployment
paths
:
-
bin/
script
:
-
ci\windows_msvc_deployment.bat
windows_intel_shared_testing
:
tags
:
...
...
CMakeLists.txt
View file @
5c709933
...
...
@@ -71,7 +71,11 @@ IF (NOT TRIBITS_PROCESSING_PACKAGE)
SET
(
CMAKE_RUNTIME_OUTPUT_DIRECTORY
"
${
CMAKE_CURRENT_BINARY_DIR
}
/cmake_runtime_output"
CACHE STRING
""
)
ENDIF
()
ENDIF
()
IF
(
EXISTS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cmake/Bundle/CMakeLists.txt"
)
ADD_SUBDIRECTORY
(
cmake/Bundle
)
ELSE
()
MESSAGE
(
STATUS
"Bundling not supported."
)
ENDIF
()
TRIBITS_PROJECT_ENABLE_ALL
()
ELSE
()
# This CMakeLists.txt file is being processed as the TriBITS package file.
...
...
ci/windows_msvc_deployment.bat
0 → 100644
View file @
5c709933
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
radix_ENABLE_Fortran
=
OFF
cmake
^
-DBUILD
_SHARED_LIBS
=
OFF
^
-DCMAKE
_BUILD_TYPE
=
RELEASE
^
-Dradix
_ENABLE_TESTS
=
OFF
^
-Dradix
_ENABLE_ALL_PACKAGES
=
OFF
^
-Dradix
_ENABLE_radixplot
=
OFF
^
-Dradix
_ENABLE_radixwidgets
=
OFF
^
-Dradix
_ENABLE_radixglls
=
OFF
^
-Dradix
_ENABLE_radixio
=
ON
^
-DCMAKE
_INSTALL_PREFIX
=
%CI_PROJECT_DIR%
^
-G
"NMake Makefiles"
..
cmake
--build
.
--target
bundle_install
\ No newline at end of file
cmake/Bundle/CMakeLists.txt
0 → 100644
View file @
5c709933
IF
(
"
${
CMAKE_SYSTEM_NAME
}
"
STREQUAL
"Windows"
)
SET
(
FIXUP_FILE_PATTERN
"
${
CMAKE_INSTALL_PREFIX
}
/bin/*.exe"
)
ELSE
()
SET
(
FIXUP_FILE_PATTERN
"
${
CMAKE_INSTALL_PREFIX
}
/bin/*"
)
ENDIF
()
#
#
SET
(
APP_PLUGINS_DIR
""
)
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/fixup_script.cmake.in
${
CMAKE_CURRENT_BINARY_DIR
}
/fixup_script.cmake
@ONLY
)
ADD_CUSTOM_TARGET
(
bundle_install
COMMAND
${
CMAKE_MAKE_PROGRAM
}
install
COMMAND
${
CMAKE_COMMAND
}
-P
${
CMAKE_CURRENT_BINARY_DIR
}
/fixup_script.cmake
WORKING_DIRECTORY
${${
PROJECT_NAME
}
_BINARY_DIR
}
COMMENT
"Bundling the installation..."
VERBATIM
)
cmake/Bundle/fixup_script.cmake.in
0 → 100644
View file @
5c709933
SET(APP_PLUGINS_DIR "@APP_PLUGINS_DIR@")
SET(CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
IF("@CMAKE_SYSTEM_NAME@" STREQUAL "Windows")
FILE(GLOB_RECURSE QTPLUGINS "${APP_PLUGINS_DIR}/*.dll")
ELSEIF("@CMAKE_SYSTEM_NAME@" STREQUAL "Darwin")
FILE(GLOB_RECURSE QTPLUGINS "${APP_PLUGINS_DIR}/*.dylib")
FUNCTION(gp_item_default_embedded_path_override item path)
# This is required to change the Mac Bundle standard to conform to a linux form
SET(${path} "@executable_path/../lib" PARENT_SCOPE)
ENDFUNCTION()
ELSE()
FILE(GLOB_RECURSE QTPLUGINS "${APP_PLUGINS_DIR}/*.so")
FUNCTION(gp_item_default_embedded_path_override item path)
SET(${path} "@executable_path/../lib/" PARENT_SCOPE)
ENDFUNCTION()
FUNCTION(gp_resolved_file_type_override item type_var)
GET_FILENAME_COMPONENT(item_dir "${item}" DIRECTORY)
STRING(REPLACE "bin/../lib" "lib/" item_dir "${item_dir}")
GET_FILENAME_COMPONENT(item_dir "${item_dir}" DIRECTORY)
IF("${item_dir}" STREQUAL "${CMAKE_INSTALL_PREFIX}")
SET(${type_var} "local" PARENT_SCOPE)
ENDIF()
ENDFUNCTION ()
ENDIF()
#
# CMake code snippet for stand alone bundle
#
FILE(GLOB APPS @FIXUP_FILE_PATTERN@)
MESSAGE("FIXUP_BUNDLE for: '${APPS}'")
INCLUDE(BundleUtilities)
FOREACH(APP ${APPS})
# don't process a directory
IF(NOT IS_DIRECTORY ${APP})
# get the file extension
GET_FILENAME_COMPONENT(FILE_EXT ${APP} EXT)
# only check no extension files or 'exe' extension files
IF("${FILE_EXT}" STREQUAL "" OR "${FILE_EXT}" STREQUAL ".exe")
FIXUP_BUNDLE("${APP}" "${QTPLUGINS}" "")
ENDIF()
ENDIF()
ENDFOREACH()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment