You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sv...@apache.org on 2016/02/25 19:30:29 UTC
[7/8] incubator-trafodion git commit: [TRAFODION-1514] Stop using
custom suffix (Nv44) of ICU libs
[TRAFODION-1514] Stop using custom suffix (Nv44) of ICU libs
Merged work from RuoYu's pull request, and changed name of ICU
directory, to allow different paths for old/new versions of code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fe5f8252
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fe5f8252
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fe5f8252
Branch: refs/heads/master
Commit: fe5f8252a8f1bf7e3fe687145c6c8988e7f7f0be
Parents: a3ae263 9aafdfc
Author: Steve Varnau <st...@esgyn.com>
Authored: Tue Feb 23 21:48:20 2016 +0000
Committer: Steve Varnau <st...@esgyn.com>
Committed: Tue Feb 23 21:48:20 2016 +0000
----------------------------------------------------------------------
.../odbc/odbcclient/unixcli/makefile.lnx | 2 +-
.../odbc/odbcclient/unixcli/package/mklnxpkg.sh | 4 ++--
.../unixcli/package/trafodbclnx_install.sh | 22 ++++++++++----------
core/sqf/LocalSettingsTemplate.sh | 2 +-
core/sqf/sqenvcom.sh | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5f8252/core/conn/unixodbc/odbc/odbcclient/unixcli/package/mklnxpkg.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5f8252/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
----------------------------------------------------------------------
diff --cc core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
index 039d425,3762e97..4fa5f09
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/package/trafodbclnx_install.sh
@@@ -40,7 -40,7 +40,7 @@@ ETC_DIR
#INCLUDE_DIR=
SAMPLE_DIR=
#package files, excluding this file
- pkgfiles=(libtrafodbc_l64.so TRAFDSN MD5SUM connect_test.cpp license.txt libicuucNv44.so.44 libicudataNv44.so.44)
-pkgfiles=(libtrafodbc_l64.so TRAFDSN MD5SUM LICENSE connect_test.cpp license.txt libicuuc.so.44 libicudata.so.44)
++pkgfiles=(libtrafodbc_l64.so TRAFDSN MD5SUM connect_test.cpp license.txt libicuuc.so.44 libicudata.so.44)
#check whether the package directory has all files (or this script is invoked form "PkgTmp" dir)
function check_package {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5f8252/core/sqf/LocalSettingsTemplate.sh
----------------------------------------------------------------------
diff --cc core/sqf/LocalSettingsTemplate.sh
index c88ff43,cf64fb2..b105fbf
--- a/core/sqf/LocalSettingsTemplate.sh
+++ b/core/sqf/LocalSettingsTemplate.sh
@@@ -56,7 -56,7 +56,7 @@@ TOOLSDIR="/opt/home/tools" # convenien
BISON="${TOOLSDIR}/bison_3_linux/bin/bison"
LLVM="${TOOLSDIR}/dest-llvm-3.2"
UDIS86="${TOOLSDIR}/udis86-1.7.2"
--ICU="${TOOLSDIR}/icu4.4"
++ICU="${TOOLSDIR}/icu4c_4.4"
MPICH_ROOT="$TOOLSDIR/dest-mpich-3.0.4"
ZOOKEEPER_DIR="$TOOLSDIR/zookeeper-3.4.5"
THRIFT_LIB_DIR="$TOOLSDIR/thrift-0.9.0/lib"
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fe5f8252/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --cc core/sqf/sqenvcom.sh
index f40ee6f,b9ff2d9..0425b7b
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@@ -777,20 -797,16 +777,20 @@@ export AR=a
export FLEX=flex
export CXX=g++
export MAVEN=mvn
-if [[ -z "$(which $MAVEN 2> /dev/null)" ]]; then
- export M2_HOME="${TOOLSDIR}/apache-maven-3.0.5"
- MAVEN="${M2_HOME}/bin/mvn"
-fi
# Non-standard or newer version tools
-export BISON="${TOOLSDIR}/bison_3_linux/bin/bison" # Need 1.3 version or later
-export LLVM="${TOOLSDIR}/dest-llvm-3.2"
-export UDIS86="${TOOLSDIR}/udis86-1.7.2"
-export ICU="${TOOLSDIR}/icu4.4"
+if [ -z $BISON ]; then
+ export BISON="${TOOLSDIR}/bison_3_linux/bin/bison" # Need 1.3 version or later
+fi
+if [ -z $LLVM ]; then
+ export LLVM="${TOOLSDIR}/dest-llvm-3.2"
+fi
+if [ -z $UDIS86 ]; then
+ export UDIS86="${TOOLSDIR}/udis86-1.7.2"
+fi
+if [ -z $ICU ]; then
- export ICU="${TOOLSDIR}/icu4.4"
++ export ICU="${TOOLSDIR}/icu4c_4.4"
+fi
#######################
# Developer Local over-rides (see sqf/LocalSettingsTemplate.sh)