You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2016/12/15 08:51:31 UTC
[09/10] incubator-trafodion git commit: change SQ_ROOT to TRAF_HOME
for merging issue
change SQ_ROOT to TRAF_HOME for merging issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a0b7e216
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a0b7e216
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a0b7e216
Branch: refs/heads/master
Commit: a0b7e216a9d8ec1901e0737273d52d8a25d57408
Parents: b4c7c81
Author: Eason <hf...@gmail.com>
Authored: Fri Dec 9 12:47:59 2016 +0800
Committer: Eason <hf...@gmail.com>
Committed: Tue Dec 13 14:21:22 2016 +0800
----------------------------------------------------------------------
core/conn/trafci/Makefile | 2 +-
core/sqf/sql/scripts/analyzeMessageGuide.py | 6 +++---
core/sqf/src/tm/macros.gmk | 2 +-
dcs/src/test/odbc/build/Makefile | 2 +-
install/python-installer/traf_setup.py | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/conn/trafci/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/trafci/Makefile b/core/conn/trafci/Makefile
index c9c2da5..94d72c5 100644
--- a/core/conn/trafci/Makefile
+++ b/core/conn/trafci/Makefile
@@ -34,4 +34,4 @@ Trafci_installer:
mvn -f installer_pom.xml -DbldId=${buildId} clean package -DskipTests$
Trafci_deploy:
zip -r ../clients/trafci.zip -j target/trafciInstaller.jar utils/README
- java -jar target/trafciInstaller.jar -silent -jdbcFile ${MY_SQROOT}/export/lib/jdbcT4.jar -installDir ${MY_SQROOT}
+ java -jar target/trafciInstaller.jar -silent -jdbcFile ${TRAF_HOME}/export/lib/jdbcT4.jar -installDir ${TRAF_HOME}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/sqf/sql/scripts/analyzeMessageGuide.py
----------------------------------------------------------------------
diff --git a/core/sqf/sql/scripts/analyzeMessageGuide.py b/core/sqf/sql/scripts/analyzeMessageGuide.py
index 07295c4..4f9940b 100644
--- a/core/sqf/sql/scripts/analyzeMessageGuide.py
+++ b/core/sqf/sql/scripts/analyzeMessageGuide.py
@@ -591,10 +591,10 @@ exitCode = 0
messagesTable = MessagesTable()
-# check that $MY_SQROOT is set
-mySQroot = os.getenv('MY_SQROOT')
+# check that $TRAF_HOME is set
+mySQroot = os.getenv('TRAF_HOME')
if not mySQroot:
- print "$MY_SQROOT is not defined. Exiting."
+ print "$TRAF_HOME is not defined. Exiting."
exit(1)
# parse the Messages Guide files
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/core/sqf/src/tm/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/src/tm/macros.gmk b/core/sqf/src/tm/macros.gmk
index 302d677..c37d744 100644
--- a/core/sqf/src/tm/macros.gmk
+++ b/core/sqf/src/tm/macros.gmk
@@ -93,7 +93,7 @@ ifeq ($(SQ_USE_INTC),0)
HPCWARN = -Wno-unused-parameter
HPCXXWARN = -Wno-unused-parameter -Wno-non-virtual-dtor
endif
-INCLUDES = -I$(INCEXPDIR) -I$(INCMONDIR) -I$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS)/include -I$(HBASETMLIB) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/log4cxx -I$(LIBCLOGGER) -I$(MY_SQROOT)/src/tm
+INCLUDES = -I$(INCEXPDIR) -I$(INCMONDIR) -I$(MY_SPROOT)/export/include -I$(MY_SPROOT)/source/publications -I$(PROTOBUFS)/include -I$(HBASETMLIB) -I$(INC_JAVA) -I$(INC_JAVALINUX) -I$(LOG4CXX_INC_DIR) -I$(LOG4CXX_INC_DIR)/log4cxx -I$(LIBCLOGGER) -I$(TRAF_HOME)/src/tm
#LIBSX = -lpthread
LIBSX = -pthread
ifeq ($(USE_THREADED_IO),1)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/dcs/src/test/odbc/build/Makefile
----------------------------------------------------------------------
diff --git a/dcs/src/test/odbc/build/Makefile b/dcs/src/test/odbc/build/Makefile
index e491dd2..4d64c66 100644
--- a/dcs/src/test/odbc/build/Makefile
+++ b/dcs/src/test/odbc/build/Makefile
@@ -21,7 +21,7 @@
#// @@@ END COPYRIGHT @@@
#**************************************************************************/
-LIB = -L${MY_SQROOT}/export/lib64 -ltrafodbc64
+LIB = -L${TRAF_HOME}/export/lib64 -ltrafodbc64
CXX_FLAGS = -c -g -fshort-wchar -I/usr/include/odbc
CC = /usr/bin/g++
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b7e216/install/python-installer/traf_setup.py
----------------------------------------------------------------------
diff --git a/install/python-installer/traf_setup.py b/install/python-installer/traf_setup.py
index acc7acb..3925fd8 100755
--- a/install/python-installer/traf_setup.py
+++ b/install/python-installer/traf_setup.py
@@ -50,7 +50,7 @@ def run():
### kernel settings ###
run_cmd('sysctl -w kernel.pid_max=65535 2>&1 > /dev/null')
run_cmd('echo "kernel.pid_max=65535" >> /etc/sysctl.conf')
- run_cmd('cp %s/sysinstall/etc/init.d/trafodion /etc/init.d' % SQ_ROOT)
+ run_cmd('cp %s/sysinstall/etc/init.d/trafodion /etc/init.d' % TRAF_HOME)
run_cmd('chkconfig --add trafodion')
run_cmd('chkconfig --level 06 trafodion on')