-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1977 from lixun910/fix_201
for 1.14.0.2
- Loading branch information
Showing
22 changed files
with
7,318 additions
and
509 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
#!/bin/bash | ||
|
||
|
||
if ! [ -d build ]; then | ||
echo "Please run build.sh to build GeoDa executable file first." | ||
exit | ||
fi | ||
|
||
if ! [ -f build/GeoDa ]; then | ||
echo "Please run build.sh to build GeoDa executable file first." | ||
exit | ||
fi | ||
|
||
|
||
rm -rf product | ||
if [ $# -ne 1 ]; then | ||
cp -rf package product | ||
else | ||
cp -rf package_$1 product | ||
fi | ||
|
||
chmod +x product/DEBIAN/postinst | ||
mkdir product/usr/local | ||
mkdir product/usr/bin | ||
mkdir product/usr/local/geoda | ||
cp -rf build/* product/usr/local/geoda/ | ||
cp run_geoda.sh product/usr/bin/ | ||
|
||
cd product | ||
find . -name .svn |xargs rm -rf | ||
cd .. | ||
|
||
MACHINE_TYPE=`uname -m` | ||
if [ $MACHINE_TYPE == 'x86_64' ]; then | ||
# 64-bit platform | ||
rm product/DEBIAN/control | ||
mv product/DEBIAN/control_disco product/DEBIAN/control | ||
fi | ||
|
||
rm -f *.deb | ||
if [ $# -ne 1 ]; then | ||
dpkg -b product/ geoda_1.14-1disco1_amd64.deb | ||
else | ||
dpkg -b product/ geoda_1.14-1$1.deb | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
Package: geoda | ||
Version: 1.14-1disco1 | ||
Architecture: amd64 | ||
Priority: optional | ||
Section: graphics | ||
Installed-Size: 121795 | ||
Depends: zlib1g, libexpat1, freeglut3, libreadline8, libgtk-3-0, libssl1.1, libwebkit2gtk-4.0-37 | ||
Maintainer: Luc Anselin < [email protected] > | ||
Provides: geoda | ||
Homepage: http://spatial.uchicago.edu | ||
Description: GeoDa Software | ||
GeoDa Software for Geospatial Analysis and Computation | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
GeoDa_ROOT = $(GEODA_HOME)/../.. | ||
|
||
TARGET = GeoDa | ||
|
||
CC = /usr/bin/gcc | ||
CXX = /usr/bin/g++ | ||
LD = /usr/bin/g++ | ||
RM = /bin/rm -f | ||
|
||
WXLIBS = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,webview,qa,adv,core,xml,net,base) | ||
WX_HEADER = $(shell $(GEODA_HOME)/libraries/bin/wx-config --cppflags) | ||
|
||
LIBS = $(WXLIBS) \ | ||
$(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \ | ||
$(GEODA_HOME)/temp/CLAPACK-3.2.1/libf2c.a \ | ||
$(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \ | ||
$(GEODA_HOME)/temp/CLAPACK-3.2.1/tmglib.a \ | ||
$(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_date_time.a \ | ||
$(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_thread.a \ | ||
$(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \ | ||
$(GEODA_HOME)/libraries/lib/libjson_spirit.a \ | ||
-L$(GEODA_HOME)/libraries/lib -lgdal -lcurl -L/usr/lib/x86_64-linux-gnu -lz -lwebkit2gtk-4.0 -lEGL | ||
# Note: Library -lrtmp causes a missing library problem at runtime on | ||
# Ubuntu 14.10 and later. | ||
|
||
BOOST_HEADER = -I$(GEODA_HOME)/libraries/include/boost | ||
|
||
EIGEN_HEADER = -I$(GEODA_HOME)/libraries/include/eigen3 | ||
|
||
GDAL_HEADER = -I$(GEODA_HOME)/libraries/include | ||
|
||
CPPFLAGS = -I$(GeoDa_ROOT) -std=c++98 | ||
CFLAGS = -O2 -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER) $(EIGEN_HEADER) | ||
CXXFLAGS = -O2 $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER) $(EIGEN_HEADER) | ||
LDFLAGS = | ||
|
||
OBJ_EXT = o | ||
|
||
# | ||
# generic library rules | ||
# | ||
|
||
# | ||
# gdal and ogr low level drivers use the following default rules in order to | ||
# populate the ../o/ directory with all object and library object files | ||
# | ||
|
||
O_OBJ = $(foreach file,$(OBJ),../o/$(file)) | ||
T_OBJ = $(foreach file,$(OBJ),o/$(file)) | ||
|
||
../o/%.$(OBJ_EXT): %.c | ||
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
../o/%.$(OBJ_EXT): %.cpp | ||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
o/%.$(OBJ_EXT): %.c | ||
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
o/%.$(OBJ_EXT): %.cpp | ||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
%.$(OBJ_EXT): %.c | ||
$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
%.$(OBJ_EXT): %.cpp | ||
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $< | ||
|
||
# | ||
# default rules for handling subdirectories | ||
# | ||
|
||
%-target: | ||
$(MAKE) -C $* | ||
|
||
%-clean: | ||
$(MAKE) -C $* clean |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Oops, something went wrong.