Commit 775e3026 by Christophe Geuzaine

create correct archive file name directly

parent cd95224a
Pipeline #471 failed with stage
in 10 minutes 34 seconds
......@@ -7,8 +7,6 @@ build_docker_linux64_gcc:
image: onelab/ubuntu16.04
tags:
- linux
except:
- schedules
script:
- mkdir build
- cd build
......@@ -21,8 +19,6 @@ build_docker_linux64_gcc_minimal:
image: onelab/ubuntu16.04
tags:
- linux
except:
- schedules
script:
- mkdir build_minimal
- cd build_minimal
......@@ -33,8 +29,6 @@ build_windows64_msvc:
stage: build
tags:
- windows
except:
- schedules
script:
- md build
- cd build
......@@ -52,17 +46,17 @@ build_official_windows64_gcc: &anchor_build_official_windows64_gcc
script:
- md build
- cd build
- echo %EXTRA_VERSION%
- bash -c "echo %EXTRA_VERSION%"
- bash -c "echo $EXTRA_VERSION"
- bash -c "/usr/bin/cmake -DGMSH_EXTRA_VERSION=$EXTRA_VERSION -DCMAKE_PREFIX_PATH='/usr/local/opencascade;/usr/local;/usr/x86_64-w64-mingw32/sys-root/mingw' -DCMAKE_C_COMPILER=/usr/bin/x86_64-w64-mingw32-gcc.exe -DCMAKE_CXX_COMPILER=/usr/bin/x86_64-w64-mingw32-g++.exe -DCMAKE_Fortran_COMPILER=/usr/bin/x86_64-w64-mingw32-gfortran.exe -DCMAKE_RC_COMPILER=/usr/bin/x86_64-w64-mingw32-windres.exe -DPETSC_ARCH=win64_complex_mumps_seq -DPETSC_DIR=/home/geuzaine/src/petsc-3.7.5 -DSLEPC_DIR=/home/geuzaine/src/slepc-3.7.3 .."
- bash -c "/usr/bin/make package -j 2"
- bash -c "/usr/bin/ctest -j 2"
- bash -c "/usr/bin/scp -o StrictHostKeyChecking=no -i /home/geuzaine/.ssh/id_rsa build/gmsh-*.zip geuzaine@gmsh.info:.wwwgmsh/beta/"
- bash -c "/usr/bin/scp -o StrictHostKeyChecking=no -i /home/geuzaine/.ssh/id_rsa gmsh-*.zip geuzaine@gmsh.info:.wwwgmsh/beta/"
only:
- master
tag_build_official_windows64_gcc:
variables:
EXTRA_VERSION: ""
<<: *anchor_build_official_windows64_gcc
only:
- master
- tags
<<: *anchor_build_official_windows64_gcc
......@@ -209,6 +209,23 @@ include(CheckFunctionExists)
include(CheckIncludeFile)
include(CheckCXXCompilerFlag)
# check if the machine is 64 bits (this is more reliable than using
# CMAKE_SIZEOF_VOID_P, which does not seem to work e.g. on some Suse
# machines)
check_type_size("void*" SIZEOF_VOID_P)
if(SIZEOF_VOID_P EQUAL 8)
set(HAVE_64BIT_SIZE_T TRUE)
endif(SIZEOF_VOID_P EQUAL 8)
# append 32/64 to the build name on Linux and Windows
if(NOT APPLE)
if(HAVE_64BIT_SIZE_T)
set(GMSH_OS "${GMSH_OS}64")
else(HAVE_64BIT_SIZE_T)
set(GMSH_OS "${GMSH_OS}32")
endif(HAVE_64BIT_SIZE_T)
endif(NOT APPLE)
if(ENABLE_WRAP_PYTHON AND NOT ENABLE_BUILD_SHARED)
set(ENABLE_BUILD_DYNAMIC ON)
endif(ENABLE_WRAP_PYTHON AND NOT ENABLE_BUILD_SHARED)
......@@ -298,14 +315,6 @@ macro(set_compile_flags LISTNAME FLAGS)
endforeach(FILE)
endmacro(set_compile_flags)
# check if the machine is 64 bits (this is more reliable than using
# CMAKE_SIZEOF_VOID_P, which does not seem to work e.g. on some Suse
# machines)
check_type_size("void*" SIZEOF_VOID_P)
if(SIZEOF_VOID_P EQUAL 8)
set(HAVE_64BIT_SIZE_T TRUE)
endif(SIZEOF_VOID_P EQUAL 8)
if(ENABLE_BLAS_LAPACK)
if(BLAS_LAPACK_LIBRARIES)
# use libs as specified in the BLAS_LAPACK_LIBRARIES variable
......@@ -1805,7 +1814,11 @@ set(CPACK_PACKAGE_VERSION_PATCH ${GMSH_PATCH_VERSION})
set(CPACK_PACKAGE_DESCRIPTION_FILE ${WELCOME_FILE})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"3D finite element mesh generator with built-in CAD engine and post-processor")
set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
if(GMSH_EXTRA_VERSION MATCHES "-git") # so that we'll overwrite the archives
set(CPACK_PACKAGE_FILE_NAME gmsh-git-${GMSH_OS})
else(GMSH_EXTRA_VERSION MATCHES "-git")
set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
endif(GMSH_EXTRA_VERSION MATCHES "-git")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
set(CPACK_RESOURCE_FILE_LICENSE ${LICENSE_FILE})
set(CPACK_RESOURCE_FILE_README ${WELCOME_FILE})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment