mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Rejbasket/version geos update (#2979) 

* update geos version for linux an win builds

* pinned pyinstaller version

* changed windows build runner to windows-2019

* changed build version for cmake geos build script

---------

Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>
pull/2984/head
rejbasket 2024-06-09 13:10:57 +02:00 zatwierdzone przez GitHub
rodzic 1cc14f7ba6
commit a8dcd1fc03
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
3 zmienionych plików z 10 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
.github/workflows/build.yml vendored
Wyświetl plik

@ -83,7 +83,7 @@ jobs:
name: inkstitch-linux name: inkstitch-linux
path: artifacts path: artifacts
windows32: windows32:
runs-on: windows-latest runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -149,7 +149,7 @@ jobs:
name: inkstitch-windows32 name: inkstitch-windows32
path: artifacts path: artifacts
windows64: windows64:
runs-on: windows-latest runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:

10
bin/build-geos-win.cmd
Wyświetl plik

@ -5,13 +5,13 @@ SET GEOS_INSTALL=%CD%\geos-build
if NOT DEFINED BUILD32 (SET BUILDFLAG="x64") else (SET BUILDFLAG="Win32") if NOT DEFINED BUILD32 (SET BUILDFLAG="x64") else (SET BUILDFLAG="Win32")
echo %BUILDFLAG% echo %BUILDFLAG%
curl -L -O https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2 curl -L -O https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2
7z x geos-3.12.1.tar.bz2 7z x geos-3.12.2.tar.bz2
7z x geos-3.12.1.tar 7z x geos-3.12.2.tar
cd geos-3.12.1 cd geos-3.12.2
cmake -S . -B _build -G "Visual Studio 17 2022" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64 cmake -S . -B _build -G "Visual Studio 16 2019" -A %BUILDFLAG% -DCMAKE_INSTALL_PREFIX=%GEOS_INSTALL% -DCMAKE_GENERATOR_TOOLSET=host=x64
cmake --build _build --config Release -j 16 --verbose cmake --build _build --config Release -j 16 --verbose
cd _build cd _build

6
bin/build-linux-dist
Wyświetl plik

@ -3,11 +3,11 @@
mkdir $HOME/geos-build mkdir $HOME/geos-build
GEOS_PATH=$HOME/geos-build GEOS_PATH=$HOME/geos-build
# Downloading geos # Downloading geos
curl -L -O https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2 curl -L -O https://github.com/libgeos/geos/releases/download/3.12.2/geos-3.12.2.tar.bz2
# uzipping geos # uzipping geos
tar -xf geos-3.12.1.tar.bz2 tar -xf geos-3.12.2.tar.bz2
cd geos-3.12.1 cd geos-3.12.2
# Building geos # Building geos
mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=$GEOS_PATH -DCMAKE_BUILD_TYPE=Release .. mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX:PATH=$GEOS_PATH -DCMAKE_BUILD_TYPE=Release ..
make && make install make && make install