From 20f545c32632200b5f014c83fb848d1b538b8438 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 08:42:16 -0600 Subject: [PATCH 01/98] add windows build to ci --- .github/workflows/ci.yml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a947957..24e23dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v1.12 + uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.24.x' - name: Test cmake version @@ -53,3 +53,36 @@ jobs: path: | build_linux/lk_sandbox* build_linux/lk*.a + + build-on-windows: + runs-on: windows-latest + steps: + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.24.x' + + - name: Install wxWidgets + shell: bash + run: | + wget -q https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 + tar jxf wxWidgets-3.2.3.tar.bz2 + cd wxWidgets-3.2.3 + msbuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + + - name: Checkout + uses: actions/checkout@v2 + + - name: Build LK + run: | + cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release + cmake --build build_win --config Release -j4 + + - name: Save static lib & lksandbox + uses: actions/upload-artifact@v2 + with: + name: LK-${{ env.RUNS_ON }}-x86_64 + path: | + build_win/lk_sandbox* + build_win/lk*.a + \ No newline at end of file From 0db765b75cca77dd81a3aeb2692c00c71704a3e8 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 08:47:56 -0600 Subject: [PATCH 02/98] windows ci --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24e23dd..786b5ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,9 +63,8 @@ jobs: cmake-version: '3.24.x' - name: Install wxWidgets - shell: bash run: | - wget -q https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 + Invoke-WebRequest https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 msbuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release From 5f62b5f3ba010403a66a7d74021acee470391322 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 08:52:40 -0600 Subject: [PATCH 03/98] windows ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 786b5ef..f5a5e2d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,7 @@ jobs: - name: Install wxWidgets run: | - Invoke-WebRequest https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 + Invoke-WebRequest https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -OutFile wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 msbuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release From df2b76663e5d73f082b7d17292644a900519f039 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:21:19 -0600 Subject: [PATCH 04/98] windows ci --- .github/workflows/ci.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5a5e2d..a9f3e16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,18 +62,27 @@ jobs: with: cmake-version: '3.24.x' + - name: Set relative paths + shell: bash + run: | + WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + - name: Install wxWidgets run: | + $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -OutFile wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - msbuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Checkout uses: actions/checkout@v2 - name: Build LK + shell: bash run: | + ls ${WXMSW3}/build/msw cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From ee27e2dbf0221bf2f341b3d29fa9a747eb135b4b Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:27:47 -0600 Subject: [PATCH 05/98] windows ci --- .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 a9f3e16..415793f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,8 +70,8 @@ jobs: - name: Install wxWidgets run: | - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -OutFile wxWidgets-3.2.3.tar.bz2 + (New-Object Net.WebClient).DownloadFile("https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2", "wxWidgets-3.2.3.tar.bz2") + dir tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release From 12045a772ed421336d5b1ffdc76f9feb78619278 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:38:36 -0600 Subject: [PATCH 06/98] download w/ bash --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 415793f..d5b8822 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,12 +69,13 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Install wxWidgets + shell: bash run: | - (New-Object Net.WebClient).DownloadFile("https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2", "wxWidgets-3.2.3.tar.bz2") - dir + curl https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild.exe" build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Checkout uses: actions/checkout@v2 From 53685073cee70543a65f0b70484f90318c124f53 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:41:38 -0600 Subject: [PATCH 07/98] curl --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5b8822..a4a94ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: - name: Install wxWidgets shell: bash run: | - curl https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + curl https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o $GITHUB_WORKSPACE/wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 From 69133fa4a1feeeb59ae12d14a0fec723233954da Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:45:17 -0600 Subject: [PATCH 08/98] curl --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4a94ca..8c2ec68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: - name: Install wxWidgets shell: bash run: | - curl https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o $GITHUB_WORKSPACE/wxWidgets-3.2.3.tar.bz2 + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 From f34bcb237263fa76f3e93424a650d960e32d20e3 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:48:30 -0600 Subject: [PATCH 09/98] windows ci --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8c2ec68..1b806f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,17 +57,12 @@ jobs: build-on-windows: runs-on: windows-latest steps: - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v2 - with: - cmake-version: '3.24.x' - - name: Set relative paths shell: bash run: | WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - + - name: Install wxWidgets shell: bash run: | @@ -75,8 +70,13 @@ jobs: ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild.exe" build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - + MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.24.x' + - name: Checkout uses: actions/checkout@v2 From a48b09897d126f256920dd19b47d72b69ea4b60b Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:50:55 -0600 Subject: [PATCH 10/98] MSBuild path --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b806f0..f009321 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,6 +70,8 @@ jobs: ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 + ls "C:\Program Files\Microsoft Visual Studio" + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Setup cmake From 3f85d842580f4da8851cf743870d79b82fa85d8b Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:53:33 -0600 Subject: [PATCH 11/98] paths --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f009321..a807a5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,13 @@ jobs: run: | WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" + echo "next" + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild" + echo "next" + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current" + echo "next" + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" - name: Install wxWidgets shell: bash @@ -70,7 +77,7 @@ jobs: ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - ls "C:\Program Files\Microsoft Visual Studio" + ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release From 4b94ab2a595ddf6c4f79cbbcdf6dcb391a20666f Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:55:01 -0600 Subject: [PATCH 12/98] use microsoft/setup-msbuild --- .github/workflows/ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a807a5d..1e6f049 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,18 +57,14 @@ jobs: build-on-windows: runs-on: windows-latest steps: + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + - name: Set relative paths shell: bash run: | WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" - echo "next" - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild" - echo "next" - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current" - echo "next" - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin" - name: Install wxWidgets shell: bash @@ -77,9 +73,7 @@ jobs: ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" - ls "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" - MSBuild.exe build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 52f0b8f1664438ba445ba8a9327e1d0ef81666a6 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:56:58 -0600 Subject: [PATCH 13/98] windows ci --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e6f049..9ff98ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - - name: Install wxWidgets + - name: Download wxWidgets shell: bash run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 @@ -74,7 +74,12 @@ jobs: tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - + + - name: Install wxWidgets + run: | + cd wxWidgets-3.2.3 + msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: From d7b1ca9dbdfb127287891c763f298f7bb9b2bc03 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 09:58:02 -0600 Subject: [PATCH 14/98] ci --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ff98ca..d4aa31e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,8 +72,6 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3 - msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Install wxWidgets run: | From 2c1eea31be82739f0332c0febc310faf9fcb1d33 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:05:21 -0600 Subject: [PATCH 15/98] build --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4aa31e..e2442f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,6 @@ jobs: - name: Build LK shell: bash run: | - ls ${WXMSW3}/build/msw cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From 316447f0fec3857795e48bf790a5585effaccc2d Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:10:12 -0600 Subject: [PATCH 16/98] add mac --- .github/workflows/ci.yml | 46 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e2442f5..65ca76e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,51 @@ jobs: uses: actions/upload-artifact@v2 with: name: LK-${{ env.RUNS_ON }}-x86_64 - path: | build_win/lk_sandbox* build_win/lk*.a + + build-on-mac: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-14-large, macos-latest] + steps: + - name: Set relative paths + shell: bash + run: | + WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + + - name: Install wxWidgets + run: | + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + ls + tar jxf wxWidgets-3.2.3.tar.bz2 + cd build + ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + make + make install + sudo ln -s ${WXMSW3}/install/bin/wx-config /usr/local/bin/wx-config-3 + wx-config-3 --cflags + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.24.x' + + - name: Checkout + uses: actions/checkout@v2 + + - name: Build LK + run: | + cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug + cmake --build build_linux -- -j + + - name: Save static lib & lksandbox + uses: actions/upload-artifact@v2 + with: + name: LK-${{ env.RUNS_ON }}-x86_64 + path: | + build_linux/lk_sandbox* + build_linux/lk*.a \ No newline at end of file From bf4cceb8fb86015388856c7f3ad1007d037e7599 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:11:30 -0600 Subject: [PATCH 17/98] mac cd --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 65ca76e..891c5d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,6 +96,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: LK-${{ env.RUNS_ON }}-x86_64 + path: | build_win/lk_sandbox* build_win/lk*.a @@ -116,7 +117,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - cd build + cd wxWidgets-3.2.3.tar.bz2/build ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make make install From 469301d7ac85a5d85037869ada231372d53524a2 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:12:17 -0600 Subject: [PATCH 18/98] mac cd --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 891c5d6..90d4886 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3.tar.bz2/build + cd wxWidgets-3.2.3/build ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make make install From 3b8a4e96ed1f83ceeb07b68c7f539dbba242f29e Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:18:39 -0600 Subject: [PATCH 19/98] windows install w/ bash --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90d4886..e77584a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,9 +74,15 @@ jobs: tar jxf wxWidgets-3.2.3.tar.bz2 - name: Install wxWidgets + shell: bash run: | cd wxWidgets-3.2.3 - msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + mkdir build + cd build + ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + make + make install + # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 57a668a4b03666721f344a8a15444c40cf16273c Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 10:20:06 -0600 Subject: [PATCH 20/98] windows --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e77584a..925a404 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,6 @@ jobs: shell: bash run: | cd wxWidgets-3.2.3 - mkdir build cd build ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make From c55baed40c14e4445a738c79318115e05b5c9702 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 12:34:21 -0600 Subject: [PATCH 21/98] mac build --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 925a404..3454acd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -123,10 +123,11 @@ jobs: ls tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3/build - ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + ../configure --prefix=${WXMSW3} --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make make install - sudo ln -s ${WXMSW3}/install/bin/wx-config /usr/local/bin/wx-config-3 + sudo ln -s ${WXMSW3}/bin/wx-config /usr/local/bin/wx-config-3 + ls ${WXMSW3}/bin/ wx-config-3 --cflags - name: Setup cmake From a6f6b74ec5969521bd6faa2090eee016a939a151 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 12:48:42 -0600 Subject: [PATCH 22/98] windows build --- .github/workflows/ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3454acd..b341925 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,11 +77,8 @@ jobs: shell: bash run: | cd wxWidgets-3.2.3 - cd build - ../configure --prefix=${WXMSW3}/install --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin - make - make install - # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + ls ${WXMSW3} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 8fbaef2102739e8d85116cfa93a43fb578e2057d Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 12:50:18 -0600 Subject: [PATCH 23/98] windows --- .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 b341925..af27f4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,11 +74,10 @@ jobs: tar jxf wxWidgets-3.2.3.tar.bz2 - name: Install wxWidgets - shell: bash run: | cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - ls ${WXMSW3} + dir ${WXMSW3} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -91,6 +90,7 @@ jobs: - name: Build LK shell: bash run: | + ls ${WXMSW3} cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From 59268420d09fe078d6da7597c674d371b024dd42 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 12:58:35 -0600 Subject: [PATCH 24/98] download windows binary --- .github/workflows/ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af27f4d..d82ad49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,21 +63,23 @@ jobs: - name: Set relative paths shell: bash run: | - WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + WXMSW3=$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Download wxWidgets shell: bash run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - ls - tar jxf wxWidgets-3.2.3.tar.bz2 - - - name: Install wxWidgets - run: | - cd wxWidgets-3.2.3 - msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - dir ${WXMSW3} + # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + # tar jxf wxWidgets-3.2.3.tar.bz2 + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z + 7z wxMSW-3.2.3_vc14x_Dev + ls wxMSW-3.2.3_vc14x_Dev + + # - name: Install wxWidgets + # run: | + # cd wxWidgets-3.2.3 + # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + # dir ${WXMSW3} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 6e8727710d3f5b2f5a29eb6443162124662816a8 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 12:59:47 -0600 Subject: [PATCH 25/98] typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d82ad49..c30e635 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 # tar jxf wxWidgets-3.2.3.tar.bz2 curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z - 7z wxMSW-3.2.3_vc14x_Dev + 7z wxMSW-3.2.3_vc14x_Dev.7z ls wxMSW-3.2.3_vc14x_Dev # - name: Install wxWidgets From 971f52fc9e49304ea8b381c19cb56024423bd610 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:02:31 -0600 Subject: [PATCH 26/98] mac --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c30e635..cc170af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -121,13 +121,14 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3/build - ../configure --prefix=${WXMSW3} --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + cd wxWidgets-3.2.3 + ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make make install - sudo ln -s ${WXMSW3}/bin/wx-config /usr/local/bin/wx-config-3 - ls ${WXMSW3}/bin/ + sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + ls $HOME/wx-3.2.3/bin wx-config-3 --cflags + echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -139,8 +140,8 @@ jobs: - name: Build LK run: | - cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug - cmake --build build_linux -- -j + cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Release + cmake --build build_linux -- -j -j 4 - name: Save static lib & lksandbox uses: actions/upload-artifact@v2 From 7dc5f8dfff33f3676faab0c18507d34b1725217a Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:03:28 -0600 Subject: [PATCH 27/98] windows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc170af..84e0a74 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 # tar jxf wxWidgets-3.2.3.tar.bz2 curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z - 7z wxMSW-3.2.3_vc14x_Dev.7z + 7z x wxMSW-3.2.3_vc14x_Dev.7z ls wxMSW-3.2.3_vc14x_Dev # - name: Install wxWidgets From df1ff53d86c3f772e1913db31f666de02dd4d958 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:08:10 -0600 Subject: [PATCH 28/98] windows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84e0a74..075e4db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 # tar jxf wxWidgets-3.2.3.tar.bz2 curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z - 7z x wxMSW-3.2.3_vc14x_Dev.7z + 7z x wxMSW-3.2.3_vc14x_Dev.7z -owxMSW-3.2.3_vc14x_Dev ls wxMSW-3.2.3_vc14x_Dev # - name: Install wxWidgets From dfad1fc5c0844383b51ae24613a4855624bab658 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:15:40 -0600 Subject: [PATCH 29/98] windows --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 075e4db..d693fd3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,6 +74,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z 7z x wxMSW-3.2.3_vc14x_Dev.7z -owxMSW-3.2.3_vc14x_Dev ls wxMSW-3.2.3_vc14x_Dev + pwd # - name: Install wxWidgets # run: | @@ -92,7 +93,6 @@ jobs: - name: Build LK shell: bash run: | - ls ${WXMSW3} cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From 66b6e34c593368ee20e20befcde588a984a41293 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:23:03 -0600 Subject: [PATCH 30/98] windows --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d693fd3..351357f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,12 @@ jobs: # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release # dir ${WXMSW3} + - name: Test wx + shell: bash + run: | + export WXMSW3=/d/a/lk/lk/wxMSW-3.2.3_vc14x_Dev + ls ${WXMSW3} + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -93,6 +99,8 @@ jobs: - name: Build LK shell: bash run: | + export WXMSW3=/d/a/lk/lk/wxMSW-3.2.3_vc14x_Dev + ls ${WXMSW3} cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From 8f3be36dd331fe97c6e0818940abbc27d1fac261 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:28:01 -0600 Subject: [PATCH 31/98] extract --- .github/workflows/ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 351357f..cb85f39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,9 +72,9 @@ jobs: # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 # tar jxf wxWidgets-3.2.3.tar.bz2 curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z - 7z x wxMSW-3.2.3_vc14x_Dev.7z -owxMSW-3.2.3_vc14x_Dev - ls wxMSW-3.2.3_vc14x_Dev - pwd + mkdir wxMSW-3.2.3_vc14x_Dev + 7z x wxMSW-3.2.3_vc14x_Dev.7z -o${WXMSW3} + ls ${WXMSW3} # - name: Install wxWidgets # run: | @@ -82,12 +82,6 @@ jobs: # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release # dir ${WXMSW3} - - name: Test wx - shell: bash - run: | - export WXMSW3=/d/a/lk/lk/wxMSW-3.2.3_vc14x_Dev - ls ${WXMSW3} - - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -99,8 +93,6 @@ jobs: - name: Build LK shell: bash run: | - export WXMSW3=/d/a/lk/lk/wxMSW-3.2.3_vc14x_Dev - ls ${WXMSW3} cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release cmake --build build_win --config Release -j4 From 0e23b9f90d14760359bd96e2df75c0a7550444dd Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:31:04 -0600 Subject: [PATCH 32/98] windows --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb85f39..bdb8a95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o${WXMSW3} - ls ${WXMSW3} + echo ${WXMSW3}/bin >> $GITHUB_PATH # - name: Install wxWidgets # run: | @@ -140,14 +140,14 @@ jobs: - name: Build LK run: | - cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Release - cmake --build build_linux -- -j -j 4 + cmake -Bbuild -DCMAKE_BUILD_TYPE=Release + cmake --build build -- -j -j 4 - name: Save static lib & lksandbox uses: actions/upload-artifact@v2 with: name: LK-${{ env.RUNS_ON }}-x86_64 path: | - build_linux/lk_sandbox* - build_linux/lk*.a + build/lk_sandbox* + build/lk*.a \ No newline at end of file From 00045e787f55a12656c8846b4bf958c1726ddd57 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:38:32 -0600 Subject: [PATCH 33/98] windows --- .github/workflows/ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdb8a95..b597456 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,19 +69,11 @@ jobs: - name: Download wxWidgets shell: bash run: | - # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - # tar jxf wxWidgets-3.2.3.tar.bz2 curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o${WXMSW3} echo ${WXMSW3}/bin >> $GITHUB_PATH - # - name: Install wxWidgets - # run: | - # cd wxWidgets-3.2.3 - # msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - # dir ${WXMSW3} - - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: @@ -93,7 +85,11 @@ jobs: - name: Build LK shell: bash run: | - cmake -Bbuild_win -DCMAKE_BUILD_TYPE=Release + ls ${WXMSW3} + + - name: Build LK + run: | + cmake -Bbuild_win cmake --build build_win --config Release -j4 - name: Save static lib & lksandbox From 4adc914664cf41ffe81ce5419e92a635e1e4c8d0 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:50:40 -0600 Subject: [PATCH 34/98] windows --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b597456..8df0cb5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o${WXMSW3} - echo ${WXMSW3}/bin >> $GITHUB_PATH + ls ${WXMSW3} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -83,7 +83,6 @@ jobs: uses: actions/checkout@v2 - name: Build LK - shell: bash run: | ls ${WXMSW3} From e31dbd3294b4598741644a442489be0280d52c9a Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 13:56:43 -0600 Subject: [PATCH 35/98] windows --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8df0cb5..5bbbb14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,6 +65,9 @@ jobs: run: | WXMSW3=$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + + - name: Checkout + uses: actions/checkout@v2 - name: Download wxWidgets shell: bash @@ -78,15 +81,14 @@ jobs: uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.24.x' - - - name: Checkout - uses: actions/checkout@v2 - name: Build LK + shell: bash run: | ls ${WXMSW3} - name: Build LK + shell: bash run: | cmake -Bbuild_win cmake --build build_win --config Release -j4 From b0b762119f7aab670d634e14addcf234e0a75975 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:09:19 -0600 Subject: [PATCH 36/98] windows --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5bbbb14..968a09d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,23 +83,23 @@ jobs: cmake-version: '3.24.x' - name: Build LK - shell: bash run: | ls ${WXMSW3} - name: Build LK - shell: bash run: | - cmake -Bbuild_win - cmake --build build_win --config Release -j4 + mkdir build + cd build + cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. + MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox uses: actions/upload-artifact@v2 with: name: LK-${{ env.RUNS_ON }}-x86_64 path: | - build_win/lk_sandbox* - build_win/lk*.a + build/Release/lk_sandbox* + build/Release/lk*.a build-on-mac: runs-on: ${{ matrix.os }} From c8949694b6d5a703874b637e259cf26a4858e973 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:17:09 -0600 Subject: [PATCH 37/98] print --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index daf9039..1db0019 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ if (UNIX) endif () else () set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) + message("wx dir $ENV{WXMSW3} and ${wxWidgets_ROOT_DIR}") find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) endif () From 77874e844b4f82c0cd10d705196b838ccda5f14a Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:18:55 -0600 Subject: [PATCH 38/98] paths --- .github/workflows/ci.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 968a09d..3c65975 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,12 +60,6 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 - - name: Set relative paths - shell: bash - run: | - WXMSW3=$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev - echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - - name: Checkout uses: actions/checkout@v2 @@ -74,8 +68,9 @@ jobs: run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev - 7z x wxMSW-3.2.3_vc14x_Dev.7z -o${WXMSW3} - ls ${WXMSW3} + 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev + WXMSW3=$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -84,6 +79,7 @@ jobs: - name: Build LK run: | + echo ${WXMSW3} ls ${WXMSW3} - name: Build LK From 47dac888bb2d283fc7bee7d308637d886f94ee6b Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:29:01 -0600 Subject: [PATCH 39/98] path --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c65975..fe34c09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev - WXMSW3=$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev + WXMSW3=$GITHUB_WORKSPACE\wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Setup cmake @@ -79,8 +79,8 @@ jobs: - name: Build LK run: | - echo ${WXMSW3} - ls ${WXMSW3} + echo $env:WXMSW3 + ls $env:WXMSW3 - name: Build LK run: | From 90a100d7163145db9ca33923b1aef0aea5c5294f Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:37:41 -0600 Subject: [PATCH 40/98] paths --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe34c09..e306f4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev - WXMSW3=$GITHUB_WORKSPACE\wxMSW-3.2.3_vc14x_Dev + WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Setup cmake From 68f7427eac0e9bdeeb21f3a03593971fbca81053 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 9 May 2024 14:47:24 -0600 Subject: [PATCH 41/98] download headers --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e306f4b..29cec97 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,8 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z + 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV From 4b081869639a315794c208e2e32518be08556089 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 12:05:51 -0600 Subject: [PATCH 42/98] try props --- CMakeLists.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1db0019..9460b34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,13 +88,14 @@ if (UNIX) find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () else () - set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) - message("wx dir $ENV{WXMSW3} and ${wxWidgets_ROOT_DIR}") - find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) + + # set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) + #find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) endif () -include(${wxWidgets_USE_FILE}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") +#include(${wxWidgets_USE_FILE}) +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") ##################################################################################################################### @@ -152,5 +153,16 @@ if (NOT SAM_SKIP_TOOLS) target_link_libraries(lk_sandbox -ldl) endif () - target_link_libraries(lk_sandbox lk ${wxWidgets_LIBRARIES}) + target_link_libraries(lk_sandbox lk) + + + set_property( + TARGET lk_sandbox + PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + ) endif() + + set_property( + TARGET lk + PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + ) From 52a6b17b19177df44d0231ff065e167bac5d31b4 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 12:12:05 -0600 Subject: [PATCH 43/98] Update ci.yml --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29cec97..7a8a3e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,6 +89,8 @@ jobs: mkdir build cd build cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. + Rename-Item "$env:WXMSW3\lib\vc14x_dll vc14x_x64_dll" + dir $env:WXMSW3\lib MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox @@ -145,4 +147,4 @@ jobs: path: | build/lk_sandbox* build/lk*.a - \ No newline at end of file + From b44cec1892755e299b782cf7068f761f825b8973 Mon Sep 17 00:00:00 2001 From: dguittet Date: Wed, 15 May 2024 12:27:32 -0600 Subject: [PATCH 44/98] update ci.yml --- .github/workflows/ci.yml | 2 +- CMakeLists.txt | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a8a3e9..26b5996 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: mkdir build cd build cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. - Rename-Item "$env:WXMSW3\lib\vc14x_dll vc14x_x64_dll" + Rename-Item "$env:WXMSW3\lib\vc14x_dll" vc14x_x64_dll dir $env:WXMSW3\lib MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 9460b34..b0de5ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,15 +88,16 @@ if (UNIX) find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () else () - - # set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) - #find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) + if(NOT EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") + set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) + find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) + include(${wxWidgets_USE_FILE}) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() endif () -#include(${wxWidgets_USE_FILE}) -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - ##################################################################################################################### # @@ -155,14 +156,21 @@ if (NOT SAM_SKIP_TOOLS) target_link_libraries(lk_sandbox lk) - - set_property( - TARGET lk_sandbox - PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" - ) + if (MSVC and EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") + set_property( + TARGET lk_sandbox + PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + ) + else() + target_link_libraries(lk_sandbox ${wxWidgets_LIBRARIES}) + endif() endif() +if (MSVC and EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") set_property( - TARGET lk - PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + TARGET lk + PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" ) +else() + target_link_libraries(lk ${wxWidgets_LIBRARIES}) +endif() \ No newline at end of file From e2345c7334cfb8400378bb928f9d1763b8407762 Mon Sep 17 00:00:00 2001 From: dguittet Date: Wed, 15 May 2024 12:34:45 -0600 Subject: [PATCH 45/98] fix typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0de5ef..002fa38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,7 @@ if (NOT SAM_SKIP_TOOLS) endif() endif() -if (MSVC and EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") +if (MSVC AND EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") set_property( TARGET lk PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" From e6a0d02cac56d9d5575f98bc10a3b978e42709f1 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 12:39:25 -0600 Subject: [PATCH 46/98] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26b5996..7760f48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,9 +88,9 @@ jobs: run: | mkdir build cd build - cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. Rename-Item "$env:WXMSW3\lib\vc14x_dll" vc14x_x64_dll dir $env:WXMSW3\lib + cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox From 1c967e7b0154936826dea85316d8a1b04d90f373 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 12:42:06 -0600 Subject: [PATCH 47/98] Update CMakeLists.txt --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 002fa38..e9078e0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,7 +88,7 @@ if (UNIX) find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () else () - if(NOT EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") + if(NOT EXISTS "$ENV{WXMSW3}/wxwidgets.props") set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) include(${wxWidgets_USE_FILE}) @@ -156,7 +156,7 @@ if (NOT SAM_SKIP_TOOLS) target_link_libraries(lk_sandbox lk) - if (MSVC and EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") + if (MSVC AND EXISTS "$ENV{WXMSW3}/wxwidgets.props") set_property( TARGET lk_sandbox PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" @@ -166,11 +166,11 @@ if (NOT SAM_SKIP_TOOLS) endif() endif() -if (MSVC AND EXISTS "$ENV{WXMSW3}/lib/wxwidgets.props") +if (MSVC AND EXISTS "$ENV{WXMSW3}/wxwidgets.props") set_property( TARGET lk PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" ) else() target_link_libraries(lk ${wxWidgets_LIBRARIES}) -endif() \ No newline at end of file +endif() From ac89588a8d2c7e5ea3cbaf64a7d591b23a93e8e7 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 13:24:07 -0600 Subject: [PATCH 48/98] Update ci.yml --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7760f48..6a374b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,10 +69,15 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z mkdir wxMSW-3.2.3_vc14x_Dev 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_ReleaseDLL.7z + 7z x wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL + mv $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev + echo "WXWIN=$WXWIN" >> $GITHUB_ENV - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From b83f21421e3f8abbc552ec395f99a906fc328f7e Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 13:25:25 -0600 Subject: [PATCH 49/98] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a374b2..c4ef7c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_ReleaseDLL.7z 7z x wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL - mv $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll + mv $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev From e5bcc00463b7d8f1baf3889df62153f0470e56d1 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 13:35:16 -0600 Subject: [PATCH 50/98] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c4ef7c5..be61f61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_ReleaseDLL.7z 7z x wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL - mv $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* $GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll + cp wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev From 6d9a00bcbec774eb478974c17c7cb56590bcce65 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 13:38:31 -0600 Subject: [PATCH 51/98] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9078e0..a6d9558 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ if (UNIX) set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config) find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () if(NOT EXISTS "$ENV{WXMSW3}/wxwidgets.props") set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) From 7f99bd9d533f8fc195e366244661069b98e37c9d Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:11:00 -0600 Subject: [PATCH 52/98] Update ci.yml --- .github/workflows/ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be61f61..5501724 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,17 +66,17 @@ jobs: - name: Download wxWidgets shell: bash run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_Dev.7z -o wxMSW-3.2.3_vc14x_Dev.7z - mkdir wxMSW-3.2.3_vc14x_Dev - 7z x wxMSW-3.2.3_vc14x_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_ReleaseDLL.7z - 7z x wxMSW-3.2.3_vc14x_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_ReleaseDLL - cp wxMSW-3.2.3_vc14x_ReleaseDLL/lib/vc14x_dll/* wxMSW-3.2.3_vc14x_Dev/lib/vc14x_dll + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_Dev.7z -o wxMSW-3.2.3_vc14x_x64_Dev.7z + mkdir wxMSW-3.2.3_vc14x_x64_Dev + 7z x wxMSW-3.2.3_vc14x_x64_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z + 7z x wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_ReleaseDLL + cp wxMSW-3.2.3_vc14x_x64_ReleaseDLL/lib/vc14x_x64_dll/* wxMSW-3.2.3_vc14x_x64_Dev/lib/vc14x_x64_dll curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z - 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_Dev - WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev + 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev + WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_Dev + WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev echo "WXWIN=$WXWIN" >> $GITHUB_ENV - name: Setup cmake @@ -93,7 +93,6 @@ jobs: run: | mkdir build cd build - Rename-Item "$env:WXMSW3\lib\vc14x_dll" vc14x_x64_dll dir $env:WXMSW3\lib cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release From 75da7e0a8d0962ee0261727051bd0640ff79a66a Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:15:40 -0600 Subject: [PATCH 53/98] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6d9558..3ad039c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ if (UNIX) set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config) find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () + include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () if(NOT EXISTS "$ENV{WXMSW3}/wxwidgets.props") From ecf6395a02548b32ffec2838faefa780fd03a146 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:24:41 -0600 Subject: [PATCH 54/98] Update ci.yml --- .github/workflows/ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5501724..87294fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,17 +119,19 @@ jobs: - name: Install wxWidgets run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - ls - tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3 - ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin - make - make install - sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 - ls $HOME/wx-3.2.3/bin + # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + # ls + # tar jxf wxWidgets-3.2.3.tar.bz2 + # cd wxWidgets-3.2.3 + # ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + # make + # make install + # sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + # ls $HOME/wx-3.2.3/bin + # wx-config-3 --cflags + # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH + brew install wxmac wx-config-3 --cflags - echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 212f724aba2c9b24183081ce288b5964a5a1f62a Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:30:10 -0600 Subject: [PATCH 55/98] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87294fe..f72044b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -131,7 +131,8 @@ jobs: # wx-config-3 --cflags # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac - wx-config-3 --cflags + ls /usr/local/Cellar/wxwidgets/3.2.5 + /usr/local/Cellar/wxwidgets/3.2.5/wx-config-3 --cflags - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From d2fe8a7bb3d79b794ffcb00c015860a253b8a8fc Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:42:39 -0600 Subject: [PATCH 56/98] Update ci.yml --- .github/workflows/ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f72044b..a5c0df6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,16 +84,10 @@ jobs: with: cmake-version: '3.24.x' - - name: Build LK - run: | - echo $env:WXMSW3 - ls $env:WXMSW3 - - name: Build LK run: | mkdir build cd build - dir $env:WXMSW3\lib cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release From 78af95b45a3dd8dc7645b14ed6a4518675e81df0 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:51:47 -0600 Subject: [PATCH 57/98] Update CMakeLists.txt --- CMakeLists.txt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ad039c..e6a4657 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,11 +82,10 @@ endif (MSVC) if (UNIX) if(EXISTS /usr/local/bin/wx-config-3) set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3) - find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) else () set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config) - find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) endif () + find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () @@ -95,8 +94,6 @@ else () find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") endif() endif () @@ -156,22 +153,20 @@ if (NOT SAM_SKIP_TOOLS) target_link_libraries(lk_sandbox -ldl) endif () - target_link_libraries(lk_sandbox lk) - - if (MSVC AND EXISTS "$ENV{WXMSW3}/wxwidgets.props") + if (MSVC AND EXISTS "$ENV{WXWIN}/wxwidgets.props") set_property( TARGET lk_sandbox - PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + PROPERTY VS_USER_PROPS "$ENV{WXWIN}/wxwidgets.props" ) else() target_link_libraries(lk_sandbox ${wxWidgets_LIBRARIES}) endif() endif() -if (MSVC AND EXISTS "$ENV{WXMSW3}/wxwidgets.props") +if (MSVC AND EXISTS "$ENV{WXWIN}/wxwidgets.props") set_property( TARGET lk - PROPERTY VS_USER_PROPS "$ENV{WXMSW3}/wxwidgets.props" + PROPERTY VS_USER_PROPS "$ENV{WXWIN}/wxwidgets.props" ) else() target_link_libraries(lk ${wxWidgets_LIBRARIES}) From 9ed7b354e5d2883b7f0a5c8814ff752ee6eddbf4 Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:52:04 -0600 Subject: [PATCH 58/98] 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 a5c0df6..c866734 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,8 +125,8 @@ jobs: # wx-config-3 --cflags # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac - ls /usr/local/Cellar/wxwidgets/3.2.5 - /usr/local/Cellar/wxwidgets/3.2.5/wx-config-3 --cflags + ls /usr/local/Cellar/wxwidgets/3.2.5/bin + /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config-3 --cflags - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From ce2aadb87fc705939442a8070613813367caaa2d Mon Sep 17 00:00:00 2001 From: Darice L Guittet Date: Wed, 15 May 2024 14:53:09 -0600 Subject: [PATCH 59/98] Update ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c866734..de0e475 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -125,8 +125,9 @@ jobs: # wx-config-3 --cflags # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac + ls /usr/local/Cellar/wxwidgets/3.2.5 ls /usr/local/Cellar/wxwidgets/3.2.5/bin - /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config-3 --cflags + /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From e4adcfd740e778c64557f1073859d86dcc03c457 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 14:56:51 -0600 Subject: [PATCH 60/98] mac runner --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de0e475..287c9d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,6 +112,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Install wxWidgets + if: ${{ matrix.os == 'macos-14-large'}} run: | # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 # ls @@ -129,6 +130,14 @@ jobs: ls /usr/local/Cellar/wxwidgets/3.2.5/bin /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags + - name: Install wxWidgets + if: ${{ matrix.os == 'macos-latest'}} + run: | + brew install wxmac + ls /opt/homebrew/Cellar/wxwidgets/3.2.4 + ls /opt/homebrew/Cellar/wxwidgets/3.2.4/bin + /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 with: From abdba71a444f9ad5dfe8faaa9d7ecf82238ab503 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 15:00:50 -0600 Subject: [PATCH 61/98] add wx-config to path --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 287c9d0..691f83a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,6 +129,7 @@ jobs: ls /usr/local/Cellar/wxwidgets/3.2.5 ls /usr/local/Cellar/wxwidgets/3.2.5/bin /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags + echo /usr/local/Cellar/wxwidgets/3.2.5/bin >> $GITHUB_PATH - name: Install wxWidgets if: ${{ matrix.os == 'macos-latest'}} @@ -137,6 +138,7 @@ jobs: ls /opt/homebrew/Cellar/wxwidgets/3.2.4 ls /opt/homebrew/Cellar/wxwidgets/3.2.4/bin /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags + echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From df8fd93170af1b7e49b7ceaaeb15140300b82ff4 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 15:02:24 -0600 Subject: [PATCH 62/98] wx-config --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 691f83a..06449f0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,18 +126,16 @@ jobs: # wx-config-3 --cflags # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac - ls /usr/local/Cellar/wxwidgets/3.2.5 - ls /usr/local/Cellar/wxwidgets/3.2.5/bin /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags + sudo ln -s /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config-3 echo /usr/local/Cellar/wxwidgets/3.2.5/bin >> $GITHUB_PATH - name: Install wxWidgets if: ${{ matrix.os == 'macos-latest'}} run: | brew install wxmac - ls /opt/homebrew/Cellar/wxwidgets/3.2.4 - ls /opt/homebrew/Cellar/wxwidgets/3.2.4/bin /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags + sudo ln -s /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config-3 echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH - name: Setup cmake From 8f6d3063441b88817535a77391ab2e9a0b3a5457 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 15:08:32 -0600 Subject: [PATCH 63/98] wx config --- .github/workflows/ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06449f0..b49d5a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,11 +105,11 @@ jobs: matrix: os: [macos-14-large, macos-latest] steps: - - name: Set relative paths - shell: bash - run: | - WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 - echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + # - name: Set relative paths + # shell: bash + # run: | + # WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + # echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Install wxWidgets if: ${{ matrix.os == 'macos-14-large'}} @@ -127,7 +127,8 @@ jobs: # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags - sudo ln -s /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config-3 + WXMSW3=/usr/local/Cellar/wxwidgets/3.2.5 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV echo /usr/local/Cellar/wxwidgets/3.2.5/bin >> $GITHUB_PATH - name: Install wxWidgets @@ -135,8 +136,9 @@ jobs: run: | brew install wxmac /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags - sudo ln -s /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config-3 echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH + WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.4 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 40e5ffdd7cf9a24d3c40a893ff94d12dc7820b87 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 15 May 2024 15:11:48 -0600 Subject: [PATCH 64/98] clean ci.yml --- .github/workflows/ci.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b49d5a5..9769b9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,26 +105,9 @@ jobs: matrix: os: [macos-14-large, macos-latest] steps: - # - name: Set relative paths - # shell: bash - # run: | - # WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 - # echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - - name: Install wxWidgets if: ${{ matrix.os == 'macos-14-large'}} run: | - # curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - # ls - # tar jxf wxWidgets-3.2.3.tar.bz2 - # cd wxWidgets-3.2.3 - # ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin - # make - # make install - # sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 - # ls $HOME/wx-3.2.3/bin - # wx-config-3 --cflags - # echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH brew install wxmac /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags WXMSW3=/usr/local/Cellar/wxwidgets/3.2.5 @@ -136,9 +119,9 @@ jobs: run: | brew install wxmac /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags - echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.4 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From c4e7c0231dad7c0b073a3307514a5c58de4c42e9 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 08:51:51 -0600 Subject: [PATCH 65/98] add doc for WXWIN --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6a4657..f56b453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,8 +89,9 @@ if (UNIX) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () - if(NOT EXISTS "$ENV{WXMSW3}/wxwidgets.props") - set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) + # WXWIN is the environment variable used within the wxwidgets.props from the binary distribution of wxWidgets + if(NOT EXISTS "$ENV{WXWIN}/wxwidgets.props") + set(wxWidgets_ROOT_DIR $ENV{WXWIN}) find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") From 434d55b2d29e08bb832d34f1a2ef75cdf600b39e Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 09:36:56 -0600 Subject: [PATCH 66/98] fix versions of wx --- .github/workflows/ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9769b9b..f5f0665 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,20 +108,20 @@ jobs: - name: Install wxWidgets if: ${{ matrix.os == 'macos-14-large'}} run: | - brew install wxmac - /usr/local/Cellar/wxwidgets/3.2.5/bin/wx-config --cflags - WXMSW3=/usr/local/Cellar/wxwidgets/3.2.5 + brew install wxmac@3.2.3 + /usr/local/Cellar/wxwidgets/3.2.3/bin/wx-config --cflags + WXMSW3=/usr/local/Cellar/wxwidgets/3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - echo /usr/local/Cellar/wxwidgets/3.2.5/bin >> $GITHUB_PATH + echo /usr/local/Cellar/wxwidgets/3.2.3/bin >> $GITHUB_PATH - name: Install wxWidgets if: ${{ matrix.os == 'macos-latest'}} run: | - brew install wxmac - /opt/homebrew/Cellar/wxwidgets/3.2.4/bin/wx-config --cflags - WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.4 + brew install wxmac@3.2.3 + /opt/homebrew/Cellar/wxwidgets/3.2.3/bin/wx-config --cflags + WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - echo /opt/homebrew/Cellar/wxwidgets/3.2.4/bin >> $GITHUB_PATH + echo /opt/homebrew/Cellar/wxwidgets/3.2.3/bin >> $GITHUB_PATH - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 4c88f29457f567ac99c9ca8c7e1a5252b626bb68 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:22:31 -0600 Subject: [PATCH 67/98] setup wxwidget build --- .github/workflows/ci.yml | 147 +++++++++++++++++++++++++-------------- 1 file changed, 93 insertions(+), 54 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5f0665..16eab39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,26 @@ jobs: - name: Install wxWidgets run: | - sudo apt-get install -y libwxgtk*-dev - sudo ln -s $(which wx-config) /usr/local/bin/wx-config-3 - wx-config-3 --cflags | grep I + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + tar jxf wxWidgets-3.2.3.tar.bz2 + cd wxWidgets-3.2.3 + ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + make + make install + sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + wx-config-3 --cflags + echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + + - name: Make wxWidgets archive + run: | + 7z a wx3.2.3.7z wx-3.2.3 + + - name: Save wxWidgets build + uses: actions/upload-artifact@v2 + with: + name: wxWidgets-${{ env.RUNS_ON }} + path: | + wx3.2.3.7z - name: Checkout uses: actions/checkout@v2 @@ -66,18 +83,27 @@ jobs: - name: Download wxWidgets shell: bash run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_Dev.7z -o wxMSW-3.2.3_vc14x_x64_Dev.7z - mkdir wxMSW-3.2.3_vc14x_x64_Dev - 7z x wxMSW-3.2.3_vc14x_x64_Dev.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z - 7z x wxMSW-3.2.3_vc14x_x64_ReleaseDLL.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_ReleaseDLL - cp wxMSW-3.2.3_vc14x_x64_ReleaseDLL/lib/vc14x_x64_dll/* wxMSW-3.2.3_vc14x_x64_Dev/lib/vc14x_x64_dll - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3-headers.7z -o wxWidgets-3.2.3-headers.7z - 7z x wxWidgets-3.2.3-headers.7z -o$GITHUB_WORKSPACE/wxMSW-3.2.3_vc14x_x64_Dev - WXMSW3=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev - echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - WXWIN=$GITHUB_WORKSPACE\\wxMSW-3.2.3_vc14x_x64_Dev - echo "WXWIN=$WXWIN" >> $GITHUB_ENV + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + ls + tar jxf wxWidgets-3.2.3.tar.bz2 + + - name: Install wxWidgets + run: | + cd wxWidgets-3.2.3 + msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + + - name: Make wxWidgets archive + shell: bash + run: | + cd + 7z a wx3.2.3.7z wx-3.2.3 + + - name: Save wxWidgets build + uses: actions/upload-artifact@v2 + with: + name: wxWidgets-${{ env.RUNS_ON }} + path: | + wx3.2.3.7z - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -105,42 +131,55 @@ jobs: matrix: os: [macos-14-large, macos-latest] steps: - - name: Install wxWidgets - if: ${{ matrix.os == 'macos-14-large'}} - run: | - brew install wxmac@3.2.3 - /usr/local/Cellar/wxwidgets/3.2.3/bin/wx-config --cflags - WXMSW3=/usr/local/Cellar/wxwidgets/3.2.3 - echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - echo /usr/local/Cellar/wxwidgets/3.2.3/bin >> $GITHUB_PATH - - - name: Install wxWidgets - if: ${{ matrix.os == 'macos-latest'}} - run: | - brew install wxmac@3.2.3 - /opt/homebrew/Cellar/wxwidgets/3.2.3/bin/wx-config --cflags - WXMSW3=/opt/homebrew/Cellar/wxwidgets/3.2.3 - echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - echo /opt/homebrew/Cellar/wxwidgets/3.2.3/bin >> $GITHUB_PATH - - - name: Setup cmake - uses: jwlawson/actions-setup-cmake@v2 - with: - cmake-version: '3.24.x' - - - name: Checkout - uses: actions/checkout@v2 - - - name: Build LK - run: | - cmake -Bbuild -DCMAKE_BUILD_TYPE=Release - cmake --build build -- -j -j 4 - - - name: Save static lib & lksandbox - uses: actions/upload-artifact@v2 - with: - name: LK-${{ env.RUNS_ON }}-x86_64 - path: | - build/lk_sandbox* - build/lk*.a - + - name: Install wxWidgets + run: | + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 + tar jxf wxWidgets-3.2.3.tar.bz2 + cd wxWidgets-3.2.3 + ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + make + make install + sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + wx-config-3 --cflags + echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + + - name: Make wxWidgets archive + run: | + 7z a wx3.2.3.7z wx-3.2.3 + + - name: Save wxWidgets build + uses: actions/upload-artifact@v2 + with: + name: wxWidgets-${{ env.RUNS_ON }} + path: | + wx3.2.3.7z + + - name: Setup cmake + uses: jwlawson/actions-setup-cmake@v2 + with: + cmake-version: '3.24.x' + + - name: Checkout + uses: actions/checkout@v2 + + - name: Build LK + run: | + cmake -Bbuild -DCMAKE_BUILD_TYPE=Release + cmake --build build -- -j + + - name: Save static lib & lksandbox + uses: actions/upload-artifact@v2 + with: + name: LK-${{ env.RUNS_ON }}-x86_64 + path: | + build/lk_sandbox* + build/lk*.a + + - name: Save wxWidgets build + uses: actions/upload-artifact@v2 + with: + name: LK-${{ env.RUNS_ON }}-x86_64 + path: | + build/lk_sandbox* + build/lk*.a + From 50f098312335ff35d5689f3692d3689f14f606ab Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:25:02 -0600 Subject: [PATCH 68/98] windows archive --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16eab39..0bc43c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,11 @@ jobs: - name: Make wxWidgets archive shell: bash run: | - cd + mkdir wx-3.2.3 + cp -r wxWidgets-3.2.3/bin wx-3.2.3 + cp -r wxWidgets-3.2.3/include wx-3.2.3 + cp -r wxWidgets-3.2.3/lib wx-3.2.3 + cp -r wxWidgets-3.2.3/share wx-3.2.3 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build From dd70906c2aff0e7eb424c12b4a21440f1371f6b8 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:26:54 -0600 Subject: [PATCH 69/98] linux archive --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bc43c8..76a4af7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 make make install sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 From 9f6070f64347a21feb024b77c5f255bf52c887c0 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:37:06 -0600 Subject: [PATCH 70/98] windows archive --- .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 76a4af7..ccc6b67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,10 +96,10 @@ jobs: shell: bash run: | mkdir wx-3.2.3 - cp -r wxWidgets-3.2.3/bin wx-3.2.3 + mkdir -r wx-3.2.3/build/msw + cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw cp -r wxWidgets-3.2.3/include wx-3.2.3 cp -r wxWidgets-3.2.3/lib wx-3.2.3 - cp -r wxWidgets-3.2.3/share wx-3.2.3 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build From 4e1e0eae4e1b348d16406adae62ef6784dede923 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:39:23 -0600 Subject: [PATCH 71/98] multi process --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccc6b67..e65abb6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,7 +38,7 @@ jobs: tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 - make + make -j4 make install sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags @@ -61,7 +61,7 @@ jobs: - name: Build LK run: | cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug - cmake --build build_linux -- -j + cmake --build build_linux -- -j4 - name: Save static lib & lksandbox uses: actions/upload-artifact@v2 @@ -141,7 +141,7 @@ jobs: tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin - make + make -j3 make install sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags @@ -169,7 +169,7 @@ jobs: - name: Build LK run: | cmake -Bbuild -DCMAKE_BUILD_TYPE=Release - cmake --build build -- -j + cmake --build build -- -j3 - name: Save static lib & lksandbox uses: actions/upload-artifact@v2 From 36ae8769b161563ff2c2c5f71b1d3381eb5836d6 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:43:27 -0600 Subject: [PATCH 72/98] syntax --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e65abb6..5cef4c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -96,7 +96,7 @@ jobs: shell: bash run: | mkdir wx-3.2.3 - mkdir -r wx-3.2.3/build/msw + mkdir -p wx-3.2.3/build/msw cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw cp -r wxWidgets-3.2.3/include wx-3.2.3 cp -r wxWidgets-3.2.3/lib wx-3.2.3 From 6fe2d87d23f7ca3eb744be22fa4af0afc2e71523 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 14:47:41 -0600 Subject: [PATCH 73/98] set env vars --- .github/workflows/ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cef4c2..5ebba88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,10 +27,11 @@ jobs: libgtk2.0-dev \ mesa-common-dev \ unzip - - name: Get GCC version - run: gcc --version - - name: Get libc version - run: ldd --version + + - name: Set relative paths + run: | + WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Install wxWidgets run: | @@ -77,6 +78,12 @@ jobs: - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 + - name: Set relative paths + shell: bash + run: | + WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + - name: Checkout uses: actions/checkout@v2 @@ -135,6 +142,11 @@ jobs: matrix: os: [macos-14-large, macos-latest] steps: + - name: Set relative paths + run: | + WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 + echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + - name: Install wxWidgets run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 From 3a1a8ee91926217485d49f1323b345438f8aa270 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:01:29 -0600 Subject: [PATCH 74/98] add prints --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ebba88..1881e1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,7 @@ jobs: sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + ls ${WXMSW3}/bin/ - name: Make wxWidgets archive run: | @@ -61,6 +62,7 @@ jobs: - name: Build LK run: | + ls ${WXMSW3} cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug cmake --build build_linux -- -j4 @@ -98,6 +100,7 @@ jobs: run: | cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + dir ${WXMSW3} - name: Make wxWidgets archive shell: bash @@ -123,6 +126,7 @@ jobs: - name: Build LK run: | + ls ${WXMSW3} mkdir build cd build cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. @@ -146,7 +150,7 @@ jobs: run: | WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - + - name: Install wxWidgets run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 @@ -158,6 +162,7 @@ jobs: sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + ls ${WXMSW3}/bin/ - name: Make wxWidgets archive run: | @@ -180,6 +185,7 @@ jobs: - name: Build LK run: | + ls ${WXMSW3} cmake -Bbuild -DCMAKE_BUILD_TYPE=Release cmake --build build -- -j3 From fb7cf1da57690a2db477b2a6afa0f4b2859b9e4f Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:08:21 -0600 Subject: [PATCH 75/98] fix windows path --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f56b453..e58825a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,7 @@ if (UNIX) else () # WXWIN is the environment variable used within the wxwidgets.props from the binary distribution of wxWidgets if(NOT EXISTS "$ENV{WXWIN}/wxwidgets.props") - set(wxWidgets_ROOT_DIR $ENV{WXWIN}) + set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") From 8efa13590a6618ac5154fd9df3ab7562241132f0 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:10:14 -0600 Subject: [PATCH 76/98] fix paths --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1881e1b..196192b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,9 @@ jobs: WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + - name: Checkout + uses: actions/checkout@v2 + - name: Install wxWidgets run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 @@ -57,9 +60,6 @@ jobs: path: | wx3.2.3.7z - - name: Checkout - uses: actions/checkout@v2 - - name: Build LK run: | ls ${WXMSW3} @@ -151,6 +151,9 @@ jobs: WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV + - name: Checkout + uses: actions/checkout@v2 + - name: Install wxWidgets run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 @@ -180,9 +183,6 @@ jobs: with: cmake-version: '3.24.x' - - name: Checkout - uses: actions/checkout@v2 - - name: Build LK run: | ls ${WXMSW3} From f665c7aeeb44c12d4c2c7f05beff623af70a6853 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:23:14 -0600 Subject: [PATCH 77/98] windows paths --- .github/workflows/ci.yml | 4 ++-- CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 196192b..6e79d82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: run: | cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release - dir ${WXMSW3} + dir $env:WXMSW3 - name: Make wxWidgets archive shell: bash @@ -126,7 +126,7 @@ jobs: - name: Build LK run: | - ls ${WXMSW3} + dir $env:WXMSW3 mkdir build cd build cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. diff --git a/CMakeLists.txt b/CMakeLists.txt index e58825a..f8ea31f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,8 @@ if (UNIX) include(${wxWidgets_USE_FILE}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () - # WXWIN is the environment variable used within the wxwidgets.props from the binary distribution of wxWidgets + # WXWIN is the environment variable used within the wxwidgets.props from the binary distribution of wxWidgets + message("env $ENV{WXWIN}") if(NOT EXISTS "$ENV{WXWIN}/wxwidgets.props") set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) From 243ce69a94d71f13ff3a1a84e1702a9a25b6d7a5 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:23:49 -0600 Subject: [PATCH 78/98] windows --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8ea31f..4e4b89b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,8 +90,8 @@ if (UNIX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}") else () # WXWIN is the environment variable used within the wxwidgets.props from the binary distribution of wxWidgets - message("env $ENV{WXWIN}") if(NOT EXISTS "$ENV{WXWIN}/wxwidgets.props") + message("env $ENV{WXMSW3}") set(wxWidgets_ROOT_DIR $ENV{WXMSW3}) find_package(wxWidgets REQUIRED qa webview aui richtext html propgrid adv net stc core base scintilla) include(${wxWidgets_USE_FILE}) From 8aaab8add2d9134c3be9915cc53ae66bd564d276 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:45:55 -0600 Subject: [PATCH 79/98] fix platform --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e79d82..2ab438a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,7 +99,7 @@ jobs: - name: Install wxWidgets run: | cd wxWidgets-3.2.3 - msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release + msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 dir $env:WXMSW3 - name: Make wxWidgets archive From 873e74b60595786662358cdfc01ce2b4ea693b77 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 15:58:26 -0600 Subject: [PATCH 80/98] cleanup --- .github/workflows/ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ab438a..fe3aceb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,6 @@ jobs: sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH - ls ${WXMSW3}/bin/ - name: Make wxWidgets archive run: | @@ -62,7 +61,6 @@ jobs: - name: Build LK run: | - ls ${WXMSW3} cmake -Bbuild_linux -DCMAKE_BUILD_TYPE=Debug cmake --build build_linux -- -j4 @@ -100,7 +98,6 @@ jobs: run: | cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 - dir $env:WXMSW3 - name: Make wxWidgets archive shell: bash @@ -126,7 +123,6 @@ jobs: - name: Build LK run: | - dir $env:WXMSW3 mkdir build cd build cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. @@ -165,7 +161,6 @@ jobs: sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH - ls ${WXMSW3}/bin/ - name: Make wxWidgets archive run: | @@ -185,7 +180,6 @@ jobs: - name: Build LK run: | - ls ${WXMSW3} cmake -Bbuild -DCMAKE_BUILD_TYPE=Release cmake --build build -- -j3 @@ -196,12 +190,4 @@ jobs: path: | build/lk_sandbox* build/lk*.a - - - name: Save wxWidgets build - uses: actions/upload-artifact@v2 - with: - name: LK-${{ env.RUNS_ON }}-x86_64 - path: | - build/lk_sandbox* - build/lk*.a From 6aaa782b1bd1761e0aa7b255190e0da3a4e9d294 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 16:01:00 -0600 Subject: [PATCH 81/98] update versions --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe3aceb..90bd1af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install wxWidgets run: | @@ -53,7 +53,7 @@ jobs: 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: wxWidgets-${{ env.RUNS_ON }} path: | @@ -65,7 +65,7 @@ jobs: cmake --build build_linux -- -j4 - name: Save static lib & lksandbox - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: LK-${{ env.RUNS_ON }}-x86_64 path: | @@ -85,7 +85,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Download wxWidgets shell: bash @@ -110,7 +110,7 @@ jobs: 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: wxWidgets-${{ env.RUNS_ON }} path: | @@ -129,7 +129,7 @@ jobs: MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: LK-${{ env.RUNS_ON }}-x86_64 path: | @@ -148,7 +148,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Install wxWidgets run: | @@ -167,7 +167,7 @@ jobs: 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: wxWidgets-${{ env.RUNS_ON }} path: | @@ -184,7 +184,7 @@ jobs: cmake --build build -- -j3 - name: Save static lib & lksandbox - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: LK-${{ env.RUNS_ON }}-x86_64 path: | From 8c335e47815ebfa581b539b59927288be7984ad1 Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 16:16:27 -0600 Subject: [PATCH 82/98] fix name --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 90bd1af..28a2902 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ env.RUNS_ON }} + name: wxWidgets-${{ matrix.os }} path: | wx3.2.3.7z @@ -67,7 +67,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ env.RUNS_ON }}-x86_64 + name: LK-${{ matrix.os }}-x86_64 path: | build_linux/lk_sandbox* build_linux/lk*.a @@ -112,7 +112,7 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ env.RUNS_ON }} + name: wxWidgets-${{ matrix.os }} path: | wx3.2.3.7z @@ -131,7 +131,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ env.RUNS_ON }}-x86_64 + name: LK-${{ matrix.os }}-x86_64 path: | build/Release/lk_sandbox* build/Release/lk*.a @@ -169,7 +169,7 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ env.RUNS_ON }} + name: wxWidgets-${{ matrix.os }} path: | wx3.2.3.7z @@ -186,7 +186,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ env.RUNS_ON }}-x86_64 + name: LK-${{ matrix.os }}-x86_64 path: | build/lk_sandbox* build/lk*.a From 3c4020d1038e95942154edb15c4cf9544b3074cb Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 16:30:53 -0600 Subject: [PATCH 83/98] naming --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 28a2902..6a4317c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ matrix.os }} + name: wxWidgets-linux path: | wx3.2.3.7z @@ -67,7 +67,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ matrix.os }}-x86_64 + name: LK-linux path: | build_linux/lk_sandbox* build_linux/lk*.a @@ -112,7 +112,7 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ matrix.os }} + name: wxWidgets-windows path: | wx3.2.3.7z @@ -131,7 +131,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ matrix.os }}-x86_64 + name: LK-windows path: | build/Release/lk_sandbox* build/Release/lk*.a @@ -186,7 +186,7 @@ jobs: - name: Save static lib & lksandbox uses: actions/upload-artifact@v4 with: - name: LK-${{ matrix.os }}-x86_64 + name: LK-${{ matrix.os }} path: | build/lk_sandbox* build/lk*.a From a48a4c8c40e13bd94d9d0592255ab967dce7ddfb Mon Sep 17 00:00:00 2001 From: Darice Date: Thu, 16 May 2024 16:45:00 -0600 Subject: [PATCH 84/98] update versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a4317c..4ffacd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install wxWidgets run: | @@ -85,7 +85,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download wxWidgets shell: bash @@ -148,7 +148,7 @@ jobs: echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install wxWidgets run: | From 6a40ba9f35f4f2f0bd110fc51f502e265a0b2bd6 Mon Sep 17 00:00:00 2001 From: Darice Date: Fri, 17 May 2024 14:15:09 -0600 Subject: [PATCH 85/98] update archive --- .github/workflows/ci.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ffacd4..9741743 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,16 +48,12 @@ jobs: wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH - - name: Make wxWidgets archive - run: | - 7z a wx3.2.3.7z wx-3.2.3 - - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: name: wxWidgets-linux path: | - wx3.2.3.7z + wx-3.2.3 - name: Build LK run: | @@ -107,14 +103,13 @@ jobs: cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw cp -r wxWidgets-3.2.3/include wx-3.2.3 cp -r wxWidgets-3.2.3/lib wx-3.2.3 - 7z a wx3.2.3.7z wx-3.2.3 - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: name: wxWidgets-windows path: | - wx3.2.3.7z + wx-3.2.3 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -162,16 +157,12 @@ jobs: wx-config-3 --cflags echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH - - name: Make wxWidgets archive - run: | - 7z a wx3.2.3.7z wx-3.2.3 - - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: name: wxWidgets-${{ matrix.os }} path: | - wx3.2.3.7z + wx-3.2.3 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 60cd80adedf9125076555edabb81cb0cfd40379c Mon Sep 17 00:00:00 2001 From: Darice Date: Mon, 20 May 2024 07:32:34 -0600 Subject: [PATCH 86/98] try macos13 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9741743..5d887e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,7 +135,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-14-large, macos-latest] + os: [macos-14-large, macos-13] steps: - name: Set relative paths run: | From 333c15b4aafcf87f842aeac5d0d4105e9da2ee06 Mon Sep 17 00:00:00 2001 From: Darice Date: Mon, 20 May 2024 10:25:43 -0600 Subject: [PATCH 87/98] build wx in $HOME --- .github/workflows/ci.yml | 29 +++++++++++++++-------------- CMakeLists.txt | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d887e1..b3f6109 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Set relative paths run: | - WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 + WXMSW3=$HOME/wx-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -41,12 +41,12 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 + ./configure --prefix=$HOME/wx-3.2.3 --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 make -j4 make install - sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags - echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH - name: Save wxWidgets build uses: actions/upload-artifact@v4 @@ -77,7 +77,7 @@ jobs: - name: Set relative paths shell: bash run: | - WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + WXMSW3=$HOME/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -86,13 +86,14 @@ jobs: - name: Download wxWidgets shell: bash run: | + cd $HOME curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - name: Install wxWidgets run: | - cd wxWidgets-3.2.3 + cd $HOME/wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 - name: Make wxWidgets archive @@ -100,9 +101,9 @@ jobs: run: | mkdir wx-3.2.3 mkdir -p wx-3.2.3/build/msw - cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw - cp -r wxWidgets-3.2.3/include wx-3.2.3 - cp -r wxWidgets-3.2.3/lib wx-3.2.3 + cp -r $HOME/wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw + cp -r $HOME/wxWidgets-3.2.3/include wx-3.2.3 + cp -r $HOME/wxWidgets-3.2.3/lib wx-3.2.3 - name: Save wxWidgets build uses: actions/upload-artifact@v4 @@ -135,11 +136,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-14-large, macos-13] + os: [macos-14-large, macos-latest] steps: - name: Set relative paths run: | - WXMSW3=$GITHUB_WORKSPACE/wx-3.2.3 + WXMSW3=$HOME/wx-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -150,12 +151,12 @@ jobs: curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 tar jxf wxWidgets-3.2.3.tar.bz2 cd wxWidgets-3.2.3 - ./configure --prefix=$GITHUB_WORKSPACE/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make -j3 make install - sudo ln -s $GITHUB_WORKSPACE/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags - echo ${GITHUB_WORKSPACE}/wx-3.2.3/bin >> $GITHUB_PATH + echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH - name: Save wxWidgets build uses: actions/upload-artifact@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e4b89b..8714d56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ endif (MSVC) if (UNIX) if(EXISTS /usr/local/bin/wx-config-3) set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3) - else () + else() set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config) endif () find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base) From 696d77cea6c9ee2e0361cea79dfc3498a6e4d769 Mon Sep 17 00:00:00 2001 From: Darice Date: Mon, 20 May 2024 14:13:23 -0600 Subject: [PATCH 88/98] revert broken windows --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3f6109..77b1507 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: - name: Set relative paths shell: bash run: | - WXMSW3=$HOME/wxWidgets-3.2.3 + WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -86,14 +86,13 @@ jobs: - name: Download wxWidgets shell: bash run: | - cd $HOME curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 ls tar jxf wxWidgets-3.2.3.tar.bz2 - name: Install wxWidgets run: | - cd $HOME/wxWidgets-3.2.3 + cd wxWidgets-3.2.3 msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 - name: Make wxWidgets archive @@ -101,9 +100,9 @@ jobs: run: | mkdir wx-3.2.3 mkdir -p wx-3.2.3/build/msw - cp -r $HOME/wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw - cp -r $HOME/wxWidgets-3.2.3/include wx-3.2.3 - cp -r $HOME/wxWidgets-3.2.3/lib wx-3.2.3 + cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw + cp -r wxWidgets-3.2.3/include wx-3.2.3 + cp -r wxWidgets-3.2.3/lib wx-3.2.3 - name: Save wxWidgets build uses: actions/upload-artifact@v4 From 768b8ee70c657a3414ee10d7f4e54c322b478878 Mon Sep 17 00:00:00 2001 From: Darice Date: Mon, 20 May 2024 15:23:10 -0600 Subject: [PATCH 89/98] fix wx artifact path --- .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 77b1507..b855dce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: with: name: wxWidgets-linux path: | - wx-3.2.3 + ${HOME}/wx-3.2.3 - name: Build LK run: | @@ -162,7 +162,7 @@ jobs: with: name: wxWidgets-${{ matrix.os }} path: | - wx-3.2.3 + ${HOME}/wx-3.2.3 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 02f37db16da92b8870e913a2c4c9760207897440 Mon Sep 17 00:00:00 2001 From: Darice Date: Tue, 21 May 2024 08:56:41 -0600 Subject: [PATCH 90/98] fix paths for artifacts --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b855dce..13adccf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,14 +46,14 @@ jobs: make install sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags - echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH + echo $HOME/wx-3.2.3/bin >> $GITHUB_PATH - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: name: wxWidgets-linux path: | - ${HOME}/wx-3.2.3 + $WXMSW3 - name: Build LK run: | @@ -162,7 +162,7 @@ jobs: with: name: wxWidgets-${{ matrix.os }} path: | - ${HOME}/wx-3.2.3 + $WXMSW3 - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 2bb9673e54265eb2ffd898fc98a593acf137359f Mon Sep 17 00:00:00 2001 From: Darice Date: Tue, 21 May 2024 09:02:05 -0600 Subject: [PATCH 91/98] use env for artifact --- .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 13adccf..17289b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: with: name: wxWidgets-linux path: | - $WXMSW3 + ${{ env.WXMSW3 }} - name: Build LK run: | @@ -162,7 +162,7 @@ jobs: with: name: wxWidgets-${{ matrix.os }} path: | - $WXMSW3 + ${{ env.WXMSW3 }} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 2f6b9bbdd3a42c4cd12a1a7c1c9751627c50a9fe Mon Sep 17 00:00:00 2001 From: Darice Date: Tue, 21 May 2024 10:52:45 -0600 Subject: [PATCH 92/98] reduce windows artifact size --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17289b6..45c7386 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,8 +99,6 @@ jobs: shell: bash run: | mkdir wx-3.2.3 - mkdir -p wx-3.2.3/build/msw - cp -r wxWidgets-3.2.3/build/msw/vc_* wx-3.2.3/build/msw cp -r wxWidgets-3.2.3/include wx-3.2.3 cp -r wxWidgets-3.2.3/lib wx-3.2.3 From 07c40b8f388e724aac5451318ff054ec547bce7e Mon Sep 17 00:00:00 2001 From: Darice Date: Tue, 21 May 2024 15:05:15 -0600 Subject: [PATCH 93/98] clean up --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45c7386..9b0a6f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,7 +87,6 @@ jobs: shell: bash run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - ls tar jxf wxWidgets-3.2.3.tar.bz2 - name: Install wxWidgets @@ -118,7 +117,7 @@ jobs: run: | mkdir build cd build - cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10.0 .. + cmake -G "Visual Studio 17 2022" -DCMAKE_CONFIGURATION_TYPES="Release" -DCMAKE_SYSTEM_VERSION=10 .. MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox From 90e87be8020c40dddcc0b5ade012aa025aba8fee Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 22 May 2024 10:28:51 -0600 Subject: [PATCH 94/98] update wx version --- .github/workflows/ci.yml | 55 ++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b0a6f2..795ee8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,9 @@ on: push: pull_request: +env: + WX_VERSION: '3.2.4' + jobs: build-on-ubuntu: runs-on: ubuntu-latest @@ -30,23 +33,31 @@ jobs: - name: Set relative paths run: | - WXMSW3=$HOME/wx-3.2.3 + WXMSW3=$HOME/wx-$WX_VERSION echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 + - name: Get cached build of wxWidgets + uses: actions/cache@v4 + id: cachedwx + with: + path: ${{env.WXMSW3}}/ + key: windows-wxWidgets-${{ env.WX_VERSION }} + - name: Install wxWidgets + if: steps.cachedwx.outputs.cache-hit != 'true' run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3 - ./configure --prefix=$HOME/wx-3.2.3 --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2 + tar jxf wxWidgets-$WX_VERSION.tar.bz2 + cd wxWidgets-$WX_VERSION + ./configure --prefix=$HOME/wx-$WX_VERSION --enable-shared=no --enable-debug=no --with-gtk=2 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin --without-libjbig --without-liblzma --without-gtkprint --with-libnotify=no --with-libmspack=no --with-gnomevfs=no --with-opengl=yes --with-sdl=no --with-cxx=11 make -j4 make install - sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + sudo ln -s $HOME/wx-$WX_VERSION/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags - echo $HOME/wx-3.2.3/bin >> $GITHUB_PATH + echo $HOME/wx-$WX_VERSION/bin >> $GITHUB_PATH - name: Save wxWidgets build uses: actions/upload-artifact@v4 @@ -77,7 +88,7 @@ jobs: - name: Set relative paths shell: bash run: | - WXMSW3=$GITHUB_WORKSPACE/wxWidgets-3.2.3 + WXMSW3=$GITHUB_WORKSPACE/wxWidgets-$WX_VERSION echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -86,27 +97,27 @@ jobs: - name: Download wxWidgets shell: bash run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - tar jxf wxWidgets-3.2.3.tar.bz2 + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2 + tar jxf wxWidgets-$WX_VERSION.tar.bz2 - name: Install wxWidgets run: | - cd wxWidgets-3.2.3 + cd wxWidgets-$WX_VERSION msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 - name: Make wxWidgets archive shell: bash run: | - mkdir wx-3.2.3 - cp -r wxWidgets-3.2.3/include wx-3.2.3 - cp -r wxWidgets-3.2.3/lib wx-3.2.3 + mkdir wx-$WX_VERSION + cp -r wxWidgets-$WX_VERSION/include wx-$WX_VERSION + cp -r wxWidgets-$WX_VERSION/lib wx-$WX_VERSION - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: name: wxWidgets-windows path: | - wx-3.2.3 + wx-$WX_VERSION - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -136,7 +147,7 @@ jobs: steps: - name: Set relative paths run: | - WXMSW3=$HOME/wx-3.2.3 + WXMSW3=$HOME/wx-$WX_VERSION echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -144,15 +155,15 @@ jobs: - name: Install wxWidgets run: | - curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.3/wxWidgets-3.2.3.tar.bz2 -o wxWidgets-3.2.3.tar.bz2 - tar jxf wxWidgets-3.2.3.tar.bz2 - cd wxWidgets-3.2.3 - ./configure --prefix=$HOME/wx-3.2.3 --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin + curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2 + tar jxf wxWidgets-$WX_VERSION.tar.bz2 + cd wxWidgets-$WX_VERSION + ./configure --prefix=$HOME/wx-$WX_VERSION --enable-stl=yes --enable-shared=no --disable-debug_flag --with-cocoa --enable-universal_binary=x86_64,arm64 --enable-unicode --enable-webview --disable-mediactrl --with-cxx=11 --with-macosx-version-min=10.15 --with-libjpeg=builtin --with-libpng=builtin --with-regex=builtin --with-libtiff=builtin --with-zlib=builtin --with-expat=builtin make -j3 make install - sudo ln -s $HOME/wx-3.2.3/bin/wx-config /usr/local/bin/wx-config-3 + sudo ln -s $HOME/wx-$WX_VERSION/bin/wx-config /usr/local/bin/wx-config-3 wx-config-3 --cflags - echo ${HOME}/wx-3.2.3/bin >> $GITHUB_PATH + echo ${HOME}/wx-$WX_VERSION/bin >> $GITHUB_PATH - name: Save wxWidgets build uses: actions/upload-artifact@v4 From 864ac72006d29f7b21c8beaf9a141cbdc40b2be3 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 22 May 2024 13:38:00 -0600 Subject: [PATCH 95/98] use caching --- .github/workflows/ci.yml | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 795ee8a..cb77228 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: id: cachedwx with: path: ${{env.WXMSW3}}/ - key: windows-wxWidgets-${{ env.WX_VERSION }} + key: wxWidgets-${{ env.WX_VERSION }}-linux - name: Install wxWidgets if: steps.cachedwx.outputs.cache-hit != 'true' @@ -60,9 +60,10 @@ jobs: echo $HOME/wx-$WX_VERSION/bin >> $GITHUB_PATH - name: Save wxWidgets build + if: steps.cachedwx.outputs.cache-hit != 'true' uses: actions/upload-artifact@v4 with: - name: wxWidgets-linux + name: wxWidgets-${{ env.WX_VERSION }}-linux path: | ${{ env.WXMSW3 }} @@ -93,19 +94,29 @@ jobs: - name: Checkout uses: actions/checkout@v4 - + + - name: Get cached build of wxWidgets + uses: actions/cache@v4 + id: cachedwx + with: + path: ${{env.WXMSW3}}/ + key: wxWidgets-${{ env.WX_VERSION }}-windows + - name: Download wxWidgets + if: steps.cachedwx.outputs.cache-hit != 'true' shell: bash run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2 tar jxf wxWidgets-$WX_VERSION.tar.bz2 - name: Install wxWidgets + if: steps.cachedwx.outputs.cache-hit != 'true' run: | - cd wxWidgets-$WX_VERSION + cd wxWidgets-$env:WX_VERSION msbuild build/msw/wx_vc17.sln /t:Build /p:Configuration=Release /p:Platform=x64 - name: Make wxWidgets archive + if: steps.cachedwx.outputs.cache-hit != 'true' shell: bash run: | mkdir wx-$WX_VERSION @@ -115,9 +126,9 @@ jobs: - name: Save wxWidgets build uses: actions/upload-artifact@v4 with: - name: wxWidgets-windows + name: wxWidgets-${{ env.WX_VERSION }}-windows path: | - wx-$WX_VERSION + ${{ env.WXMSW3 }} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 @@ -153,7 +164,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Get cached build of wxWidgets + uses: actions/cache@v4 + id: cachedwx + with: + path: ${{env.WXMSW3}}/ + key: wxWidgets-${{ env.WX_VERSION }}-${{ matrix.os }} + - name: Install wxWidgets + if: steps.cachedwx.outputs.cache-hit != 'true' run: | curl -L https://github.com/wxWidgets/wxWidgets/releases/download/v$WX_VERSION/wxWidgets-$WX_VERSION.tar.bz2 -o wxWidgets-$WX_VERSION.tar.bz2 tar jxf wxWidgets-$WX_VERSION.tar.bz2 @@ -166,9 +185,10 @@ jobs: echo ${HOME}/wx-$WX_VERSION/bin >> $GITHUB_PATH - name: Save wxWidgets build + if: steps.cachedwx.outputs.cache-hit != 'true' uses: actions/upload-artifact@v4 with: - name: wxWidgets-${{ matrix.os }} + name: wxWidgets-${{ env.WX_VERSION }}-${{ matrix.os }} path: | ${{ env.WXMSW3 }} From 7bc34ab9d7601e7665523abaebdd59a91855159b Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 22 May 2024 13:50:01 -0600 Subject: [PATCH 96/98] fix caching on windows --- .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 cb77228..1e38d25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -89,7 +89,7 @@ jobs: - name: Set relative paths shell: bash run: | - WXMSW3=$GITHUB_WORKSPACE/wxWidgets-$WX_VERSION + WXMSW3=$GITHUB_WORKSPACE/wx-$WX_VERSION echo "WXMSW3=$WXMSW3" >> $GITHUB_ENV - name: Checkout @@ -128,7 +128,7 @@ jobs: with: name: wxWidgets-${{ env.WX_VERSION }}-windows path: | - ${{ env.WXMSW3 }} + wx-${{env.WX_VERSION}} - name: Setup cmake uses: jwlawson/actions-setup-cmake@v2 From 722d5a4641728677367d29edfcfde4a60ca56aa3 Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 22 May 2024 14:16:51 -0600 Subject: [PATCH 97/98] check caching --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e38d25..40540e4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,8 +15,10 @@ jobs: uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.24.x' + - name: Test cmake version run: cmake --version + - name: Install OS dependencies run: | sudo apt-get update From 26c679d6a97a86c6a1dea1f267e3873bdcc2146f Mon Sep 17 00:00:00 2001 From: Darice Date: Wed, 22 May 2024 14:20:19 -0600 Subject: [PATCH 98/98] only artifact if not cached --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40540e4..7976585 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: uses: jwlawson/actions-setup-cmake@v2 with: cmake-version: '3.24.x' - + - name: Test cmake version run: cmake --version @@ -75,6 +75,7 @@ jobs: cmake --build build_linux -- -j4 - name: Save static lib & lksandbox + if: steps.cachedwx.outputs.cache-hit != 'true' uses: actions/upload-artifact@v4 with: name: LK-linux @@ -145,6 +146,7 @@ jobs: MSBuild.exe .\lk.sln /t:Build /p:Configuration=Release - name: Save static lib & lksandbox + if: steps.cachedwx.outputs.cache-hit != 'true' uses: actions/upload-artifact@v4 with: name: LK-windows @@ -205,6 +207,7 @@ jobs: cmake --build build -- -j3 - name: Save static lib & lksandbox + if: steps.cachedwx.outputs.cache-hit != 'true' uses: actions/upload-artifact@v4 with: name: LK-${{ matrix.os }}