Merge pull request #1939 from lixun910/fix_201

GeoDa 1.14 pull request
GeoDaCenter · Aug 25, 2019 · baef79a · baef79a
2 parents dee1592 + 6e243ec
commit baef79a
Show file tree

Hide file tree

Showing 101 changed files with 11,592 additions and 9,562 deletions.
diff --git a/.gitignore b/.gitignore
@@ -108,3 +108,5 @@ internationalization/.vscode/launch.json
 internationalization/pofiles/new_zh_CN.mo
 internationalization/.vscode/settings.json
 internationalization/~$zh_CN.xlsx
+
+GeoDamake.opt
diff --git a/Algorithms/redcap.cpp b/Algorithms/redcap.cpp
@@ -375,7 +375,7 @@ bool Tree::checkControl(vector<int>& cand_ids, vector<int>& ids, int flag)
         }
     }
 
-    return val > control_thres;
+    return val >= control_thres;
 }
 
 pair<Tree*, Tree*> Tree::GetSubTrees()

diff --git a/BuildTools/CommonDistFiles/cache.sqlite b/BuildTools/CommonDistFiles/cache.sqlite
diff --git a/BuildTools/macosx/GeoDa-GDAL-Info.plist b/BuildTools/macosx/GeoDa-GDAL-Info.plist
@@ -15,15 +15,17 @@
 	<key>CFBundleIconFile</key>
 	<string>GeoDa.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>edu.asu.geodacenter.GeoDa</string>
+	<string>edu.uchicago.spatial</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>io.gitub.geodacenter</string>
 	<key>CFBundleVersion</key>
-	<string>1.12</string>
+	<string>1.14</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.14</string>
 	<key>DTCompiler</key>
 	<string>4.2</string>
 	<key>DTPlatformBuild</key>

diff --git a/BuildTools/ubuntu/GNUmakefile b/BuildTools/ubuntu/GNUmakefile
@@ -6,7 +6,7 @@ include ../../GeoDamake.opt
 
 GeoDa_OBJ = $(wildcard $(GeoDa_ROOT)/o/*.o)
 
-default:	compile-geoda 
+default:	compile-geoda
 
 app:  build-geoda
 
@@ -90,14 +90,14 @@ build-geoda:
 	cp $(GEODA_HOME)/libraries/lib/libspatialite.so.5.0.1 build/plugins/libspatialite.so.5
 	cp $(GEODA_HOME)/libraries/lib/libfreexl.so.1.0.0 build/plugins/libfreexl.so.1
 	cp $(GEODA_HOME)/libraries/lib/libproj.so.0.7.0 build/plugins/libproj.so.0
-	cp $(GEODA_HOME)/libraries/lib/libgeos_c.so.1.7.8 build/plugins/libgeos_c.so.1
+	cp $(GEODA_HOME)/libraries/lib/libgeos_c.so.1.10.2 build/plugins/libgeos_c.so.1
 	cp $(GEODA_HOME)/libraries/lib/libsqlite3.so.0.8.6 build/plugins/libsqlite3.so.0
 	cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.0 build/plugins/libiconv.so.2
 	chmod +x build/plugins/libiconv.so.2
 	cp $(GEODA_HOME)/libraries/lib/libminizip.so.0.0.0 build/plugins/libminizip.so.0
 	cp $(GEODA_HOME)/libraries/lib/liburiparser.so.1.0.5 build/plugins/liburiparser.so.1
-	cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/libgeos-3.3.8.so
-	cp $(GEODA_HOME)/libraries/lib/libcurl.so.4.4.0 build/plugins/libcurl.so.4
+	cp $(GEODA_HOME)/libraries/lib/libgeos-3.6.2.so build/plugins/libgeos-3.6.2.so
+	cp $(GEODA_HOME)/libraries/lib/libcurl.so.4.5.0 build/plugins/libcurl.so.4
 	cp $(GEODA_HOME)/libraries/lib/libcares.so.2.1.0 build/plugins/libcares.so.2
 	cp $(GEODA_HOME)/libraries/share/gdal/* build/gdaldata
 	cp $(GEODA_HOME)/../CommonDistFiles/cache.sqlite build/cache.sqlite

diff --git a/BuildTools/ubuntu/build64.sh b/BuildTools/ubuntu/build64.sh
@@ -34,7 +34,7 @@ echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     sudo apt-get update
     sudo apt-get install g++ libssl-dev libreadline6-dev zlib1g-dev libexpat1-dev dh-autoreconf libcurl4-openssl-dev libgtk-3-dev libwebkit-dev mesa-common-dev freeglut3-dev libglu1-mesa-dev libgl1-mesa-dev libgtk2.0-dev
-# for 14.10, experimenting with adding librtmp-dev, libidn11-dev and libldap-dev
+    sudo apt-get install librtmp-dev libidn11-dev libldap-dev 
 fi
 
 unset ORACLE_HOME
@@ -141,35 +141,7 @@ install_library c-ares-1.10.0 http://c-ares.haxx.se/download/c-ares-1.10.0.tar.g
 #########################################################################
 # install cURL
 #########################################################################
-
-LIB_NAME=curl-7.46.0
-LIB_CHECKER=libcurl.a
-LIB_URL=https://s3.us-east-2.amazonaws.com/geodabuild/curl-7.46.0.zip
-LIB_FILENAME=curl-7.46.0.zip
-echo $LIB_NAME
-
-cd $DOWNLOAD_HOME
-
-if ! [ -d "$LIB_NAME" ] ; then
-    curl -O $LIB_URL
-    unzip $LIB_FILENAME
-fi
-
-if ! [ -d "$LIB_NAME" ]; then
-    tar -xf $LIB_FILENAME
-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 --without-librtmp
-    $MAKER
-    make install
-fi
-
-if ! [ -f "$PREFIX/lib/$LIB_CHECKER" ] ; then
-    echo "Error! Exit"
-    exit
-fi
+# libcurl4-openssl-dev is used instead
 
 #########################################################################
 # install Xerces