[Data] Update sample dataset (#2513)

* Update samples.sqlite * update gdal version in build script macosx * Update version.h * Update create-dmg
GeoDaCenter · Jan 17, 2025 · fcdf81d · fcdf81d
1 parent 8d4db84
commit fcdf81d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/BuildTools/CommonDistFiles/web_plugins/samples.sqlite b/BuildTools/CommonDistFiles/web_plugins/samples.sqlite
diff --git a/BuildTools/macosx/GNUmakefile b/BuildTools/macosx/GNUmakefile
@@ -114,12 +114,12 @@ build-geoda-mac:
 	cp /usr/local/opt/proj/share/proj/world build/GeoDa.app/Contents/Resources/proj
 	cp libraries/lib/libwx_osx_cocoau-3.2.0.3.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau-3.2.dylib
 	cp libraries/lib/libwx_osx_cocoau_gl-3.2.0.3.0.dylib build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
-	cp /usr/local/opt/gdal/lib/libgdal.35.dylib build/GeoDa.app/Contents/Frameworks
+	cp /usr/local/opt/gdal/lib/libgdal.36.dylib build/GeoDa.app/Contents/Frameworks
 	install_name_tool -id "GeoDa" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau_gl-3.2.0.3.0.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau_gl-3.2.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	install_name_tool -change "$(GEODA_HOME)/libraries/lib/libwx_osx_cocoau-3.2.0.3.0.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
-	install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.35.dylib" "@executable_path/../Frameworks/libgdal.35.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
-	install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.35.dylib" "@executable_path/../Frameworks/libgdal.35.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
+	install_name_tool -change "/usr/local/opt/gdal/lib/libgdal.36.dylib" "@executable_path/../Frameworks/libgdal.36.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
+	install_name_tool -change "/opt/homebrew/opt/gdal/lib/libgdal.36.dylib" "@executable_path/../Frameworks/libgdal.36.dylib" build/GeoDa.app/Contents/MacOS/GeoDa
 	python3 install_name.py $(GEODA_HOME)/build/GeoDa.app/Contents/Frameworks "Developer ID Application: Geodapress LLC (26M5NG43GP)"
 	install_name_tool -change "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.0.3.0.dylib" "@executable_path/../Frameworks/libwx_osx_cocoau-3.2.dylib" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib
 	codesign -f --timestamp -o runtime -s "Developer ID Application: Geodapress LLC (26M5NG43GP)" build/GeoDa.app/Contents/Frameworks/libwx_osx_cocoau_gl-3.2.dylib

diff --git a/BuildTools/macosx/create-dmg/create-dmg b/BuildTools/macosx/create-dmg/create-dmg
@@ -208,7 +208,24 @@ fi
 
 # unmount
 echo "Unmounting disk image..."
-hdiutil detach "${DEV_NAME}"
+# Add retry logic for unmounting
+MAX_ATTEMPTS=5
+ATTEMPT=1
+while [ $ATTEMPT -le $MAX_ATTEMPTS ]; do
+    if hdiutil detach "${DEV_NAME}" 2>/dev/null; then
+        echo "Disk image successfully unmounted"
+        break
+    else
+        echo "Attempt $ATTEMPT of $MAX_ATTEMPTS: Failed to unmount disk image, retrying in 2 seconds..."
+        sleep 2
+        ATTEMPT=$((ATTEMPT + 1))
+    fi
+done
+
+if [ $ATTEMPT -gt $MAX_ATTEMPTS ]; then
+    echo "Failed to unmount disk image after $MAX_ATTEMPTS attempts"
+    exit 1
+fi
 
 # compress image
 echo "Compressing disk image..."

diff --git a/BuildTools/macosx/install_name.py b/BuildTools/macosx/install_name.py
@@ -79,4 +79,4 @@ def process_dependency(framework_path, dylib_name):
 
 process_dependency(FRAMEWORK_PATH, "libwx_osx_cocoau_gl-3.2.dylib")
 process_dependency(FRAMEWORK_PATH, "libwx_osx_cocoau-3.2.dylib")
-process_dependency(FRAMEWORK_PATH, "libgdal.35.dylib")
+process_dependency(FRAMEWORK_PATH, "libgdal.36.dylib")
diff --git a/version.h b/version.h
@@ -2,10 +2,10 @@ namespace Gda {
     const int version_major = 1;
     const int version_minor = 22;
     const int version_build = 0;
-    const int version_subbuild = 10;
-    const int version_year = 2024;
-    const int version_month = 10;
-    const int version_day = 8;
+    const int version_subbuild = 12;
+    const int version_year = 2025;
+    const int version_month = 1;
+    const int version_day = 15;
     const int version_night = 0;
     const int version_type = 2; // 0: alpha, 1: beta, 2: release
 } // namespace Gda