trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [1/2] incubator-trafodion git commit: [TRAFODION-1818] Parallel build with maven caused error
Date Wed, 10 Feb 2016 16:44:20 GMT
Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 8c955e6df -> 972615b1e


[TRAFODION-1818] Parallel build with maven caused error

Add dependencies in sqf/Makefile to prevent collision of maven
builds downloading dependencies.

Replace spaces in hbasetmlib2/Makefile with tabs. Makefile syntax
requires initial tab for shell commands.


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

Branch: refs/heads/master
Commit: 5d4a72cac0e53d59a0e4ce85acfb1a60711ca203
Parents: 3aef621
Author: Steve Varnau <steve.varnau@esgyn.com>
Authored: Tue Feb 9 23:25:26 2016 +0000
Committer: Steve Varnau <steve.varnau@esgyn.com>
Committed: Tue Feb 9 23:25:26 2016 +0000

----------------------------------------------------------------------
 core/sqf/Makefile                             | 4 ++--
 core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5d4a72ca/core/sqf/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/Makefile b/core/sqf/Makefile
index 1a37f25..4b4004f 100644
--- a/core/sqf/Makefile
+++ b/core/sqf/Makefile
@@ -68,7 +68,7 @@ smstub:
 	cd ../smstub/src; $(MAKE) 2>&1 | sed -e "s/$$/	##(SMSTUB)/" ; exit $${PIPESTATUS[0]}
 
 
-make_sql: $(SEAMONSTER_TARGET) win 
+make_sql: $(SEAMONSTER_TARGET) win hbase_utilities
 	cd sql; $(MAKE) WROOT=$(SQL_W) 2>&1 | sed -e "s/$$/	##(SQL)/" ; exit $${PIPESTATUS[0]}
 	cd $(MY_SQROOT)/sql/scripts && ./makemsg.ksh 2>&1 | sed -e "s/$$/	##(SQL)/"
; exit $${PIPESTATUS[0]}
 
@@ -85,7 +85,7 @@ monitor_ib:
 make_sqevlog: 
 	cd sqevlog; $(MAKE) 2>&1 | sed -e "s/$$/	##(SQF)/" ; exit $${PIPESTATUS[0]}
 
-hbase_utilities:
+hbase_utilities: tm
 	cd hbase_utilities; $(MAKE) 2>&1 | sed -e "s/$$/  ##(HBASE_UTIL)/" ; exit $${PIPESTATUS[0]}
 
 .PHONY: conn

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5d4a72ca/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
index 33fdcab..3366c94 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -64,10 +64,10 @@ endif
 all:  $(PROGS) mavenbuild
 
 mavenbuild:
-        # create a jar manifest file with the correct version information
+	# create a jar manifest file with the correct version information
 	mkdir -p src/main/resources
 	$(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf
-        # run maven
+	# run maven
 	set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\]
Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
 	cp -pf target/trafodion-dtm-*.jar $(MY_SQROOT)/export/lib
 


Mime
View raw message