trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmar...@apache.org
Subject [1/5] incubator-trafodion git commit: TRAFODION-2357 log4c++ build error
Date Tue, 29 Nov 2016 17:07:16 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 0bbd910d0 -> acedc3c20


TRAFODION-2357 log4c++ build error

There were two problems fixed related to building from a source tar:

- If you try to build on a node that does not have git installed, then the build
  fails trying to access svn to get the build ID and branch.  Changes were made
  to set the buildID to the current date and to set the branch indicating
  details were unavailable.

- The problem reported by this JIRA.  Two Makefiles were changed to add an
  INCLUDE to point to the location of log4cxx in the tools directory.


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

Branch: refs/heads/master
Commit: e93d518de002f827b8936ddefb59cb04364a9c5a
Parents: 466048a
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Authored: Tue Nov 22 19:22:25 2016 +0000
Committer: Roberta Marton <rmarton@edev07.esgyn.local>
Committed: Tue Nov 22 19:22:25 2016 +0000

----------------------------------------------------------------------
 core/conn/odbc/src/odbc/nsksrvrcore/Makefile | 2 +-
 core/dbsecurity/auth/Makefile                | 1 +
 core/sqf/build-scripts/build.branch          | 8 +++-----
 core/sqf/build-scripts/build.id              | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e93d518d/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
index 53cb1fb..d1e3741 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/Makefile
@@ -64,7 +64,7 @@ OBJS  = $(OUTDIR)/CommonDiags.o \
         $(OUTDIR)/srvrothers.o \
         $(OUTDIR)/libmxocore_version.o
 
-INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux
-I../Krypton/generated_incs  -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi 
-I$(SQ_HOME)/inc  -I$(SQ_HOME)/export/include -I$(SQ_HOME)/sql/nq_w/common -I../OssCfgCl/src
-I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/commonLogger -I$(SQ_HOME)/../dbsecurity/cert/inc
-I$(SQ_HOME)/../dbsecurity/auth/inc -I$(SQ_HOME)/../mpi/src/include/intern
+INCLUDES = -I. -I../Common -I../EventMsgs -I../SrvrMsg -I../dependencies/include -I../dependencies/linux
-I../Krypton/generated_incs  -I$(SQ_HOME)/export/include/sql -I$(SQ_HOME)/inc/tmf_tipapi 
-I$(SQ_HOME)/inc  -I$(SQ_HOME)/export/include -I$(SQ_HOME)/sql/nq_w/common -I../OssCfgCl/src
-I../CmdCfgDll -I$(PROTOBUFS_INC) -I$(SQ_HOME)/../sql/cli -I$(SQ_HOME)/commonLogger -I$(SQ_HOME)/../dbsecurity/cert/inc
-I$(SQ_HOME)/../dbsecurity/auth/inc -I$(LOG4CXX_INC_DIR) -I$(SQ_HOME)/../mpi/src/include/intern
 
 DEFINES =  -DNA_LINUX -DSIZEOF_LONG_INT=4 -DUSE_NEW_PHANDLE -DSQ_GUARDIAN_CALL -D_M_DG -DINC_QPID_EVENT
-w
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e93d518d/core/dbsecurity/auth/Makefile
----------------------------------------------------------------------
diff --git a/core/dbsecurity/auth/Makefile b/core/dbsecurity/auth/Makefile
index 9bd67e6..05f26ba 100644
--- a/core/dbsecurity/auth/Makefile
+++ b/core/dbsecurity/auth/Makefile
@@ -68,6 +68,7 @@ INCLUDES	= -I. -I./inc -I ../shared/inc \
 	        -I $(MY_SQROOT)/../sql/porting_layer \
 	        -I $(MY_SQROOT)/export/include \
 	        -I $(MY_SQROOT)/commonLogger \
+	        -I $(LOG4CXX_INC_DIR) \
 	        -I ../../sql/common
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e93d518d/core/sqf/build-scripts/build.branch
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/build.branch b/core/sqf/build-scripts/build.branch
index d191a3e..3bd2981 100755
--- a/core/sqf/build-scripts/build.branch
+++ b/core/sqf/build-scripts/build.branch
@@ -52,15 +52,13 @@ if [[ "$USE_GIT" == "1" ]];then
     branch=$ZUUL_BRANCH;
   fi
 else
-  rev=`svn info .. 2>/dev/null | grep '^Last Changed Rev:' | sed 's|Last Changed Rev:
||'`
-  url=`svn info .. 2>/dev/null | grep '^URL:' | sed 's|URL: ||'`
-  reporoot=`svn info .. 2>/dev/null | grep '^Repository Root:' | sed 's|Repository Root:
||'`
-  branch=`echo $url | sed "s|$reporoot\/||" | sed 's|\/sqf$||'`
+  rev=$PV_BUILDID
+  branch="git_unavailable"
 fi
 if [ $f = 1 ]; then
   branch=`echo $branch | sed 's|\/|_sl_|g' | sed 's|-|_dh_|g'`
   echo $rev"_dh_"$branch
 else
-  echo $rev"-"$branch
+  echo $rev"_"$branch
 fi
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e93d518d/core/sqf/build-scripts/build.id
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/build.id b/core/sqf/build-scripts/build.id
index d378b4d..046f049 100755
--- a/core/sqf/build-scripts/build.id
+++ b/core/sqf/build-scripts/build.id
@@ -39,6 +39,6 @@ if [[ "$USE_GIT" == "1" ]];then
   id=`git rev-parse --verify --short HEAD`
   echo $id
 else
-  id=`svn info .. | grep '^Last Changed Rev:' | sed 's|Last Changed Rev: ||'`
+  id=id=`date +"%Y%m%d"`
   echo $id
 fi


Mime
View raw message