-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Fix] Connect to Data Source window does not scale properly (Ubuntu) (#…
- Loading branch information
Showing
25 changed files
with
1,475 additions
and
1,375 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,12 +21,24 @@ on: | |
| jobs: | ||
| # This workflow contains a single job called "build" | ||
| osx_build: | ||
| # The type of runner that the job will run on | ||
| runs-on: macos-latest | ||
| # The type of runner that the job will run on, macos-13 is x86_64 | ||
| runs-on: ${{ matrix.distro }} | ||
| if: ${{ !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') }} | ||
|
|
||
| strategy: | ||
| fail-fast: true | ||
| matrix: | ||
| distro: | ||
| - 'macos-13' | ||
| - 'macos-14' | ||
| include: | ||
| - distro: 'macos-13' | ||
| pre: 'x86_64' | ||
| - distro: 'macos-14' | ||
| pre: 'arm64' | ||
| env: | ||
| GEODA_VER: '1.22.0' | ||
| GEODA_ARCH: ${{ matrix.pre }} | ||
|
|
||
| # Steps represent a sequence of tasks that will be executed as part of the job | ||
|
|
||
|
|
@@ -42,40 +54,52 @@ jobs: | |
| p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }} | ||
| p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }} | ||
|
|
||
| - name: Setup Brew | ||
| - name: Install GDAL using Brew x86_64 | ||
| if: ${{ matrix.pre == 'x86_64' }} | ||
| run: | | ||
| brew install [email protected] | ||
| ln -s /usr/local/opt/[email protected] /usr/local/opt/boost | ||
| rm /usr/local/bin/2to3 || true | ||
| rm /usr/local/bin/idle3 || true | ||
| rm /usr/local/bin/pydoc3 || true | ||
| rm /usr/local/bin/python3 || true | ||
| rm /usr/local/bin/python3-config || true | ||
| brew install --force --overwrite --quiet gdal || true | ||
| - name: Install GDAL using Brew Arm64 | ||
| if: ${{ matrix.pre == 'arm64' }} | ||
| run: | | ||
| arch | ||
| brew install gdal | ||
| sudo ln -s /opt/homebrew/opt/gdal /usr/local/opt/gdal | ||
| - uses: actions/cache@v3 | ||
| id: cache | ||
| with: | ||
| path: | | ||
| BuildTools/macosx/libraries | ||
| BuildTools/macosx/temp | ||
| key: ${{ runner.os }}-deps-cache-${{ hashFiles('BuildTools/macosx/install.sh') }} | ||
| key: ${{ runner.os }}-${{ matrix.pre }}-deps-cache-${{ hashFiles('BuildTools/macosx/install.sh') }} | ||
|
|
||
| - if: steps.cache.outputs.cache-hit != 'true' | ||
| name: Build Dependencies | ||
| run: | | ||
| cd BuildTools/macosx | ||
| export GEODA_HOME=$PWD | ||
| export GEODA_ARCH=x86_64 | ||
| export GEODA_ARCH=${{ env.GEODA_ARCH }} | ||
| ./install.sh | ||
| - name: Build GeoDa | ||
| run: | | ||
| mkdir -p o | ||
| cd BuildTools/macosx | ||
| export GEODA_HOME=$PWD | ||
| export GEODA_ARCH=${{ env.GEODA_ARCH }} | ||
| cp ../../GeoDamake.macosx.opt ../../GeoDamake.opt | ||
| echo "find identity" | ||
| security find-identity -v | ||
| VER_MAJOR=$(grep version_major $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_MINOR=$(grep version_minor $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| VER_BUILD=$(grep version_build $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD | ||
| GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD-$GEODA_ARCH | ||
| echo $GEODA_VERSION | ||
| make -j$(sysctl -n hw.ncpu) | ||
| make app | ||
|
|
@@ -86,5 +110,5 @@ jobs: | |
| # Upload artifact | ||
| - uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: GeoDa-${{ env.GEODA_VER }}-MacOS | ||
| path: ${{ github.workspace }}/BuildTools/macosx/create-dmg/GeoDa${{ env.GEODA_VER }}-Installer.dmg | ||
| name: GeoDa-${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-MacOS | ||
| path: ${{ github.workspace }}/BuildTools/macosx/create-dmg/GeoDa${{ env.GEODA_VER }}-${{ env.GEODA_ARCH }}-Installer.dmg | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #define IEEE_8087 | ||
| #define Arith_Kind_ASL 1 | ||
| #define Long int | ||
| #define Intcast (int)(long) | ||
| #define Double_Align | ||
| #define X64_bit_pointers | ||
| #define NANCHECK | ||
| #define QNaN0 0x0 | ||
| #define QNaN1 0x7ff80000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| #!/bin/sh | ||
| #!/bin/zsh | ||
|
|
||
| # stops the execution of a script if a command or pipeline has an error | ||
| set -e | ||
|
|
||
| export GEODA_HOME=$PWD | ||
| echo $GEODA_HOME | ||
| CPUS=`sysctl -n hw.ncpu` | ||
|
|
||
| # Install boost 1.75 | ||
| #brew install [email protected] | ||
| #ln -s /usr/local/opt/[email protected] /usr/local/opt/boost | ||
| echo $GEODA_ARCH | ||
| # check if $GEODA_HOME and $GEODA_ARCH are set | ||
| if [ -z "$GEODA_HOME" ]; then | ||
| echo "Please set GEODA_HOME environment variable" | ||
| exit | ||
| fi | ||
| if [ -z "$GEODA_ARCH" ]; then | ||
| echo "Please set GEODA_ARCH environment variable" | ||
| exit | ||
| fi | ||
|
|
||
| # Install libgdal 3.6 | ||
| #brew install gdal | ||
| CPUS=`sysctl -n hw.ncpu` | ||
|
|
||
| cd $GEODA_HOME | ||
| mkdir -p temp | ||
|
|
@@ -23,16 +27,39 @@ mkdir -p ../../o | |
|
|
||
| cd temp | ||
|
|
||
| # FIX for libgdal on Monterey using sqlite 3.30.1 | ||
| # cd temp | ||
| # curl -L -O https://sqlite.org/2019/sqlite-autoconf-3300100.tar.gz | ||
| # tar -xvf sqlite-autoconf-3300100.tar.gz | ||
| # cd sqlite-autoconf-3300100 | ||
| # ./configure --enable-readline CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1" --prefix=/usr/local/opt/sqlite | ||
| # make | ||
| # make install | ||
| # cd .. | ||
| # cd .. | ||
| # Build CLAPACK | ||
| if ! [ -f "clapack.tgz" ]; then | ||
| curl -L -O https://github.com/GeoDaCenter/software/releases/download/v2000/clapack.tgz | ||
| tar -xf clapack.tgz | ||
| fi | ||
| if ! [ -f "CLAPACK-3.2.1/libf2c.a" ]; then | ||
| cp -rf ../dep/CLAPACK-3.2.1 . | ||
| cd CLAPACK-3.2.1 | ||
| make f2clib | ||
| make blaslib | ||
| cd INSTALL | ||
| make | ||
| cd .. | ||
| cd SRC | ||
| make | ||
| cd .. | ||
| cp F2CLIBS/libf2c.a . | ||
| cd .. | ||
| fi | ||
|
|
||
| # Build Boost 1.76 | ||
| if ! [ -f "boost_1_76_0.tar.bz2" ]; then | ||
| curl -L -O https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz | ||
| tar -xf boost_1_76_0.tar.gz | ||
| fi | ||
| if ! [ -f "../libraries/lib/libboost_thread.a" ]; then | ||
| cd boost_1_76_0 | ||
| ./bootstrap.sh | ||
| ./b2 --with-thread --with-date_time --with-chrono --with-system link=static threading=multi stage | ||
| cp -R stage/lib/* ../../libraries/lib/. | ||
| cp -R boost ../../libraries/include/. | ||
| cd .. | ||
| fi | ||
|
|
||
| # Build wxWidgets 3.2.4 | ||
| if ! [ -f "wxWidgets-3.2.4.tar.bz2" ]; then | ||
|
|
@@ -57,33 +84,13 @@ if ! [ -f "../libraries/lib/libjson_spirit.a" ]; then | |
| cp ../../dep/json_spirit/CMakeLists.txt . | ||
| mkdir -p bld | ||
| cd bld | ||
| cmake -DBoost_NO_BOOST_CMAKE=TRUE -DBOOST_ROOT:PATHNAME=/usr/local/opt .. | ||
| cmake -DBoost_NO_BOOST_CMAKE=TRUE -DBOOST_ROOT:PATHNAME=$GEODA_HOME/libraries/include .. | ||
| make -j $CPUS | ||
| cp -R ../json_spirit ../../../libraries/include/. | ||
| cp json_spirit/libjson_spirit.a ../../../libraries/lib/. | ||
| cd ../.. | ||
| fi | ||
|
|
||
| # Build CLAPACK | ||
| if ! [ -f "clapack.tgz" ]; then | ||
| curl -L -O https://github.com/GeoDaCenter/software/releases/download/v2000/clapack.tgz | ||
| tar -xf clapack.tgz | ||
| fi | ||
| if ! [ -f "CLAPACK-3.2.1/libf2c.a" ]; then | ||
| cp -rf ../dep/CLAPACK-3.2.1 . | ||
| cd CLAPACK-3.2.1 | ||
| make -j $CPUS f2clib | ||
| make -j $CPUS blaslib | ||
| cd INSTALL | ||
| make -j $CPUS | ||
| cd .. | ||
| cd SRC | ||
| make -j $CPUS | ||
| cd .. | ||
| cp F2CLIBS/libf2c.a . | ||
| cd .. | ||
| fi | ||
|
|
||
| # Build Eigen3 and Spectra | ||
| if ! [ -f "eigen3.zip" ]; then | ||
| curl -L -O https://github.com/GeoDaCenter/software/releases/download/v2000/eigen3.zip | ||
|
|
@@ -95,19 +102,4 @@ if ! [ -f "v0.8.0.zip" ]; then | |
| mv spectra-0.8.0 spectra | ||
| fi | ||
|
|
||
| cd .. | ||
| # Build GeoDa | ||
| # cp ../../GeoDamake.macosx.opt ../../GeoDamake.opt | ||
| # make -j $CPUS | ||
| # make app | ||
|
|
||
| # # Create dmg | ||
| # VER_MAJOR=$(grep version_major $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # VER_MINOR=$(grep version_minor $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # VER_BUILD=$(grep version_build $GEODA_HOME/../../version.h | sed -e 's/^[[:space:]][[:alpha:]|[:space:]|_|=]*//g' | sed -e 's/;//g') | ||
| # GEODA_VERSION=$VER_MAJOR.$VER_MINOR.$VER_BUILD | ||
| # echo $GEODA_VERSION | ||
|
|
||
| # cd create-dmg | ||
| # ./geoda.sh $GEODA_VERSION | ||
| # codesign --timestamp -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" -i edu.uchicago.spatial GeoDa$GEODA_VERSION-Installer.dmg | ||
| cd .. | ||
Oops, something went wrong.