From 0cf579191f3543109caf802762808bc12b8627b1 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Wed, 6 Apr 2022 10:35:49 +0200 Subject: [PATCH 1/4] :wink: support mvsc on remote build --- build_engine_mapping.json | 4 +++- windows-vs-16-2019-win64-cxx17.cmake | 18 ++++++++++++++++++ windows-vs-16-2019-win64.cmake | 17 +++++++++++++++++ .../scripts/disable-windows-defender.ps1 | 0 .../scripts/disable-windows-update.ps1 | 0 .../scripts/fix-tls.ps1 | 0 .../scripts/install-git.ps1 | 0 .../scripts/install-nuget.ps1 | 0 .../scripts/install-openssh.ps1 | 0 .../scripts/install-tipi.ps1 | 0 .../scripts/install-vcredist.ps1 | 0 .../scripts/install-vs.ps1 | 0 .../scripts/runtime/helpers.ps1 | 0 .../scripts/runtime/sync-tipi-distro.ps1 | 0 .../scripts/setup-winrm.ps1 | 0 .../scripts/update-root-certificate-store.ps1 | 0 .../vs-16-2019.js.mustache | 7 +++++++ 17 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 windows-vs-16-2019-win64-cxx17.cmake create mode 100644 windows-vs-16-2019-win64.cmake rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/disable-windows-defender.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/disable-windows-update.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/fix-tls.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-git.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-nuget.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-openssh.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-tipi.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-vcredist.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/install-vs.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/runtime/helpers.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/runtime/sync-tipi-distro.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/setup-winrm.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/scripts/update-root-certificate-store.ps1 (100%) rename {vs-16-2019.pkr.js => windows-vs-16-2019.pkr.js}/vs-16-2019.js.mustache (94%) diff --git a/build_engine_mapping.json b/build_engine_mapping.json index 2663e9c..dba328e 100644 --- a/build_engine_mapping.json +++ b/build_engine_mapping.json @@ -1,4 +1,6 @@ { "vs-15-2017-win64-cxx17" : "Visual Studio 15 2017 Win64", - "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019" + "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019", + "windows-vs-16-2019-win64-cxx17" : "Visual Studio 16 2019" + } \ No newline at end of file diff --git a/windows-vs-16-2019-win64-cxx17.cmake b/windows-vs-16-2019-win64-cxx17.cmake new file mode 100644 index 0000000..a806b21 --- /dev/null +++ b/windows-vs-16-2019-win64-cxx17.cmake @@ -0,0 +1,18 @@ +# Copyright (c) 2015-2017, Ruslan Baratov +# All rights reserved. + +if(DEFINED POLLY_VS_16_2019_WIN64_CXX17_CMAKE_) + return() +else() + set(POLLY_VS_16_2019_WIN64_CXX17_CMAKE_ 1) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake") + +polly_init( + "Visual Studio 16 2019 Win64 / C++17" + "Visual Studio 16 2019" +) + +include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/flags/vs-cxx17.cmake") diff --git a/windows-vs-16-2019-win64.cmake b/windows-vs-16-2019-win64.cmake new file mode 100644 index 0000000..2c123e7 --- /dev/null +++ b/windows-vs-16-2019-win64.cmake @@ -0,0 +1,17 @@ +# Copyright (c) 2015-2017, Ruslan Baratov +# All rights reserved. + +if(DEFINED POLLY_VS_16_2019_WIN64_CMAKE_) + return() +else() + set(POLLY_VS_16_2019_WIN64_CMAKE_ 1) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake") + +polly_init( + "Visual Studio 16 2019" + "Visual Studio 16 2019" +) + +include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake") diff --git a/vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 b/windows-vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 rename to windows-vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 diff --git a/vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 b/windows-vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 rename to windows-vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 diff --git a/vs-16-2019.pkr.js/scripts/fix-tls.ps1 b/windows-vs-16-2019.pkr.js/scripts/fix-tls.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/fix-tls.ps1 rename to windows-vs-16-2019.pkr.js/scripts/fix-tls.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-git.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-git.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-git.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-git.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-nuget.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-nuget.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-nuget.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-nuget.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-openssh.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-openssh.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-openssh.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-openssh.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-tipi.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-tipi.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-tipi.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-tipi.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-vcredist.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-vcredist.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-vcredist.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-vcredist.ps1 diff --git a/vs-16-2019.pkr.js/scripts/install-vs.ps1 b/windows-vs-16-2019.pkr.js/scripts/install-vs.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/install-vs.ps1 rename to windows-vs-16-2019.pkr.js/scripts/install-vs.ps1 diff --git a/vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 b/windows-vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 rename to windows-vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 diff --git a/vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 b/windows-vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 rename to windows-vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 diff --git a/vs-16-2019.pkr.js/scripts/setup-winrm.ps1 b/windows-vs-16-2019.pkr.js/scripts/setup-winrm.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/setup-winrm.ps1 rename to windows-vs-16-2019.pkr.js/scripts/setup-winrm.ps1 diff --git a/vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 b/windows-vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 similarity index 100% rename from vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 rename to windows-vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 diff --git a/vs-16-2019.pkr.js/vs-16-2019.js.mustache b/windows-vs-16-2019.pkr.js/vs-16-2019.js.mustache similarity index 94% rename from vs-16-2019.pkr.js/vs-16-2019.js.mustache rename to windows-vs-16-2019.pkr.js/vs-16-2019.js.mustache index fdc5197..e7a996c 100644 --- a/vs-16-2019.pkr.js/vs-16-2019.js.mustache +++ b/windows-vs-16-2019.pkr.js/vs-16-2019.js.mustache @@ -93,6 +93,13 @@ "./scripts/install-tipi.ps1" ] }, + { + "type": "powershell", + "inline": [ + "Invoke-WebRequest -Uri 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py'", + "tipi run 'python get-pip.py'" + ] + }, { "type": "powershell", "inline": [ From c771dbd7e35fb38c0a4e736f13ea5a68e22152f3 Mon Sep 17 00:00:00 2001 From: Lambourl Date: Fri, 22 Apr 2022 09:33:34 +0200 Subject: [PATCH 2/4] :wrench: fix macos deployment --- macos.pkr.js/macos.pkr.js.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macos.pkr.js/macos.pkr.js.mustache b/macos.pkr.js/macos.pkr.js.mustache index da2156b..1baca7d 100644 --- a/macos.pkr.js/macos.pkr.js.mustache +++ b/macos.pkr.js/macos.pkr.js.mustache @@ -45,7 +45,7 @@ "export TIPI_HOME_DIR=/var/root/.tipi", "sudo chown -R tipibuild /var/root/", "export TIPI_DISTRO_MODE=all", - "export TIPI_INSTALL_VERSION={{tipi_cli_version}} && bin/bash -c \"$(curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/master/install/install_for_macos_linux.sh )\"" + "export TIPI_INSTALL_VERSION={{tipi_cli_version}} && /bin/bash -c \"$(curl -fsSL https://raw.githubusercontent.com/tipi-build/cli/master/install/install_for_macos_linux.sh )\"" ] } ] From 56ed3cd057384e8e6e8579dded4e21949eb9d432 Mon Sep 17 00:00:00 2001 From: "Damien Buhl (alias daminetreg)" Date: Wed, 4 May 2022 20:55:39 +0200 Subject: [PATCH 3/4] :wrench: name the file as the target to get the environment to build. --- .../{vs-16-2019.js.mustache => windows-vs-16-2019.js.mustache} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename windows-vs-16-2019.pkr.js/{vs-16-2019.js.mustache => windows-vs-16-2019.js.mustache} (100%) diff --git a/windows-vs-16-2019.pkr.js/vs-16-2019.js.mustache b/windows-vs-16-2019.pkr.js/windows-vs-16-2019.js.mustache similarity index 100% rename from windows-vs-16-2019.pkr.js/vs-16-2019.js.mustache rename to windows-vs-16-2019.pkr.js/windows-vs-16-2019.js.mustache From a4f9a123fb9b1a942039dc56ca252f923f437ece Mon Sep 17 00:00:00 2001 From: Lambourl Date: Mon, 14 Nov 2022 10:39:23 +0100 Subject: [PATCH 4/4] :wrench: dont copy paste use include --- build_engine_mapping.json | 4 ++-- windows-vs-16-2019-win64-cxx17.cmake | 19 +------------------ windows-vs-16-2019-win64.cmake | 18 +----------------- .../scripts/disable-windows-defender.ps1 | 0 .../scripts/disable-windows-update.ps1 | 0 .../scripts/fix-tls.ps1 | 0 .../scripts/install-git.ps1 | 0 .../scripts/install-nuget.ps1 | 0 .../scripts/install-openssh.ps1 | 0 .../scripts/install-tipi.ps1 | 0 .../scripts/install-vcredist.ps1 | 0 .../scripts/install-vs.ps1 | 0 .../scripts/runtime/helpers.ps1 | 0 .../scripts/runtime/sync-tipi-distro.ps1 | 0 .../scripts/setup-winrm.ps1 | 0 .../scripts/update-root-certificate-store.ps1 | 0 .../windows-vs-16-2019-win64.js.mustache | 0 17 files changed, 4 insertions(+), 37 deletions(-) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/disable-windows-defender.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/disable-windows-update.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/fix-tls.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-git.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-nuget.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-openssh.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-tipi.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-vcredist.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/install-vs.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/runtime/helpers.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/runtime/sync-tipi-distro.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/setup-winrm.ps1 (100%) rename {windows-vs-16-2019.pkr.js => windows-vs-16-2019-win64.pkr.js}/scripts/update-root-certificate-store.ps1 (100%) rename windows-vs-16-2019.pkr.js/windows-vs-16-2019.js.mustache => windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache (100%) diff --git a/build_engine_mapping.json b/build_engine_mapping.json index dba328e..de078eb 100644 --- a/build_engine_mapping.json +++ b/build_engine_mapping.json @@ -1,6 +1,6 @@ { "vs-15-2017-win64-cxx17" : "Visual Studio 15 2017 Win64", "vs-16-2019-win64-cxx17" : "Visual Studio 16 2019", - "windows-vs-16-2019-win64-cxx17" : "Visual Studio 16 2019" - + "windows-vs-16-2019-win64-cxx17" : "Visual Studio 16 2019", + "windows-vs-16-2019-win64" : "Visual Studio 16 2019" } \ No newline at end of file diff --git a/windows-vs-16-2019-win64-cxx17.cmake b/windows-vs-16-2019-win64-cxx17.cmake index a806b21..0988018 100644 --- a/windows-vs-16-2019-win64-cxx17.cmake +++ b/windows-vs-16-2019-win64-cxx17.cmake @@ -1,18 +1 @@ -# Copyright (c) 2015-2017, Ruslan Baratov -# All rights reserved. - -if(DEFINED POLLY_VS_16_2019_WIN64_CXX17_CMAKE_) - return() -else() - set(POLLY_VS_16_2019_WIN64_CXX17_CMAKE_ 1) -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake") - -polly_init( - "Visual Studio 16 2019 Win64 / C++17" - "Visual Studio 16 2019" -) - -include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake") -include("${CMAKE_CURRENT_LIST_DIR}/flags/vs-cxx17.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vs-16-2019-win64-cxx17.cmake") diff --git a/windows-vs-16-2019-win64.cmake b/windows-vs-16-2019-win64.cmake index 2c123e7..0988018 100644 --- a/windows-vs-16-2019-win64.cmake +++ b/windows-vs-16-2019-win64.cmake @@ -1,17 +1 @@ -# Copyright (c) 2015-2017, Ruslan Baratov -# All rights reserved. - -if(DEFINED POLLY_VS_16_2019_WIN64_CMAKE_) - return() -else() - set(POLLY_VS_16_2019_WIN64_CMAKE_ 1) -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake") - -polly_init( - "Visual Studio 16 2019" - "Visual Studio 16 2019" -) - -include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vs-16-2019-win64-cxx17.cmake") diff --git a/windows-vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-defender.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/disable-windows-defender.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-defender.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-update.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/disable-windows-update.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/disable-windows-update.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/fix-tls.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/fix-tls.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/fix-tls.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/fix-tls.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-git.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-git.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-git.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-git.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-nuget.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-nuget.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-nuget.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-nuget.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-openssh.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-openssh.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-openssh.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-openssh.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-tipi.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-tipi.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-tipi.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-tipi.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-vcredist.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-vcredist.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-vcredist.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-vcredist.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/install-vs.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/install-vs.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/install-vs.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/install-vs.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/runtime/helpers.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/runtime/helpers.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/runtime/helpers.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/runtime/sync-tipi-distro.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/runtime/sync-tipi-distro.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/runtime/sync-tipi-distro.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/setup-winrm.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/setup-winrm.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/setup-winrm.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/setup-winrm.ps1 diff --git a/windows-vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 b/windows-vs-16-2019-win64.pkr.js/scripts/update-root-certificate-store.ps1 similarity index 100% rename from windows-vs-16-2019.pkr.js/scripts/update-root-certificate-store.ps1 rename to windows-vs-16-2019-win64.pkr.js/scripts/update-root-certificate-store.ps1 diff --git a/windows-vs-16-2019.pkr.js/windows-vs-16-2019.js.mustache b/windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache similarity index 100% rename from windows-vs-16-2019.pkr.js/windows-vs-16-2019.js.mustache rename to windows-vs-16-2019-win64.pkr.js/windows-vs-16-2019-win64.js.mustache