Merge [TRAFODION-1818] PR 314 Fix maven parallel build issue

apache · Feb 10, 2016 · 972615b · 972615b
2 parents 8c955e6 + 5d4a72c
commit 972615b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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

diff --git 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