Skip to content

Commit

Permalink
Merge pull request 1.12.1.237 from lixun910/fix_201
Browse files Browse the repository at this point in the history 
1.12.1.237
  • Loading branch information
@lixun910
lixun910 committed May 16, 2019
2 parents b64313a + 7cb915c commit 5e1403a
Show file tree
Hide file tree
Showing 192 changed files with 44,275 additions and 17,791 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,8 @@ BuildTools/macosx/temp1/boost_1_57_0/b2
BuildTools/temp/CLAPACK-3.1.1-VisualStudio/BLAS/blas.vcproj
*.sqlite-journal
osm/
internationalization/.vscode/launch.json
*.swo
internationalization/pofiles/new_zh_CN.mo
internationalization/.vscode/settings.json
internationalization/~$zh_CN.xlsx
7 changes: 7 additions & 0 deletions BuildTools/macosx/GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ build-geoda-mac:
cp libraries/lib/libgeos-3.3.8.dylib build/GeoDa.app/Contents/Resources/plugins/
cp libraries/lib/libcurl.4.dylib build/GeoDa.app/Contents/Resources/plugins/
cp libraries/lib/libcares.2.dylib build/GeoDa.app/Contents/Resources/plugins/
cp /usr/local/opt/openssl/lib/libssl.1.0.0.dylib build/GeoDa.app/Contents/Resources/plugins/
cp /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib build/GeoDa.app/Contents/Resources/plugins/
chmod +w build/GeoDa.app/Contents/Resources/plugins/libssl.1.0.0.dylib
chmod +w build/GeoDa.app/Contents/Resources/plugins/libcrypto.1.0.0.dylib
#cp libraries/lib/libmysqlclient.18.dylib build/GeoDa.app/Contents/Resources/plugins/
cp plugins/ogr_OCI.so build/GeoDa.app/Contents/Resources/plugins/ogr_OCI.so
cp plugins/ogr_FileGDB.so build/GeoDa.app/Contents/Resources/plugins/ogr_FileGDB.so
Expand All @@ -132,6 +136,9 @@ build-geoda-mac:
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libcurl.4.dylib" "@executable_path/../Resources/plugins/libcurl.4.dylib" build/GeoDa.app/Contents/Resources/plugins/libgdal.20.dylib
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libcares.2.dylib" "@executable_path/../Resources/plugins/libcares.2.dylib" build/GeoDa.app/Contents/Resources/plugins/libgdal.20.dylib
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libcares.2.dylib" "@executable_path/../Resources/plugins/libcares.2.dylib" build/GeoDa.app/Contents/Resources/plugins/libcurl.4.dylib
install_name_tool -change "/usr/local/opt/openssl/lib/libssl.1.0.0.dylib" "@executable_path/../Resources/plugins/libssl.1.0.0.dylib" build/GeoDa.app/Contents/Resources/plugins/libcurl.4.dylib
install_name_tool -change "/usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib" "@executable_path/../Resources/plugins/libcrypto.1.0.0.dylib" build/GeoDa.app/Contents/Resources/plugins/libcurl.4.dylib
install_name_tool -change "/usr/local/Cellar/openssl/1.0.2q/lib/libcrypto.1.0.0.dylib" "@executable_path/../Resources/plugins/libcrypto.1.0.0.dylib" build/GeoDa.app/Contents/Resources/plugins/libssl.1.0.0.dylib
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libcares.2.dylib" "@executable_path/../Resources/plugins/libcares.2.dylib" build/GeoDa.app/Contents/Resources/plugins/libxerces-c-3.1.dylib
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libkmlengine.0.dylib" "@executable_path/../Resources/plugins/libkmlengine.0.dylib" build/GeoDa.app/Contents/Resources/plugins/libkmlengine.0.dylib
install_name_tool -change "$(GEODA_HOME)/libraries/lib/libkmlbase.0.dylib" "@executable_path/../Resources/plugins/libkmlbase.0.dylib" build/GeoDa.app/Contents/Resources/plugins/libkmlengine.0.dylib
Expand Down
24 changes: 24 additions & 0 deletions BuildTools/macosx/GeoDa.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
A14735BC21A65F1800CA69B2 /* brute.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14735B321A65F1700CA69B2 /* brute.cpp */; };
A14C496F1D76174000D9831C /* CsvFieldConfDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14C496D1D76174000D9831C /* CsvFieldConfDlg.cpp */; };
A16BA470183D626200D3B7DA /* DatasourceDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A16BA46E183D626200D3B7DA /* DatasourceDlg.cpp */; };
A178F773227381CB00EB9CB7 /* DissolveDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A178F772227381CB00EB9CB7 /* DissolveDlg.cpp */; };
A178F776227772FD00EB9CB7 /* GdaListBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A178F774227772FC00EB9CB7 /* GdaListBox.cpp */; };
A178F779227773C500EB9CB7 /* GdaChoice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A178F777227773C500EB9CB7 /* GdaChoice.cpp */; };
A186F0A11C16508A00AEBA13 /* GdaCartoDB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A186F09F1C16508A00AEBA13 /* GdaCartoDB.cpp */; };
A1894C3F213F29DC00718FFC /* SpatialJoinDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1894C3D213F29DC00718FFC /* SpatialJoinDlg.cpp */; };
A19483932118BAAA009A87A2 /* composit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A194837A2118BAA7009A87A2 /* composit.cpp */; };
Expand Down Expand Up @@ -125,6 +128,7 @@
A4A763F41F69FB3B00EE79DD /* ColocationMapView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4A763F21F69FB3B00EE79DD /* ColocationMapView.cpp */; };
A4B1F994207730FA00905246 /* matlab_mat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4B1F992207730FA00905246 /* matlab_mat.cpp */; };
A4C4ABFB1F97DA2D00085D47 /* MLJCMapNewView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4C4ABF91F97DA2D00085D47 /* MLJCMapNewView.cpp */; };
A4C76B0E225BC4BB00A0729A /* GroupingMapView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4C76B0D225BC4BB00A0729A /* GroupingMapView.cpp */; };
A4D5423D1F45037B00572878 /* redcap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A4D5423B1F45037B00572878 /* redcap.cpp */; };
A4D9A31F1E4D5F3800EF584C /* gdaldata in Resources */ = {isa = PBXBuildFile; fileRef = A4D9A31E1E4D5F3800EF584C /* gdaldata */; };
A4DB2CBC1EEA3A3E00BD4A54 /* Guerry.png in Resources */ = {isa = PBXBuildFile; fileRef = A4DB2CBB1EEA3A3E00BD4A54 /* Guerry.png */; };
Expand Down Expand Up @@ -351,6 +355,12 @@
A16BA46F183D626200D3B7DA /* DatasourceDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatasourceDlg.h; sourceTree = "<group>"; };
A171FBFE1792332A000DD5A0 /* GdaException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GdaException.h; sourceTree = "<group>"; };
A17336821C06917B00579354 /* WeightsManInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WeightsManInterface.h; path = VarCalc/WeightsManInterface.h; sourceTree = "<group>"; };
A178F771227381CA00EB9CB7 /* DissolveDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DissolveDlg.h; sourceTree = "<group>"; };
A178F772227381CB00EB9CB7 /* DissolveDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DissolveDlg.cpp; sourceTree = "<group>"; };
A178F774227772FC00EB9CB7 /* GdaListBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GdaListBox.cpp; sourceTree = "<group>"; };
A178F775227772FC00EB9CB7 /* GdaListBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GdaListBox.h; sourceTree = "<group>"; };
A178F777227773C500EB9CB7 /* GdaChoice.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GdaChoice.cpp; sourceTree = "<group>"; };
A178F778227773C500EB9CB7 /* GdaChoice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GdaChoice.h; sourceTree = "<group>"; };
A186F09F1C16508A00AEBA13 /* GdaCartoDB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GdaCartoDB.cpp; sourceTree = "<group>"; };
A186F0A01C16508A00AEBA13 /* GdaCartoDB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GdaCartoDB.h; sourceTree = "<group>"; };
A1894C3D213F29DC00718FFC /* SpatialJoinDlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SpatialJoinDlg.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -520,6 +530,8 @@
A4B1F99620783CC100905246 /* weights_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = weights_interface.h; path = io/weights_interface.h; sourceTree = "<group>"; };
A4C4ABF91F97DA2D00085D47 /* MLJCMapNewView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MLJCMapNewView.cpp; sourceTree = "<group>"; };
A4C4ABFA1F97DA2D00085D47 /* MLJCMapNewView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLJCMapNewView.h; sourceTree = "<group>"; };
A4C76B0C225BC4BA00A0729A /* GroupingMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupingMapView.h; sourceTree = "<group>"; };
A4C76B0D225BC4BB00A0729A /* GroupingMapView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupingMapView.cpp; sourceTree = "<group>"; };
A4D5423B1F45037B00572878 /* redcap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = redcap.cpp; path = Algorithms/redcap.cpp; sourceTree = "<group>"; };
A4D5423C1F45037B00572878 /* redcap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = redcap.h; path = Algorithms/redcap.h; sourceTree = "<group>"; };
A4D9A31E1E4D5F3800EF584C /* gdaldata */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gdaldata; path = BuildTools/CommonDistFiles/gdaldata; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1220,6 +1232,12 @@
DD7974FE0F1D296F00496A84 /* DialogTools */ = {
isa = PBXGroup;
children = (
A178F777227773C500EB9CB7 /* GdaChoice.cpp */,
A178F778227773C500EB9CB7 /* GdaChoice.h */,
A178F774227772FC00EB9CB7 /* GdaListBox.cpp */,
A178F775227772FC00EB9CB7 /* GdaListBox.h */,
A178F772227381CB00EB9CB7 /* DissolveDlg.cpp */,
A178F771227381CA00EB9CB7 /* DissolveDlg.h */,
A11EF98D21ED569A00B77413 /* MultiVarSettingsDlg.cpp */,
A11EF98C21ED569A00B77413 /* MultiVarSettingsDlg.h */,
A4ED7D59209A6B81008685D6 /* HDBScanDlg.cpp */,
Expand Down Expand Up @@ -1357,6 +1375,8 @@
DD7975B70F1D2A9000496A84 /* Explore */ = {
isa = PBXGroup;
children = (
A4C76B0D225BC4BB00A0729A /* GroupingMapView.cpp */,
A4C76B0C225BC4BA00A0729A /* GroupingMapView.h */,
A4596B502033DDFF00C9BCC8 /* AbstractClusterMap.cpp */,
A4596B4F2033DDFF00C9BCC8 /* AbstractClusterMap.h */,
A4596B4D2033DB8E00C9BCC8 /* AbstractCoordinator.cpp */,
Expand Down Expand Up @@ -1775,6 +1795,7 @@
DD7976BD0F1D2CA800496A84 /* ML_im.cpp in Sources */,
DD7976BE0F1D2CA800496A84 /* PowerLag.cpp in Sources */,
A414C88B207BED2700520546 /* MatfileReader.cpp in Sources */,
A178F776227772FD00EB9CB7 /* GdaListBox.cpp in Sources */,
DD7976BF0F1D2CA800496A84 /* PowerSymLag.cpp in Sources */,
DD7976C10F1D2CA800496A84 /* smile2.cpp in Sources */,
DD7976C20F1D2CA800496A84 /* SparseMatrix.cpp in Sources */,
Expand All @@ -1788,6 +1809,7 @@
DD27ECBC0F2E43B5009C5C42 /* GenUtils.cpp in Sources */,
DDD13F060F2F8BE1009F7F13 /* GenGeomAlgs.cpp in Sources */,
A42018031FB3C0AC0029709C /* skater.cpp in Sources */,
A178F773227381CB00EB9CB7 /* DissolveDlg.cpp in Sources */,
A186F0A11C16508A00AEBA13 /* GdaCartoDB.cpp in Sources */,
A1B13EE31C3EDFF90064AD87 /* BasemapConfDlg.cpp in Sources */,
A1EBC88F1CD2B2FD001DCFE9 /* AutoUpdateDlg.cpp in Sources */,
Expand All @@ -1804,6 +1826,7 @@
A1AC05BF1C8645F300B6FE5F /* AdjustYAxisDlg.cpp in Sources */,
A194839A2118BAAA009A87A2 /* lines.cpp in Sources */,
DDD593C712E9F90000F7A7C4 /* GalWeight.cpp in Sources */,
A4C76B0E225BC4BB00A0729A /* GroupingMapView.cpp in Sources */,
DDD593CA12E9F90C00F7A7C4 /* GwtWeight.cpp in Sources */,
DD694685130307C00072386B /* RateSmoothing.cpp in Sources */,
A4E00F1020FD8ECD0038BA80 /* localjc_kernel.cl in Sources */,
Expand Down Expand Up @@ -1928,6 +1951,7 @@
DDA4F0AD196315AF007645E2 /* WeightUtils.cpp in Sources */,
DD817EA819676AF100228B0A /* WeightsManState.cpp in Sources */,
DD8183C3197054CA00228B0A /* WeightsMapCanvas.cpp in Sources */,
A178F779227773C500EB9CB7 /* GdaChoice.cpp in Sources */,
DD8183C81970619800228B0A /* WeightsManDlg.cpp in Sources */,
A47614AE20759EAD00D9F3BE /* arcgis_swm.cpp in Sources */,
A14735BC21A65F1800CA69B2 /* brute.cpp in Sources */,
Expand Down
3 changes: 2 additions & 1 deletion BuildTools/macosx/build10.7.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ fi

if ! [ -f "$PREFIX/lib/$LIB_CHECKER" ] ; then
cd $LIB_NAME
./configure --enable-ares=$PREFIX CC="$GDA_CC" CFLAGS="$GDA_CFLAGS" CXX="$GDA_CXX" CXXFLAGS="$GDA_CXXFLAGS" LDFLAGS="$GDA_LDFLAGS" --prefix=$PREFIX
#./configure --enable-static --enable-ares=$PREFIX --with-ssl=/usr/local/etc/openssl --disable-ldap --disable-ldaps --disable-shared CC="$GDA_CC" CFLAGS="$GDA_CFLAGS" CXX="$GDA_CXX" CXXFLAGS="$GDA_CXXFLAGS" LDFLAGS="$GDA_LDFLAGS" --prefix=$PREFIX
./configure --with-ssl=/usr/local/opt/openssl --disable-ldap --disable-ldaps LDFLAGS="-L/usr/local/opt/openssl/lib -L/usr/lib" CPPFLAGS="-I/usr/local/opt/openssl/include -mmacosx-version-min=10.7" --without-brotli --prefix=$PREFIX
$MAKER
make install
fi
Expand Down
Loading

0 comments on commit 5e1403a

Please sign in to comment.