diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index 23d32dba..c5a4a660 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -29,9 +29,12 @@ jobs: fail-fast: true matrix: distro: + - 'ubuntu-24.04' - 'ubuntu-22.04' - 'ubuntu-20.04' include: + - distro: 'ubuntu-24.04' + pre: 'noble' - distro: 'ubuntu-22.04' pre: 'jammy' - distro: 'ubuntu-20.04' diff --git a/BuildTools/ubuntu/create_deb.sh b/BuildTools/ubuntu/create_deb.sh index 16d47a28..b1efab24 100755 --- a/BuildTools/ubuntu/create_deb.sh +++ b/BuildTools/ubuntu/create_deb.sh @@ -1,6 +1,5 @@ #!/bin/bash - if ! [ -d build ]; then echo "Please run build.sh to build GeoDa executable file first." exit @@ -19,7 +18,7 @@ if [[ $MACHINE_TYPE != 'x86_64' ]]; then fi if [[ $# -ne 2 ]]; then - echo "create_deb.sh focal|jammy 1.22" + echo "create_deb.sh focal|jammy|noble 1.22" exit fi diff --git a/BuildTools/ubuntu/install.sh b/BuildTools/ubuntu/install.sh index e1bd6f27..f7dc0bac 100755 --- a/BuildTools/ubuntu/install.sh +++ b/BuildTools/ubuntu/install.sh @@ -22,9 +22,7 @@ $APT install -y gdal-bin $APT install -y libgdal-dev $APT install -y unzip cmake dh-autoreconf libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev -if [ $OS = 'jammy' ] ; then - $APT install -y libwebkit2gtk-4.0-dev -elif [ $OS = 'focal' ] ; then +if [ $OS = 'jammy' ] || [ $OS = 'focal' ] || [ $OS = 'noble' ]; then $APT install -y libwebkit2gtk-4.0-dev else $APT install -y libwebkitgtk-3.0-dev diff --git a/BuildTools/ubuntu/package/DEBIAN/control_noble b/BuildTools/ubuntu/package/DEBIAN/control_noble new file mode 100644 index 00000000..ad765b2c --- /dev/null +++ b/BuildTools/ubuntu/package/DEBIAN/control_noble @@ -0,0 +1,13 @@ +Package: geoda +Version: 1.22-1noble1 +Architecture: amd64 +Priority: optional +Section: graphics +Installed-Size: 121795 +Depends: libgdal30, zlib1g, libexpat1, freeglut3, libreadline8, libgtk-3-0, libssl3, libwebkit2gtk-4.0-37 +Maintainer: Luc Anselin < anselin@uchicago.edu > +Provides: geoda +Homepage: http://spatial.uchicago.edu +Description: GeoDa Software + GeoDa Software for Geospatial Analysis and Computation + diff --git a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss index 08bfe243..5a3817d7 100644 --- a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss +++ b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss @@ -113,21 +113,6 @@ Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Internet Explorer\MAIN\FeatureControl\ ;Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\"; ValueType: String; ValueName: "{app}\GeoDa.exe"; ValueData: "RUNASADMIN"; Flags: uninsdeletekeyifempty uninsdeletevalue; MinVersion: 0,6.1 [Code] -function IsX64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paX64); -end; - -function IsIA64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64); -end; - -function IsOtherArch: Boolean; -begin - Result := not IsX64 and not IsIA64; -end; - function VCRedistNeedsInstall: Boolean; begin Result := not RegKeyExists(HKLM,'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{03d1453c-7d5c-479c-afea-8482f406e036}'); diff --git a/BuildTools/windows/installer/32bit/GeoDa.iss b/BuildTools/windows/installer/32bit/GeoDa.iss index 2a1a27d2..3bf83f4b 100644 --- a/BuildTools/windows/installer/32bit/GeoDa.iss +++ b/BuildTools/windows/installer/32bit/GeoDa.iss @@ -112,21 +112,6 @@ Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Internet Explorer\MAIN\FeatureControl\ ;Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\"; ValueType: String; ValueName: "{app}\GeoDa.exe"; ValueData: "RUNASADMIN"; Flags: uninsdeletekeyifempty uninsdeletevalue; MinVersion: 0,6.1 [Code] -function IsX64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paX64); -end; - -function IsIA64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64); -end; - -function IsOtherArch: Boolean; -begin - Result := not IsX64 and not IsIA64; -end; - function VCRedistNeedsInstall: Boolean; begin Result := not RegKeyExists(HKLM,'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{03d1453c-7d5c-479c-afea-8482f406e036}'); diff --git a/BuildTools/windows/installer/64bit/GeoDa-win7+.iss b/BuildTools/windows/installer/64bit/GeoDa-win7+.iss index e10f41ce..e3c006e9 100644 --- a/BuildTools/windows/installer/64bit/GeoDa-win7+.iss +++ b/BuildTools/windows/installer/64bit/GeoDa-win7+.iss @@ -132,16 +132,6 @@ begin Result := Is64BitInstallMode and (ProcessorArchitecture = paX64); end; -function IsIA64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64); -end; - -function IsOtherArch: Boolean; -begin - Result := not IsX64 and not IsIA64; -end; - function VCRedistNeedsInstall: Boolean; begin Result := not RegKeyExists(HKLM,'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X64'); diff --git a/BuildTools/windows/installer/64bit/GeoDa.iss b/BuildTools/windows/installer/64bit/GeoDa.iss index 2c208677..e2250b42 100644 --- a/BuildTools/windows/installer/64bit/GeoDa.iss +++ b/BuildTools/windows/installer/64bit/GeoDa.iss @@ -130,16 +130,6 @@ begin Result := Is64BitInstallMode and (ProcessorArchitecture = paX64); end; -function IsIA64: Boolean; -begin - Result := Is64BitInstallMode and (ProcessorArchitecture = paIA64); -end; - -function IsOtherArch: Boolean; -begin - Result := not IsX64 and not IsIA64; -end; - function VCRedistNeedsInstall: Boolean; begin Result := not RegKeyExists(HKLM,'SOFTWARE\WOW6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\X64');