From 62f42728c2d90d5d62f8dca67b7f50e85660e7b4 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 17 May 2019 18:25:29 +0200 Subject: [PATCH] Save gauguin configuration files --- .../x64_Cygwin-Windows10_MSVC2015-Debug-64bits/setup | 2 +- .../CMakeCache.txt | 2 +- .../x64_Cygwin-Windows10_MSVC2017-Release-64bits/setup | 2 -- .../infrastructure/gauguin.geometryfactory.com/update.sh | 2 +- .../gauguin.geometryfactory.com/update_eigen.sh | 6 ++++++ 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100755 Maintenance/infrastructure/gauguin.geometryfactory.com/update_eigen.sh diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/setup b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/setup index efd30025a2d..0cd0d4441cf 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/setup +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2015-Debug-64bits/setup @@ -1,5 +1,5 @@ export CGAL_DIR="/cygdrive/c/CGAL/CGAL-4.9/build_vs2015" -export VC_VERSION="14" +export VC_VERSION="14.0" export VC_VERSION_YEAR="2015" export ARCH="64" export QT_VERSION="5.9.1" diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt index 52b7b8ea248..d21e9b70bb9 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Debug-64bits/CMakeCache.txt @@ -206,7 +206,7 @@ CMAKE_INSTALL_SHAREDSTATEDIR:PATH=com CMAKE_INSTALL_SYSCONFDIR:PATH=etc //Path to a program. -CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.16.27023/bin/HostX86/x64/link.exe +CMAKE_LINKER:FILEPATH=C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/VC/Tools/MSVC/14.11.25503/bin/HostX86/x64/link.exe //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING=/machine:x64 /DEBUG:NONE /INCREMENTAL:NO diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/setup b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/setup index 2a8e2065c88..eccdd32702c 100644 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/setup +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/reference_platforms/x64_Cygwin-Windows10_MSVC2017-Release-64bits/setup @@ -4,11 +4,9 @@ export VC_VERSION_YEAR="2017" export ARCH="64" export QT_VERSION="5.9.1" export PLATFORM_REFERENCE="/cygdrive/c/CGAL/reference_platforms" -export BOOST_VERSION="1_65_1" export TBB_ARCH_PLATFORM="intel64/vc14" export EIGEN3_DIR="C:/3rdPartyLibs/eigen-master" export INIT_FILE="C:\\CGAL\\reference_platforms\\x64_Cygwin-Windows10_MSVC2017-Release-64bits\\init.cmake" source "${PLATFORM_REFERENCE}/setup_common" - COLLECT_DEMOS_BINARIES=y export COLLECT_DEMOS_BINARIES diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/update.sh b/Maintenance/infrastructure/gauguin.geometryfactory.com/update.sh index 827532b3485..aa32f886fa1 100755 --- a/Maintenance/infrastructure/gauguin.geometryfactory.com/update.sh +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/update.sh @@ -1,6 +1,6 @@ #! /bin/sh rsync -av --chmod=u+rwX gauguin:.autocgalrc autocgalrc -rsync -av --chmod=u+rwX gauguin:cgal/launch_testsuite.bat . +rsync gauguin:cgal/launch_testsuite.bat :cgal/update_eigen.sh . rsync -Cvr --chmod=u+rwX --exclude .vs --exclude '*.cpp' --exclude '*vcxproj*' --exclude '*.sln' --exclude '*.sdf' --exclude include --exclude Makefile --exclude \*.cmake --exclude bin --exclude lib --exclude config --exclude CMakeFiles --exclude src gauguin:cgal/reference_platforms . chmod -R u=rwX . diff --git a/Maintenance/infrastructure/gauguin.geometryfactory.com/update_eigen.sh b/Maintenance/infrastructure/gauguin.geometryfactory.com/update_eigen.sh new file mode 100755 index 00000000000..89262bc6ec9 --- /dev/null +++ b/Maintenance/infrastructure/gauguin.geometryfactory.com/update_eigen.sh @@ -0,0 +1,6 @@ +#!/bin/bash +cd /cygdrive/c/3rdPartyLibs/eigen-master +git pull origin master +cd ../boost_master +git submodule update --init --recursive +./b2 -j8 --toolset=msvc-14.1 address-model=64 architecture=x86 link=static --prefix="C:\3rdPartyLibs\boost_master\install_dir" install \ No newline at end of file