From cea01e8ac8dbd2a004ef6db8138a89a196e32d53 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Mon, 7 Nov 2022 17:51:37 -0300 Subject: [PATCH 01/21] Use another cygwin mirror --- build-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-windows.sh b/build-windows.sh index e328ed5..f283891 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -6,7 +6,7 @@ else echo "cygwin root: $ROOT" LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" - $ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake --local-package-dir $LOCAL_PACKAGE_DIR --site=http://cygwin.mirror.constant.com/ --no-desktop --no-startmenu --no-shortcuts --verbose + $ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" From c2e2af5de83c3e5e13f40b93e267fcba5ba2a05a Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 06:58:29 -0300 Subject: [PATCH 02/21] Add github workflow --- .github/windows.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/windows.yml diff --git a/.github/windows.yml b/.github/windows.yml new file mode 100644 index 0000000..7166fae --- /dev/null +++ b/.github/windows.yml @@ -0,0 +1,20 @@ +ame: CI-windows + +on: + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Esy setup + run: | + esy install + esy bootstrap + esy build --verbosity=debug + From fd5ed1868f2f732000aab21df47356273631e6d5 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 06:59:41 -0300 Subject: [PATCH 03/21] Fix bug --- .github/{ => workflows}/windows.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/windows.yml (100%) diff --git a/.github/windows.yml b/.github/workflows/windows.yml similarity index 100% rename from .github/windows.yml rename to .github/workflows/windows.yml From acd1495ca4bcf487e187f8c1b959cd2a161d6d7e Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:00:14 -0300 Subject: [PATCH 04/21] Fix typo --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7166fae..c28e8cd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,4 +1,4 @@ -ame: CI-windows +name: CI-windows on: workflow_dispatch: From 8405502acf61e820910f25683efaa19e57921f78 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:03:55 -0300 Subject: [PATCH 05/21] Run build-windows.sh --- .github/workflows/windows.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c28e8cd..4154f90 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,7 +14,5 @@ jobs: - name: Esy setup run: | - esy install - esy bootstrap - esy build --verbosity=debug + bash -c build-windows.sh From 09cbed8d09982dd4139281a3dcbdc799dfc501da Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:06:26 -0300 Subject: [PATCH 06/21] Update windows.yml --- .github/workflows/windows.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 4154f90..7a80f95 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,5 +14,12 @@ jobs: - name: Esy setup run: | - bash -c build-windows.sh + npm install -g esy@latest + npm install -g windows-build-tools@4.0.0 + npm install -g node-gyp + node-gyp install 14.15.4 + node install-node-deps.js + esy install + esy bootstrap + esy build --verbosity=debug From 150bd3fbb0e7c17608f0057416681ce61156cafc Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:08:17 -0300 Subject: [PATCH 07/21] Install libuv1 --- build-windows.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-windows.sh b/build-windows.sh index f283891..f38eb05 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -6,7 +6,7 @@ else echo "cygwin root: $ROOT" LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" - $ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose + $ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake,libuv1 --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" From a547330d1b6a5e2eb9b203f22a8de115d12962d1 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:28:17 -0300 Subject: [PATCH 08/21] Use chocolatey --- build-windows.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build-windows.sh b/build-windows.sh index f38eb05..a363252 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -2,11 +2,12 @@ if cmake.exe --version; then echo "cmake already in path..." else echo "cmake not available, installing." - ROOT="$(cygpath -m /)" - echo "cygwin root: $ROOT" - LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" + #ROOT="$(cygpath -m /)" + #echo "cygwin root: $ROOT" + #LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" + choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - $ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake,libuv1 --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose + #$ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake,libuv1 --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" From fd36a6fc7fae586d228db5f506e2fbae3874f03e Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:38:23 -0300 Subject: [PATCH 09/21] Install choco --- .github/workflows/windows.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7a80f95..1229fbd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,12 +14,7 @@ jobs: - name: Esy setup run: | + Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) npm install -g esy@latest - npm install -g windows-build-tools@4.0.0 - npm install -g node-gyp - node-gyp install 14.15.4 - node install-node-deps.js esy install - esy bootstrap - esy build --verbosity=debug From 5c058c2f3c3b0366f32924fc4a5412ce9b3cd7a0 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:43:01 -0300 Subject: [PATCH 10/21] Update workflow --- .github/workflows/windows.yml | 2 +- build-windows.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1229fbd..b22e9e8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,7 +14,7 @@ jobs: - name: Esy setup run: | - Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) + # Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) npm install -g esy@latest esy install diff --git a/build-windows.sh b/build-windows.sh index a363252..37f4822 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -5,7 +5,7 @@ else #ROOT="$(cygpath -m /)" #echo "cygwin root: $ROOT" #LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" - choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' + choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' #$ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake,libuv1 --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose From b317b3e763165c84890f33a01d537f19009f949b Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 07:48:41 -0300 Subject: [PATCH 11/21] Remove comments --- build-windows.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build-windows.sh b/build-windows.sh index 37f4822..16595e9 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -2,13 +2,8 @@ if cmake.exe --version; then echo "cmake already in path..." else echo "cmake not available, installing." - #ROOT="$(cygpath -m /)" - #echo "cygwin root: $ROOT" - #LOCAL_PACKAGE_DIR="$(cygpath -w /var/cache/setup)" choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - #$ROOT/setup-x86_64.exe --root $ROOT -q --packages=cmake,libuv1 --local-package-dir $LOCAL_PACKAGE_DIR --site=https://mirrors.kernel.org/sourceware/cygwin/ --no-desktop --no-startmenu --no-shortcuts --verbose - CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" From 5a082d1d59006758d4d78328ac3fd99a116c7a1d Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 10:44:41 -0300 Subject: [PATCH 12/21] Update windows.yml --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b22e9e8..c580434 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,4 +17,6 @@ jobs: # Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) npm install -g esy@latest esy install + esy bootstrap + esy build --verbosity=debug From 62083324c2124d1c5649cc906b5b6d295f2b2535 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 10:50:48 -0300 Subject: [PATCH 13/21] Update build-windows.sh --- build-windows.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-windows.sh b/build-windows.sh index 16595e9..84ebee4 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -2,7 +2,11 @@ if cmake.exe --version; then echo "cmake already in path..." else echo "cmake not available, installing." - choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' + echo "$PATH" + echo "$(find /usr/bin -maxdepth 1 -name choco*)" + ls "c://ProgramData/Chocolatey" + ls "c://ProgramData/Chocolatey/bin" + c://ProgramData/Chocolatey/bin/choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" From 191bff8d3d280486d296558c0d2e97618beafbf2 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 11:12:32 -0300 Subject: [PATCH 14/21] Update build-windows.sh --- build-windows.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build-windows.sh b/build-windows.sh index 84ebee4..a2fce22 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -2,20 +2,17 @@ if cmake.exe --version; then echo "cmake already in path..." else echo "cmake not available, installing." - echo "$PATH" - echo "$(find /usr/bin -maxdepth 1 -name choco*)" - ls "c://ProgramData/Chocolatey" - ls "c://ProgramData/Chocolatey/bin" c://ProgramData/Chocolatey/bin/choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - CMAKE_FOLDER="$(find /usr/share -maxdepth 1 -name cmake-*)" + CMAKE_FOLDER="C:\ProgramData\chocolatey\lib\cmake" + ls -al $CMAKE_FOLDER CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" echo "folder: $CMAKE_FOLDER" echo "dirname: $CMAKE_DIRNAME" echo "Copying to $cur__bin/cmake.exe" - cp /usr/bin/cmake.exe $cur__bin/cmake.exe + cp "$CMAKE_FOLDER"/cmake.exe $cur__bin/cmake.exe cp /usr/bin/cygarchive-13.dll $cur__bin/cygarchive-13.dll echo "Copying to $cur__share/$CMAKE_DIRNAME" From d3f072b30ce2cfc1aebf72c70d1351217442fac7 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 13:25:11 -0300 Subject: [PATCH 15/21] Update build-windows.sh --- build-windows.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-windows.sh b/build-windows.sh index a2fce22..ede8587 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -6,6 +6,9 @@ else CMAKE_FOLDER="C:\ProgramData\chocolatey\lib\cmake" ls -al $CMAKE_FOLDER + ls -al "C:\Program Files\CMake\bin" + CMAKE_FOLDER="C:\Program Files\CMake\bin" + ls -al "C:\ProgramFiles\CMake\bin" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" echo "folder: $CMAKE_FOLDER" From 3b4b2c08f413fef6b04cd093a0bd58ff51a680fc Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 14:25:42 -0300 Subject: [PATCH 16/21] Fix more bugs --- build-windows.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build-windows.sh b/build-windows.sh index ede8587..a76873f 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -4,11 +4,7 @@ else echo "cmake not available, installing." c://ProgramData/Chocolatey/bin/choco.exe install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - CMAKE_FOLDER="C:\ProgramData\chocolatey\lib\cmake" - ls -al $CMAKE_FOLDER - ls -al "C:\Program Files\CMake\bin" CMAKE_FOLDER="C:\Program Files\CMake\bin" - ls -al "C:\ProgramFiles\CMake\bin" CMAKE_DIRNAME="$(basename $CMAKE_FOLDER)" echo "folder: $CMAKE_FOLDER" @@ -16,8 +12,7 @@ else echo "Copying to $cur__bin/cmake.exe" cp "$CMAKE_FOLDER"/cmake.exe $cur__bin/cmake.exe - cp /usr/bin/cygarchive-13.dll $cur__bin/cygarchive-13.dll - echo "Copying to $cur__share/$CMAKE_DIRNAME" - cp -r $CMAKE_FOLDER $cur__share/$CMAKE_DIRNAME + echo "Copying to $cur__share/cmake" + cp -r $CMAKE_FOLDER $cur__share/cmake fi From 16d2aaa9ffe0be7045a242e9b1959c6597125ca9 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 14:27:53 -0300 Subject: [PATCH 17/21] Debug --- build-windows.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-windows.sh b/build-windows.sh index a76873f..8d5615e 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -15,4 +15,10 @@ else echo "Copying to $cur__share/cmake" cp -r $CMAKE_FOLDER $cur__share/cmake + + OUTPUT="$($cur__bin/cmake.exe --version)" + echo "cmake version is: $OUTPUT" + + echo "Checking cmake version (copied):" + strace $cur__bin/cmake.exe fi From 07a91152aeee72772704832d29e8346522f5b7c1 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 14:28:27 -0300 Subject: [PATCH 18/21] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8afaec3..810ac1f 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "esy": { "build": [ ["bash", "-c", "#{os == 'windows' ? './build-windows.sh' : './build.sh'}"], - ["ls", "-a", "#{self.bin}"] + ["ls", "-a", "#{self.bin}"], + ["cmake", "--version"] ], "buildsInSource": "_build" }, From b3f66f796ff12d3d5d24d51b9d42678bab8308fa Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Tue, 8 Nov 2022 14:51:06 -0300 Subject: [PATCH 19/21] Update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 810ac1f..8afaec3 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,7 @@ "esy": { "build": [ ["bash", "-c", "#{os == 'windows' ? './build-windows.sh' : './build.sh'}"], - ["ls", "-a", "#{self.bin}"], - ["cmake", "--version"] + ["ls", "-a", "#{self.bin}"] ], "buildsInSource": "_build" }, From b5faff4d7b1252aa7d1a7afde7a158d5845edf3e Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 9 Nov 2022 08:45:57 -0300 Subject: [PATCH 20/21] Remove workflow --- .github/workflows/windows.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml deleted file mode 100644 index c580434..0000000 --- a/.github/workflows/windows.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: CI-windows - -on: - workflow_dispatch: - -jobs: - build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Esy setup - run: | - # Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) - npm install -g esy@latest - esy install - esy bootstrap - esy build --verbosity=debug - From aae1b593eee9bfa18f223b0b2afd8a7c967bfab0 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 9 Nov 2022 08:46:58 -0300 Subject: [PATCH 21/21] Update build-windows.sh --- build-windows.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-windows.sh b/build-windows.sh index 8d5615e..3f80e38 100755 --- a/build-windows.sh +++ b/build-windows.sh @@ -18,7 +18,4 @@ else OUTPUT="$($cur__bin/cmake.exe --version)" echo "cmake version is: $OUTPUT" - - echo "Checking cmake version (copied):" - strace $cur__bin/cmake.exe fi