trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [2/3] incubator-trafodion git commit: Trafodion-1513 -- build fixes
Date Fri, 09 Oct 2015 19:00:57 GMT
Trafodion-1513 -- build fixes

Fixed issues from previous delivery:
- simplified the TOOLSDIR check in sqenvcom.sh
- added back in support for QT_TOOLKIT, builds if package exists
- mentioned Hive regression will fail if TPC is not installed
- Fixed the INSTALL_TPC check
- If the tools directory does not exit in traf_tools_setup.sh, will ask
  if it should be created


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a7319df3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a7319df3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a7319df3

Branch: refs/heads/master
Commit: a7319df3648f4d93ce794660e5d21159dec4c229
Parents: e40f8f0
Author: Roberta Marton <roberta.marton@esgyn.com>
Authored: Fri Oct 9 00:55:58 2015 +0000
Committer: Roberta Marton <roberta.marton@esgyn.com>
Committed: Fri Oct 9 00:55:58 2015 +0000

----------------------------------------------------------------------
 core/sqf/sqenvcom.sh                            | 19 ++++++++++-------
 .../sql/scripts/install_hadoop_regr_test_env    |  1 +
 core/sqf/sql/scripts/install_local_hadoop       | 22 ++++++++++----------
 install/traf_tools_setup.sh                     | 21 +++++++++++++++----
 4 files changed, 41 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7319df3/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index 481c403..b9ff2d9 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -97,16 +97,14 @@ export MAKEFLAGS="-j$cpucnt"
 
 # For now set up the TOOLSDIR, it may be overwritten later when the
 # .trafodion configuration file is loaded.
-if [[ -n "$CLUSTERNAME" ]]; then
-  if [ -z "$TOOLSDIR" ]; then
+if [ -z "$TOOLSDIR" ]; then
+  if [[ -n "$CLUSTERNAME" ]]; then
     export TOOLSDIR=${TOOLSDIR:-/home/tools}
-  fi
-  export MY_UDR_ROOT=/home/udr
-else
-  if [ -z "$TOOLSDIR" ]; then
+    export MY_UDR_ROOT=/home/udr
+  else
     export TOOLSDIR=${TOOLSDIR:-/opt/home/tools}
+    export MY_UDR_ROOT=$PWD
   fi
-  export MY_UDR_ROOT=$PWD
 fi
 
 
@@ -661,6 +659,13 @@ else
   export LOG4CXX_INC_DIR=/usr/include/log4cxx
 fi
 
+# For now, set the QT_TOOLKIT envvar if the required version exists in the
+# download location
+if [[ -d $TOOLSDIR/Qt-4.8.5-64 ]]; 
+then
+   export QT_TOOLKIT="$TOOLSDIR/Qt-4.8.5-64"
+fi
+
 
 # for debugging
 export LD_BIND_NOW=true

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7319df3/core/sqf/sql/scripts/install_hadoop_regr_test_env
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_hadoop_regr_test_env b/core/sqf/sql/scripts/install_hadoop_regr_test_env
index 0abfb74..b3eacc0 100755
--- a/core/sqf/sql/scripts/install_hadoop_regr_test_env
+++ b/core/sqf/sql/scripts/install_hadoop_regr_test_env
@@ -140,6 +140,7 @@ if [ ! -f $MY_LOCAL_SW_DIST/${TPCDS_ZIP} ]; then
   # "environment variable. Then retry installing. Sorry, this is due"
   # "to the TPC wanting your email address."
   echo "The testware tpcds_kit.zip does not exist and will not be installed"
+  echo "This testware is needed to run developer HIVE regression tests"
   exit 99
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7319df3/core/sqf/sql/scripts/install_local_hadoop
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/install_local_hadoop b/core/sqf/sql/scripts/install_local_hadoop
index c558023..23503c8 100755
--- a/core/sqf/sql/scripts/install_local_hadoop
+++ b/core/sqf/sql/scripts/install_local_hadoop
@@ -571,10 +571,10 @@ if [ `netstat -anl | grep ${MY_HADOOP_JOB_TRACKER_HTTP_PORT_NUM} | grep
LISTEN |
 fi
 
 # check for missing tpcds_kit.zip file
+INSTALL_TPCDS=1
 install_hadoop_regr_test_env --check
-INSTALL_TPCDS=0
 if [ $? -ne 0 ]; then
-  INSTALL_TPCDS=1
+  INSTALL_TPCDS=0
 fi
 
 if [ -d "$MY_SW_ROOT" ]; then
@@ -933,7 +933,7 @@ else
 
   if [ -f $MY_LOCAL_SW_DIST/${HADOOP_TAR} ]; then
     cp $MY_LOCAL_SW_DIST/${HADOOP_TAR} .
-    echo "Downloaded Hadoop tar file: $MY_LOCAL_SW_DIST/${HADOOP_TAR}" 
+    echo "Copied Hadoop tar file from: $MY_LOCAL_SW_DIST/${HADOOP_TAR}" 
   else
     curl -O ${HADOOP_MIRROR_URL}/${HADOOP_TAR}
     echo "Downloaded Hadoop tar file: ${HADOOP_MIRROR_URL}/${HADOOP_TAR}"
@@ -1149,11 +1149,11 @@ if [ -d mysql/bin ]; then
   echo "MySQL files already exist, skipping MySQL setup"
 else
   #####################################################
-  echo "Downloading MySQL..."
+  echo "Setting up MySQL..."
 
   if [ -f $MY_LOCAL_SW_DIST/${MYSQL_TAR} ]; then
     cp $MY_LOCAL_SW_DIST/${MYSQL_TAR} .
-    echo "Downloaded MySql tar file: $MY_LOCAL_SW_DIST/${MYSQL_TAR}"
+    echo "Copied MySql tar file from: $MY_LOCAL_SW_DIST/${MYSQL_TAR}"
   else
     curl ${MYSQL_MIRROR_URL}/${MYSQL_TAR} -o ${MYSQL_TAR}
     echo "Downloaded MySql tar file: ${MYSQL_MIRROR_URL}/${MYSQL_TAR}"
@@ -1228,11 +1228,11 @@ if [ -f mysql-connector-java-*/mysql-connector-java-*.jar ]; then
   echo "MySQL JDBC driver file already exists, skipping JDBC setup"
 else
   #####################################################
-  echo "Downloading MySQL JDBC driver..."
+  echo "Setting up MySQL JDBC driver..."
 
   if [ -f $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR} ]; then
     cp $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR} .
-    echo "Downloaded MySql JDBC tar file: $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR}"
+    echo "Copied MySql JDBC tar file from: $MY_LOCAL_SW_DIST/${MYSQL_JDBC_TAR}"
   else
     curl -O ${MYSQL_JDBC_URL}/${MYSQL_JDBC_TAR}
     echo "Downloaded MySql JDBC tar file: ${MYSQL_JDBC_URL}/${MYSQL_JDBC_TAR}"
@@ -1251,11 +1251,11 @@ if [ -d hive/bin ]; then
   echo "Hive files already exist, skipping Hive setup"
 else
   #####################################################
-  echo "Downloading Hive..."
+  echo "Setting up Hive..."
 
   if [ -f $MY_LOCAL_SW_DIST/${HIVE_TAR} ]; then
     cp $MY_LOCAL_SW_DIST/${HIVE_TAR} .
-    echo "Downloaded Hive tar file: $MY_LOCAL_SW_DIST/${HIVE_TAR}"
+    echo "Copied Hive tar file from: $MY_LOCAL_SW_DIST/${HIVE_TAR}"
   else
     curl -O ${HIVE_MIRROR_URL}/${HIVE_TAR}
     echo "Downloaded Hive tar file: ${HIVE_MIRROR_URL}/${HIVE_TAR}"
@@ -1379,11 +1379,11 @@ if [ -d hbase/bin ]; then
   echo "HBase files already exist, skipping HBase setup"
 else
   #####################################################
-  echo "Downloading HBase..."
+  echo "Setting up HBase..."
 
   if [ -f $MY_LOCAL_SW_DIST/${HBASE_TAR} ]; then
     cp $MY_LOCAL_SW_DIST/${HBASE_TAR} .
-    echo "Downloaded HBase tar file: $MY_LOCAL_SW_DIST/${HBASE_TAR}"
+    echo "Copied HBase tar file from: $MY_LOCAL_SW_DIST/${HBASE_TAR}"
   else
     curl -O ${HBASE_MIRROR_URL}/${HBASE_TAR}
     echo "Downloaded HBase tar file: ${HBASE_MIRROR_URL}/${HBASE_TAR}"

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7319df3/install/traf_tools_setup.sh
----------------------------------------------------------------------
diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh
index 9cc56a2..a2290bc 100755
--- a/install/traf_tools_setup.sh
+++ b/install/traf_tools_setup.sh
@@ -112,10 +112,23 @@ if [ "$TOOLSDIR" == "" ]; then
 fi
 
 if [ ! -d "$TOOLSDIR" ]; then                                                    
-  echo
-  echo "ERROR: install directory ($TOOLSDIR) does not exist"
-  echo
-  exit 1;
+  read -p "Tools install directory $TOOLSDIR does not exist, do you want to to create it?
y/n : " CREATEDIR
+  if [ "$CREATEDIR" == "y" ]; then
+     mkdir $TOOLSDIR
+     if [ ! -d "$TOOLSDIR" ]; then
+       echo
+       echo "ERROR: unable to create directory $TOOLSDIR"
+       echo
+       exit 1
+     else
+       echo "Created directory $TOOLSDIR"
+     fi
+  else
+    echo
+    echo "ERROR: install directory ($TOOLSDIR) does not exist"
+    echo
+    exit 1;
+  fi
 fi
 
 if [ $VERBOSE -eq 1 ]; then


Mime
View raw message