From fbafa41ebca225b2047725a25daebb4a9ec34b5b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 12:36:52 -0700 Subject: [PATCH 01/62] travis-ci: add Windows support. --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20fbad2..e6925fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,12 @@ matrix: - AMB="install --user" - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" -# - os: windows -# language: cpp -# env: -# - AMB="install" -# - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" -# - RELEASE_PKG_FILE="package-win.tgz" + - os: windows + language: cpp + env: + - AMB="install" + - PATH="$PATH:/C/ProgramData/chocolatey/bin" + - RELEASE_PKG_FILE="package-win.tgz" - os: mac osx_image: xcode7.2 language: cpp @@ -49,6 +49,7 @@ before_script: - cd .. script: + - uname -a || (choco install visualstudio2012professional && "%VS120COMNTOOLS%\vsvars32.bat") - mkdir build - cd build - cp ../AMBuildScript ../../ From 090c30ae64e6aed4bc1ac603045599d75bf71e49 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 12:46:22 -0700 Subject: [PATCH 02/62] travis-ci: msvc 2015 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e6925fc..58ac4ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a || (choco install visualstudio2012professional && "%VS120COMNTOOLS%\vsvars32.bat") + - uname -a | grep MSYS_NT && choco install choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat" - mkdir build - cd build - cp ../AMBuildScript ../../ From 31816115d38cd98a776eb58e58380bf2d8e52c3e Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 12:57:46 -0700 Subject: [PATCH 03/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 58ac4ad..6788ab9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: cpp env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" - RELEASE_PKG_FILE="package-win.tgz" - os: mac osx_image: xcode7.2 @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep MSYS_NT && choco install choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat" + - uname -a | grep MSYS_NT && choco install choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat || uname -a" - mkdir build - cd build - cp ../AMBuildScript ../../ From a67cbb23d6fb101dcb5422f5f1e1a2c613e57f35 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:00:25 -0700 Subject: [PATCH 04/62] travis-ci: travis_wait... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6788ab9..492c3b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep MSYS_NT && choco install choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat || uname -a" + - uname -a | grep MSYS_NT && travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat || uname -a" - mkdir build - cd build - cp ../AMBuildScript ../../ From 290b9b77bb6d517e288fd3cfd60776bec7f52f47 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:07:20 -0700 Subject: [PATCH 05/62] travis-ci: braces 4lyphe. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 492c3b8..c126394 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep MSYS_NT && travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat || uname -a" + - uname -a | grep MSYS_NT && (travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat) || uname -a" - mkdir build - cd build - cp ../AMBuildScript ../../ From 307600b4a557819126a369478a765e5eb15f868f Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:15:48 -0700 Subject: [PATCH 06/62] travis-ci: oh, right... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c126394..fc95907 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep MSYS_NT && (travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat) || uname -a" + - (uname -a | grep Msys && travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat) || uname -a" - mkdir build - cd build - cp ../AMBuildScript ../../ From b373c6de05a511a8da15601684e41dc48274b9ca Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:24:56 -0700 Subject: [PATCH 07/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc95907..1f83486 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - (uname -a | grep Msys && travis_wait 30 choco install visualstudio2015professional && "%VS140COMNTOOLS%\vsvars32.bat) || uname -a" + - (uname -a | grep Msys && travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat) || echo :-)" - mkdir build - cd build - cp ../AMBuildScript ../../ From b3595fc6978877bdf9e1b9164eceb8614c99148f Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:28:26 -0700 Subject: [PATCH 08/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f83486..d3033fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - (uname -a | grep Msys && travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat) || echo :-)" + - (uname -a | grep Msys) && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat) || echo :-)" - mkdir build - cd build - cp ../AMBuildScript ../../ From eecf7c02239e31a14142cf1808870a2247f86e06 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:32:36 -0700 Subject: [PATCH 09/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3033fa..4956b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - (uname -a | grep Msys) && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat) || echo :-)" + - (uname -a | grep Msys) && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat") || echo ':-)'" - mkdir build - cd build - cp ../AMBuildScript ../../ From ac905e09780f0f6fad83a6f6488b5a02701f2d3b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:37:41 -0700 Subject: [PATCH 10/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4956b5d..839422e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - (uname -a | grep Msys) && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat") || echo ':-)'" + - uname -a | grep Msys || exit 0 && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat") - mkdir build - cd build - cp ../AMBuildScript ../../ From ae36dfc0d6997920340395fa5b50224adb923a36 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:44:04 -0700 Subject: [PATCH 11/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 839422e..b6563d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep Msys || exit 0 && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && "%VS140COMNTOOLS%\vsvars32.bat") + - uname -a | grep Msys || exit 0 && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && cmd /c "%VS140COMNTOOLS%\vsvars32.bat") - mkdir build - cd build - cp ../AMBuildScript ../../ From 9274d8a55aebc599aa883a5199b1d8e363e6793d Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:51:25 -0700 Subject: [PATCH 12/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b6563d3..930fd28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ before_script: - cd .. script: - - uname -a | grep Msys || exit 0 && (travis_wait 30 choco install microsoft-visual-cpp-build-tools && cmd /c "%VS140COMNTOOLS%\vsvars32.bat") + - uname -a | grep Msys || exit 0 && (choco install microsoft-visual-cpp-build-tools && cmd /c "%VS140COMNTOOLS%\vsvars32.bat") - mkdir build - cd build - cp ../AMBuildScript ../../ From 56514cc5867839cf905bd010d0d0f308fa555384 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 13:59:14 -0700 Subject: [PATCH 13/62] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 930fd28..e21cd68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,8 @@ before_script: - cd .. script: - - uname -a | grep Msys || exit 0 && (choco install microsoft-visual-cpp-build-tools && cmd /c "%VS140COMNTOOLS%\vsvars32.bat") + - uname -a | grep Msys || echo ":-)" && choco install microsoft-visual-cpp-build-tools + - cmd /c "%VS140COMNTOOLS%\vsvars32.bat" || echo ":-)" - mkdir build - cd build - cp ../AMBuildScript ../../ From 6fefbfe7515b071e0cf3a5a6330396de5de8ca79 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:08:10 -0700 Subject: [PATCH 14/62] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e21cd68..2887f41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: + - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && start /wait "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild @@ -49,8 +50,6 @@ before_script: - cd .. script: - - uname -a | grep Msys || echo ":-)" && choco install microsoft-visual-cpp-build-tools - - cmd /c "%VS140COMNTOOLS%\vsvars32.bat" || echo ":-)" - mkdir build - cd build - cp ../AMBuildScript ../../ From 89126383595001546542f30e3888faef55dfedfc Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:13:45 -0700 Subject: [PATCH 15/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2887f41..1cd7719 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && start /wait "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" + - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && call "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From f6ff44c893d67d7cd66a14d7117cb6642db80bff Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:24:54 -0700 Subject: [PATCH 16/62] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1cd7719..ab9c713 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,8 @@ matrix: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" - RELEASE_PKG_FILE="package-win.tgz" + - CC=CL.exe + - CXX=CL.exe - os: mac osx_image: xcode7.2 language: cpp From ddc42667fa794f27a2339db69316654b6b9ce34a Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:26:46 -0700 Subject: [PATCH 17/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ab9c713..f4324cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" - os: windows - language: cpp + language: bash env: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" From 5c89eee2aad0bbd865c86618fd2ff9b400b71e29 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:35:23 -0700 Subject: [PATCH 18/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f4324cb..30e5411 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/14.20.27508/bin/Hostx86/x86" - RELEASE_PKG_FILE="package-win.tgz" - CC=CL.exe - CXX=CL.exe @@ -38,7 +38,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && call "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" + - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && call "%VS140COMNTOOLS%\vsvars32.bat" && echo %VS140COMNTOOLS%) || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From d908675400ab9e1eeff5069738bbcb64de69199c Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:44:22 -0700 Subject: [PATCH 19/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30e5411..0d0b954 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2019/Community/VC/Tools/MSVC/14.20.27508/bin/Hostx86/x86" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2015/Community/VC/Tools/MSVC/14.20.27508/bin/Hostx86/x86" - RELEASE_PKG_FILE="package-win.tgz" - CC=CL.exe - CXX=CL.exe @@ -38,7 +38,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && call "%VS140COMNTOOLS%\vsvars32.bat" && echo %VS140COMNTOOLS%) || echo ":-)" + - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && echo %VS140COMNTOOLS% && dir %VS140COMNTOOLS% && call "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From 6f3d2778fef680e06f96f5471ced2a9a064ec6be Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 14:48:34 -0700 Subject: [PATCH 20/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d0b954..d64f0a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2015/Community/VC/Tools/MSVC/14.20.27508/bin/Hostx86/x86" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/" - RELEASE_PKG_FILE="package-win.tgz" - CC=CL.exe - CXX=CL.exe @@ -38,7 +38,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools && echo %VS140COMNTOOLS% && dir %VS140COMNTOOLS% && call "%VS140COMNTOOLS%\vsvars32.bat") || echo ":-)" + - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools) || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From db79052b962269d44cd6a43610956a8646a1ce17 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:08:05 -0700 Subject: [PATCH 21/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d64f0a4..b100b7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin" - RELEASE_PKG_FILE="package-win.tgz" - CC=CL.exe - CXX=CL.exe @@ -38,7 +38,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install microsoft-visual-cpp-build-tools) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From 22cf7407fc8a915e7fcbd6268c75ff62a89b5efb Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:11:16 -0700 Subject: [PATCH 22/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b100b7a..81fe4ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install -y vcbuildtools) || echo ":-)" + - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone https://github.com/alliedmodders/ambuild.git - cd ambuild From 95459743204b08bf9ab778d5ab5e4b106fc8cdc3 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:17:53 -0700 Subject: [PATCH 23/62] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 81fe4ca..601427b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,10 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" - RELEASE_PKG_FILE="package-win.tgz" - - CC=CL.exe - - CXX=CL.exe + - CC="/C/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" + - CXX="/C/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" - os: mac osx_image: xcode7.2 language: cpp From 75bc8b7dc9f051bdb042eca0ad759877331e7741 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:24:34 -0700 Subject: [PATCH 24/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 601427b..c0a50ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ matrix: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" - RELEASE_PKG_FILE="package-win.tgz" - - CC="/C/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" - - CXX="/C/Program\ Files\ (x86)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" + - CC="/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" + - CXX=($CC) - os: mac osx_image: xcode7.2 language: cpp From b83849c3bc84791f21a35850198217cb322b2039 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:32:22 -0700 Subject: [PATCH 25/62] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0a50ac..9c61cfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,10 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:"/c/\"Program Files (x86)\"/\"Microsoft Visual Studio 14.0\"/VC/bin/"" - RELEASE_PKG_FILE="package-win.tgz" - - CC="/C/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 14.0/VC/bin/cl.exe" - - CXX=($CC) + - CC="cl.exe" + - CXX="$CC" - os: mac osx_image: xcode7.2 language: cpp From 3f1b72de28ea897de40c819850a8316624ca2f69 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:33:22 -0700 Subject: [PATCH 26/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c61cfd..07a470e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:"/c/\"Program Files (x86)\"/\"Microsoft Visual Studio 14.0\"/VC/bin/"" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/\"Program Files (x86)\"/\"Microsoft Visual Studio 14.0\"/VC/bin" - RELEASE_PKG_FILE="package-win.tgz" - CC="cl.exe" - CXX="$CC" From d3ec270cb69eeabbd9afe07e7ab8dd3e872b08e8 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 12 Jul 2020 15:53:32 -0700 Subject: [PATCH 27/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07a470e..e1334b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/\"Program Files (x86)\"/\"Microsoft Visual Studio 14.0\"/VC/bin" + - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" - RELEASE_PKG_FILE="package-win.tgz" - CC="cl.exe" - CXX="$CC" From e77bc4e260461e903b814bbc7e7b88143d1e41f0 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:06:00 -0700 Subject: [PATCH 28/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e1334b1..a476731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - - git clone https://github.com/alliedmodders/ambuild.git + - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - cd ambuild - python setup.py build - python setup.py $AMB From 670cfda4e2d323e8486f5bd9d89abbee2535f5aa Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:15:07 -0700 Subject: [PATCH 29/62] Update .travis.yml --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a476731..806c0b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,6 @@ matrix: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" - RELEASE_PKG_FILE="package-win.tgz" - - CC="cl.exe" - - CXX="$CC" - os: mac osx_image: xcode7.2 language: cpp @@ -41,10 +39,7 @@ before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - - cd ambuild - - python setup.py build - - python setup.py $AMB - - cd .. + - python2 -m pip $AMB ./ambuild - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central From 0283bd0116a1b8e0d57746f1776367b46f69de27 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:22:54 -0700 Subject: [PATCH 30/62] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 806c0b9..93367c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ matrix: before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - python2 -m pip $AMB ./ambuild From 0098a457c88a434194b5d9fee2092f3e1c927e33 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:28:32 -0700 Subject: [PATCH 31/62] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93367c5..fa0c337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,10 +37,10 @@ matrix: before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py) || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - - python2 -m pip $AMB ./ambuild + - python3 -m pip $AMB ./ambuild - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central @@ -51,7 +51,7 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - python2 ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - python3 ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From fe78950d6cdc864094742570c5562b8e7d20542c Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:35:25 -0700 Subject: [PATCH 32/62] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fa0c337..3eddda0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,10 +37,10 @@ matrix: before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py) || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade setuptools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - - python3 -m pip $AMB ./ambuild + - python2 -m pip $AMB ./ambuild - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central @@ -51,7 +51,7 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - python3 ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - python2 ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From ae494b2e5234496516005a8dbdfe68f970e2ac36 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:41:04 -0700 Subject: [PATCH 33/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3eddda0..8fa3eee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,8 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade setuptools || echo "eh") || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade setuptools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - python2 -m pip $AMB ./ambuild From 8ef4770e9e5cb9f4675d02bbf8ab0cef17cc7d89 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:45:07 -0700 Subject: [PATCH 34/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8fa3eee..5d4d679 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade setuptools || echo "eh") || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 -m pip uninstall pip setuptools && python2 get-pip.py && python2 -m pip install --upgrade setuptools || echo "eh") || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From e8ed1ddcee42a89b2b58f79263c957b085b4d259 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:47:41 -0700 Subject: [PATCH 35/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d4d679..6113651 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 -m pip uninstall pip setuptools && python2 get-pip.py && python2 -m pip install --upgrade setuptools || echo "eh") || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade pip && python2 -m pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 2be28226ada9dc898f95c8135b222230795ac912 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:53:25 -0700 Subject: [PATCH 36/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6113651..fdeb452 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python2 -m pip install --upgrade pip && python2 -m pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python -m pip uninstall pip setuptools && pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 01242dfb2088115aa725b5934b44778dff98781a Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:55:23 -0700 Subject: [PATCH 37/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fdeb452..a8a3f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && python -m pip uninstall pip setuptools && pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 37169f1079947445a3cb7b445820505068a912a0 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 13:58:19 -0700 Subject: [PATCH 38/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8a3f44..f7ebf46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" - os: windows - language: bash + language: python env: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (curl -O https://bootstrap.pypa.io/get-pip.py && python2 get-pip.py && pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 2c65f1de764075c40fd68626a03ca51d82a2c75b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:02:46 -0700 Subject: [PATCH 39/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f7ebf46..28b1200 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y pip && pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 7e130423801ef4cac8f98121280d9f64cbcbed9c Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:03:00 -0700 Subject: [PATCH 40/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28b1200..1ff95a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" - os: windows - language: python + language: bash env: - AMB="install" - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" From fc775811cd853b98657ab832b0b9e6f45191b1fd Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:06:56 -0700 Subject: [PATCH 41/62] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ff95a3..d45aa0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: language: bash env: - AMB="install" - - PATH="$PATH:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" + - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" - RELEASE_PKG_FILE="package-win.tgz" - os: mac osx_image: xcode7.2 @@ -40,7 +40,7 @@ before_script: - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - - python2 -m pip $AMB ./ambuild + - python -m pip $AMB ./ambuild - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central @@ -51,7 +51,7 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - python2 ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - python ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 498c63c81e249ff6d6f7cd01ea0251ab33da3917 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:10:11 -0700 Subject: [PATCH 42/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d45aa0f..0a09900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install -y pip && pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y pip || pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 49c9eaa4cea5510b80dec1de8d00f36b8f3e0112 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:17:05 -0700 Subject: [PATCH 43/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0a09900..8cc70e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: - RELEASE_PKG_FILE="package-mac.tgz" before_script: - - (uname -a | grep Msys) && (choco install -y pip || pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y python && choco install -y pip || pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From 5cc0e7b0e454a4666d2c1661977faa050f00f6f4 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:51:36 -0700 Subject: [PATCH 44/62] Update .travis.yml --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc70e0..5e04510 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,14 @@ matrix: - AMB="install --user" - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" + - PLATWRAP="sh -c" - os: windows language: bash env: - AMB="install" - - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin:/C/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/opt/bin:/c/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin" + - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin" - RELEASE_PKG_FILE="package-win.tgz" + - PLATWRAP="powershell" - os: mac osx_image: xcode7.2 language: cpp @@ -34,10 +36,11 @@ matrix: - AMB="install" - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-mac.tgz" + - PLATWRAP="sh -c" before_script: - - (uname -a | grep Msys) && (choco install -y python && choco install -y pip || pip install --upgrade setuptools) || echo ":-)" - - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" + - (uname -a | grep Msys) && ($PLATWRAP choco install -y pip && pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - python -m pip $AMB ./ambuild @@ -51,7 +54,7 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - python ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - $PLATWRAP python ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From ff5ca5571ad3c5e490df14ca28e5880461d219d9 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:55:10 -0700 Subject: [PATCH 45/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e04510..ad54256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: - PLATWRAP="sh -c" before_script: - - (uname -a | grep Msys) && ($PLATWRAP choco install -y pip && pip install --upgrade setuptools) || echo ":-)" + - (uname -a | grep Msys) && ($PLATWRAP choco install -y pip && pip install --upgrade setuptools || ls -la /c/python38) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git From f11bce3bc072afb738f3d92fa3c2a3362ff3c5ff Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 14:57:26 -0700 Subject: [PATCH 46/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad54256..f9603bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - AMB="install" - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin" - RELEASE_PKG_FILE="package-win.tgz" - - PLATWRAP="powershell" + - PLATWRAP="powershell -ExecutionPolicy Bypass" - os: mac osx_image: xcode7.2 language: cpp From a68d38fa0cbfdba5c84bffbc5296ea049919d674 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:01:34 -0700 Subject: [PATCH 47/62] Update .travis.yml --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9603bd..ec19a96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" - PLATWRAP="sh -c" + - SNAKEWRAP="python" - os: windows language: bash env: @@ -28,6 +29,7 @@ matrix: - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin" - RELEASE_PKG_FILE="package-win.tgz" - PLATWRAP="powershell -ExecutionPolicy Bypass" + - SNAKEWRAP="/C/python38/python.exe" - os: mac osx_image: xcode7.2 language: cpp @@ -37,13 +39,14 @@ matrix: - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-mac.tgz" - PLATWRAP="sh -c" + - SNAKEWRAP="python" before_script: - - (uname -a | grep Msys) && ($PLATWRAP choco install -y pip && pip install --upgrade setuptools || ls -la /c/python38) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y pip && pip install --upgrade setuptools) || echo ":-)" - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - - python -m pip $AMB ./ambuild + - $SNAKEWRAP -m pip $AMB ./ambuild - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central @@ -54,7 +57,7 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - $PLATWRAP python ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - $PLATWRAP $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 24868a48b3f38fea475e3335c0b27426f6afb8e0 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:18:08 -0700 Subject: [PATCH 48/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec19a96..027f304 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ matrix: before_script: - (uname -a | grep Msys) && (choco install -y pip && pip install --upgrade setuptools) || echo ":-)" - - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools) || echo ":-)" + - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools && $PLATWRAP refreshenv) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - $SNAKEWRAP -m pip $AMB ./ambuild From 3bc4d5c26021c2174854ef46e9c785e4a0691f6b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:26:12 -0700 Subject: [PATCH 49/62] Update .travis.yml --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 027f304..3c6d31c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ matrix: - AMB="install --user" - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-lin.tgz" - - PLATWRAP="sh -c" - SNAKEWRAP="python" - os: windows language: bash @@ -28,7 +27,6 @@ matrix: - AMB="install" - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin" - RELEASE_PKG_FILE="package-win.tgz" - - PLATWRAP="powershell -ExecutionPolicy Bypass" - SNAKEWRAP="/C/python38/python.exe" - os: mac osx_image: xcode7.2 @@ -38,12 +36,11 @@ matrix: - AMB="install" - PATH="~/.local/bin:$PATH" - RELEASE_PKG_FILE="package-mac.tgz" - - PLATWRAP="sh -c" - SNAKEWRAP="python" before_script: - - (uname -a | grep Msys) && (choco install -y pip && pip install --upgrade setuptools) || echo ":-)" - - (uname -a | grep Msys) && (travis_wait 90 $PLATWRAP choco install -y vcbuildtools && $PLATWRAP refreshenv) || echo ":-)" + - (uname -a | grep Msys) && (choco install -y pip) || echo ":-)" + - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - $SNAKEWRAP -m pip $AMB ./ambuild @@ -57,7 +54,8 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ - - $PLATWRAP $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" + - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 7b1059face2713f327f74bf7440c6afd14991f7b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:32:40 -0700 Subject: [PATCH 50/62] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3c6d31c..dda97e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,9 @@ script: - mkdir build - cd build - cp ../AMBuildScript ../../ + - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" + - env - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From e91a25bd6d0375b6865d61beb3b46c0d2781105b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:40:07 -0700 Subject: [PATCH 51/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dda97e9..6879695 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: before_script: - (uname -a | grep Msys) && (choco install -y pip) || echo ":-)" - - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools) || echo ":-)" + - (uname -a | grep Msys) && (travis_wait 90 choco install -y vcbuildtools && choco install vswhere) || echo ":-)" - mkdir assets && cd assets - git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git - $SNAKEWRAP -m pip $AMB ./ambuild From be9623b55b4364618e95738e8e291c2f5f740a4b Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:50:54 -0700 Subject: [PATCH 52/62] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6879695..920344d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,8 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK + - powershell -ExecutionPolicy Bypass "\"$VS140COMNTOOLS/vcvars32.bat\" && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK" || echo hi + - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From a8fe7c6082323b9fdcae06971095620295c3ffbc Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 15:59:16 -0700 Subject: [PATCH 53/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 920344d..1dcb476 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - powershell -ExecutionPolicy Bypass "\"$VS140COMNTOOLS/vcvars32.bat\" && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK" || echo hi + - powershell -ExecutionPolicy Bypass "\"$VS140COMNTOOLS/vcvars32.bat\" -and $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK" || echo hi - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 9ca14f47f7fa620ca56c0becf5a958c1ec4412ce Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:02:38 -0700 Subject: [PATCH 54/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1dcb476..c99f5a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - powershell -ExecutionPolicy Bypass "\"$VS140COMNTOOLS/vcvars32.bat\" -and $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK" || echo hi + - powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/vcvars32.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From c7d0ecbbdaaa1372d3f2cf7e469697db7b66cc23 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:11:36 -0700 Subject: [PATCH 55/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c99f5a0..79c3622 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - AMB="install" - PATH="$PATH:/C/python38:/C/python38/Scripts:/C/ProgramData/chocolatey/bin" - RELEASE_PKG_FILE="package-win.tgz" - - SNAKEWRAP="/C/python38/python.exe" + - SNAKEWRAP="C:/python38/python.exe" - os: mac osx_image: xcode7.2 language: cpp @@ -57,7 +57,7 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/vcvars32.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi + - powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From bdbf8d3116d0fa2c3d39591391b768383b730e51 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:18:24 -0700 Subject: [PATCH 56/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79c3622..b2a2ef6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi - - $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi + - (uname -a | grep Msys) && powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi + - (uname -a | grep Msys) || $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 3d2f9fb3d7ac060be62ae707f7dbc512c77b5d05 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:24:48 -0700 Subject: [PATCH 57/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2a2ef6..2b82073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ script: - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - (uname -a | grep Msys) && powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi - - (uname -a | grep Msys) || $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi + - (uname -a | grep -v Msys) && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 05b40564adf82f63d3ad8448615a9bafb44ef0a9 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:25:45 -0700 Subject: [PATCH 58/62] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b82073..f70af6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,8 +57,8 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - (uname -a | grep Msys) && powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" || echo hi - - (uname -a | grep -v Msys) && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK || echo hi + - (uname -a | grep Msys) && powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" + - (uname -a | grep -v Msys) && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 63b29dcb853d67316eda4e6b5b20f9d77ad23c16 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 16:45:02 -0700 Subject: [PATCH 59/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f70af6f..1520f18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - (uname -a | grep Msys) && powershell -ExecutionPolicy Bypass "(\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\") -and ($SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK)" + - (uname -a | grep Msys) && powershell "cmd /c "\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\" && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK"" - (uname -a | grep -v Msys) && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From c516175ae59ec3611adcc9b23eef4c8d881d46c7 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sun, 9 Aug 2020 17:01:09 -0700 Subject: [PATCH 60/62] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1520f18..8b6a3ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ script: - env - eval "$(exec /usr/bin/env -i "${SHELL}" -l -c "export")" - env - - (uname -a | grep Msys) && powershell "cmd /c "\"$VS140COMNTOOLS/../../VC/vcvarsall.bat\" && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK"" + - (uname -a | grep Msys) && powershell "cmd /c "\"$VS140COMNTOOLS/vcvars32.bat\" && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK"" - (uname -a | grep -v Msys) && $SNAKEWRAP ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSDK - ambuild - tar czvf ${RELEASE_PKG_FILE} package From 51bee74d51c3bd79e2cb4c31669d77a9e3fc72e2 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sat, 22 Aug 2020 14:18:03 -0700 Subject: [PATCH 61/62] Create ci.yml --- .github/workflows/ci.yml | 52 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..a7b4e12 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,52 @@ +name: SteamWorks.ext Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + python-version: [2.7, 3.3, 3.8] + os: [ubuntu-18.04, macos-latest, windows-2019] + exclude: + - os: macos-latest + python-version: 3.3 + - os: windows-2019 + python-version: 3.3 + + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Install Deps + if: runner.os == 'Linux' + run: | + sudo dpkg --add-architecture i386 + sudo apt-get install lib32stdc++-7-dev lib32z1-dev libc6-dev-i386 + sudo apt-get install g++-multilib + - name: install AMBuild + run: | + mkdir assets + cd assets + git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b fix-deps https://github.com/alliedmodders/ambuild.git + pip install ./ambuild + - name: Clone Dependencies + run: | + git clone --depth 1 --recurse-submodules -j8 --shallow-submodules https://$OAUTH@github.com/SteamDatabase/SteamworksSDK.git SteamworksSDK + git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b sdk2013 https://github.com/alliedmodders/hl2sdk.git hl2sdk-sdk2013 + git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.10-dev https://github.com/alliedmodders/metamod-source.git mmsource-central + git clone --depth 1 --recurse-submodules -j8 --shallow-submodules -b 1.7-dev https://github.com/alliedmodders/sourcemod.git sourcemod-central + - name: Run Build + run: | + mkdir build + cd build + cp ../AMBuildScript ../../ + python ../configure.py -s sdk2013 --hl2sdk-root ../assets --sm-path ../assets/sourcemod-central --mms-path ../assets/mmsource-central --steamworks-path ../assets/SteamworksSD + ambuild From 0928b4cafa741d65a7882cb5c22b1eabe3fe0068 Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Sat, 22 Aug 2020 14:20:09 -0700 Subject: [PATCH 62/62] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7b4e12..bd15101 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: SteamWorks.ext Build on: push: - branches: [ master ] + branches: [ master, windows98 ] pull_request: - branches: [ master ] + branches: [ master, windows98 ] jobs: build: