From 56ce467b4287927fab0c83579e29e9f64dc51f29 Mon Sep 17 00:00:00 2001 From: lixun910 Date: Sun, 5 Mar 2017 18:20:23 -0600 Subject: [PATCH] update build scripts on CentOS; update drawing code to avoid black background on centos --- BuildTools/centos/GNUmakefile | 2 +- BuildTools/centos/build64.sh | 4 ++-- BuildTools/centos/create_rpm.sh | 6 +++++- BuildTools/centos/rpm_template/SPECS/GeoDa.spec | 8 +++++--- BuildTools/centos/rpmmacros | 3 +++ Explore/MapNewView.cpp | 4 ++-- GeoDamake.centos.opt | 2 +- ShapeOperations/GdaCache.cpp | 2 +- 8 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 BuildTools/centos/rpmmacros diff --git a/BuildTools/centos/GNUmakefile b/BuildTools/centos/GNUmakefile index 2d5feba8c..e33bb7c1d 100644 --- a/BuildTools/centos/GNUmakefile +++ b/BuildTools/centos/GNUmakefile @@ -56,7 +56,7 @@ build-geoda-mac: cp run.sh build/run.sh chmod +x build/run.sh cp GeoDa.desktop build/GeoDa.desktop - cp $(GeoDa_ROOT)/BuildTools/CommonDistFiles/cache.sqlite build/web_plugins/cache.sqlite + cp $(GeoDa_ROOT)/BuildTools/CommonDistFiles/cache.sqlite build/cache.sqlite cp -rf $(GeoDa_ROOT)/BuildTools/CommonDistFiles/web_plugins/* build/web_plugins/ cp $(GeoDa_ROOT)/BuildTools/CommonDistFiles/GeoDa.png build/GeoDa.png cp $(GeoDa_ROOT)/rc/data_viewer_dialogs.xrc build/Resources diff --git a/BuildTools/centos/build64.sh b/BuildTools/centos/build64.sh index 5bb43a4b5..1c3f2d62e 100755 --- a/BuildTools/centos/build64.sh +++ b/BuildTools/centos/build64.sh @@ -604,8 +604,8 @@ echo "% Building wxWidgets 3.0.2 %" echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%" # sudo apt-get install libgtk2.0-dev libglu1-mesa-dev libgl1-mesa-dev { - LIB_NAME=wxWidgets-3.0.2 - LIB_URL="https://dl.dropboxusercontent.com/u/145979/geoda_libraries/wxWidgets-3.0.2.tar.bz2" + LIB_NAME=wxWidgets-3.1.0 + LIB_URL="https://dl.dropboxusercontent.com/u/145979/geoda_libraries/wxWidgets-3.1.0.tar.bz2" LIB_FILENAME=$(basename "$LIB_URL" ".tar") LIB_CHECKER=wx-config diff --git a/BuildTools/centos/create_rpm.sh b/BuildTools/centos/create_rpm.sh index a09aca80d..8c1e26ff4 100755 --- a/BuildTools/centos/create_rpm.sh +++ b/BuildTools/centos/create_rpm.sh @@ -1,11 +1,15 @@ #!/bin/bash +rm *.rpm +cp rpmmacros ~/.rpmmacros rm -rf rpm/ cp -rf rpm_template/ rpm/ +mkdir rpm/SOURCES cp -rf build/ rpm/SOURCES/ mv rpm/SOURCES/build rpm/SOURCES/GeoDa-1.8 +rm -r rpm/SOURCES/GeoDa-1.8/web_plugins/d3 cd rpm/SOURCES/ tar czf geoda.tar.gz GeoDa-1.8/ cd .. rpmbuild -ba SPECS/GeoDa.spec - +mv RPMS/x86_64/*.rpm ../ diff --git a/BuildTools/centos/rpm_template/SPECS/GeoDa.spec b/BuildTools/centos/rpm_template/SPECS/GeoDa.spec index 6c3bb16c5..91cc5a54b 100644 --- a/BuildTools/centos/rpm_template/SPECS/GeoDa.spec +++ b/BuildTools/centos/rpm_template/SPECS/GeoDa.spec @@ -28,6 +28,7 @@ install -m 0766 -d $RPM_BUILD_ROOT/usr/local/GeoDa/plugins install -m 0766 -d $RPM_BUILD_ROOT/usr/local/GeoDa/gdaldata install -m 0766 -d $RPM_BUILD_ROOT/usr/local/GeoDa/web_plugins install -m 0755 run.sh $RPM_BUILD_ROOT/usr/local/GeoDa/run.sh +install -m 0755 cache.sqlite $RPM_BUILD_ROOT/usr/local/GeoDa/cache.sqlite install -m 0755 GeoDa $RPM_BUILD_ROOT/usr/local/GeoDa/GeoDa install -m 0755 GeoDa.png $RPM_BUILD_ROOT/usr/local/GeoDa/GeoDa.png install -m 0755 Resources/* $RPM_BUILD_ROOT/usr/local/GeoDa/Resources/ @@ -45,9 +46,10 @@ install -m 0755 GeoDa.desktop $RPM_BUILD_ROOT/usr/share/applications/GeoDa.deskt /usr/local/GeoDa/Resources/* /usr/local/GeoDa/plugins/* /usr/local/GeoDa/gdaldata/* -%attr(0767, root, root) /usr/local/GeoDa/basemap_cache/ -%attr(0767, root, root) /usr/local/GeoDa/web_plugins/ -%attr(0767, root, root) /usr/local/GeoDa/web_plugins/cache.sqlite +/usr/local/GeoDa/web_plugins/* +%attr(0767, -, -) /usr/local/GeoDa/basemap_cache/ +%attr(0767, -, -) /usr/local/GeoDa/web_plugins/ +%attr(0767, -, -) /usr/local/GeoDa/cache.sqlite %doc diff --git a/BuildTools/centos/rpmmacros b/BuildTools/centos/rpmmacros new file mode 100644 index 000000000..6c9d1a24d --- /dev/null +++ b/BuildTools/centos/rpmmacros @@ -0,0 +1,3 @@ +%packager xunli +%_topdir /home/xun/geoda_trunk/BuildTools/centos/rpm +%_tmppaath /home/xun/geoda_trunk/BuildTools/centos/rpm/tmp diff --git a/Explore/MapNewView.cpp b/Explore/MapNewView.cpp index 0e627143e..9f052ce69 100644 --- a/Explore/MapNewView.cpp +++ b/Explore/MapNewView.cpp @@ -589,7 +589,7 @@ void MapCanvas::DrawLayer1() { alpha[i] = 0; } else { - alpha[i] = alpha_value; + if (alpha[i] !=0 ) alpha[i] = alpha_value; } } @@ -641,7 +641,7 @@ void MapCanvas::DrawLayer1() { alpha_vals[i] = 0; } else { - alpha_vals[i] = hl_alpha_value; + if (alpha_vals[i] !=0) alpha_vals[i] = hl_alpha_value; } } diff --git a/GeoDamake.centos.opt b/GeoDamake.centos.opt index 68d39594e..c70c8de71 100644 --- a/GeoDamake.centos.opt +++ b/GeoDamake.centos.opt @@ -19,7 +19,7 @@ LIBS = $(WXLIBS) \ $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \ $(GEODA_HOME)/libraries/lib/libjson_spirit.a \ -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl -lcares \ - -L/lib64 -lGL -lGLU -lidn -lrt -lssl -lidn + -L/lib64 -lGL -lGLU -lidn -lrt -lssl -lidn -lwebkitgtk-3.0 BOOST_HEADER = -I$(GEODA_HOME)/libraries/include/boost diff --git a/ShapeOperations/GdaCache.cpp b/ShapeOperations/GdaCache.cpp index 5f9f9a0d5..5599e171f 100644 --- a/ShapeOperations/GdaCache.cpp +++ b/ShapeOperations/GdaCache.cpp @@ -24,7 +24,7 @@ wxString GdaCache::GetFullPath() wxString exePath = wxStandardPaths::Get().GetExecutablePath(); wxFileName exeFile(exePath); wxString exeDir = exeFile.GetPathWithSep(); - exeDir = exeDir + wxFileName::GetPathSeparator() + "cache.sqlite"; + exeDir = exeDir + "cache.sqlite"; return exeDir; }