Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Data] Update sample dataset #2513

Merged
merged 4 commits into from
Jan 17, 2025
Merged

[Data] Update sample dataset #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce41fa2
Update samples.sqlite
lixun910 Jan 14, 2025
ac99d89
update gdal version in build script macosx
lixun910 Jan 15, 2025
54ae1e3
Update version.h
lixun910 Jan 15, 2025
993259c
Update create-dmg
lixun910 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified BuildTools/CommonDistFiles/web_plugins/samples.sqlite
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions BuildTools/macosx/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 18 additions & 1 deletion BuildTools/macosx/create-dmg/create-dmg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
2 changes: 1 addition & 1 deletion BuildTools/macosx/install_name.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
8 changes: 4 additions & 4 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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