You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by GitBox <gi...@apache.org> on 2019/01/15 08:39:12 UTC
[trafodion] Diff for: [GitHub] kevinxu021 closed pull request #1770: Do not
make again before MAKE CLEAN
diff --git a/core/Makefile b/core/Makefile
index bbd0878fbb..0a8482ec6c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -68,7 +68,7 @@ foundation: sqroot dbsecurity $(MPI_TARGET) $(SEAMONSTER_TARGET)
cd sqf && $(MAKE) all
jdbc_jar: verhdr
- cd conn/jdbcT4 && $(MAKE) 2>&1 && $(MAVEN) install | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
+ cd conn/jdbcT4 && $(MAKE) 2>&1 | sed -e "s/$$/ ##(JDBCT4)/";exit $${PIPESTATUS[0]}
dcs: jdbc_jar jdbc_type2_jar
cd ../dcs && $(MAKE) 2>&1 | sed -e "s/$$/ ##(DCS)/" ; exit $${PIPESTATUS[0]}
@@ -95,7 +95,7 @@ cleantests:
cd ../dcs/src/test/jdbc_test && $(RM) -r jdbcprop pom.xml target
cd ../tests/phx && $(RM) -r jdbcprop *.log pom.xml target
-clean: sqroot
+clean:
cd $(MPI_TARGET) && $(MAKE) clean-local
cd $(SEAMONSTER_TARGET)/src && $(MAKE) clean
cd dbsecurity && $(MAKE) clean
@@ -112,7 +112,7 @@ clean: sqroot
cd ../install && $(MAKE) clean
$(RM) -r ../${DISTRIBUTION_DIR}
-cleanall: sqroot eclipseclean cleantests
+cleanall: eclipseclean cleantests
cd $(MPI_TARGET) && $(MAKE) clean-local
cd dbsecurity && $(MAKE) cleanall
cd sqf && $(MAKE) cleanall
diff --git a/core/conn/jdbcT4/Makefile b/core/conn/jdbcT4/Makefile
index 10ade68b41..8d1a8b131e 100644
--- a/core/conn/jdbcT4/Makefile
+++ b/core/conn/jdbcT4/Makefile
@@ -26,8 +26,8 @@ include ../../macros.gmk #top level
all: build_all
build_all: LICENSE NOTICE
- echo "$(MAVEN) package -DskipTests"
- set -o pipefail && $(MAVEN) package -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
+ echo "$(MAVEN) install -DskipTests"
+ set -o pipefail && $(MAVEN) install -DskipTests | tee build_jdbct4.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
cp target/jdbcT4-${TRAFODION_VER}.jar ${TRAF_HOME}/export/lib
mkdir -p ../clients
mv target/jdbcT4-${TRAFODION_VER}.zip ../clients
diff --git a/core/conn/jdbc_type2/Makefile b/core/conn/jdbc_type2/Makefile
index 9ed2b4fc3b..eb1700a638 100644
--- a/core/conn/jdbc_type2/Makefile
+++ b/core/conn/jdbc_type2/Makefile
@@ -85,11 +85,13 @@ CP := /bin/cp -f
all: LICENSE NOTICE $(LIBEXPDIR)/libjdbcT2.so
$(EXPROOT)/lib/jdbcT2.jar:
- ./getBuildInfo
- $(MAVEN) install -DskipTests
- $(CP) target/trafjdbcT2-${TRAFODION_VER}.jar $(EXPROOT)/lib
- `cd ${TRAF_HOME}/export/lib;$(LN) trafjdbcT2-${TRAFODION_VER}.jar jdbcT2.jar`
- $(JAVAH) -cp $(EXPROOT)/lib/jdbcT2.jar -d native $(CSES)
+ @if [ ! -f target/trafjdbcT2-${TRAFODION_VER}.jar ] ; then \
+ ./getBuildInfo ; \
+ $(MAVEN) install -DskipTests ; \
+ $(CP) target/trafjdbcT2-${TRAFODION_VER}.jar $(EXPROOT)/lib ; \
+ `cd ${TRAF_HOME}/export/lib;$(LN) trafjdbcT2-${TRAFODION_VER}.jar jdbcT2.jar` ; \
+ $(JAVAH) -cp $(EXPROOT)/lib/jdbcT2.jar -d native $(CSES) ; \
+ fi
$(LIBEXPDIR)/libjdbcT2.so: $(OBJS)
$(CXX) -shared $(GCCMODE) -o $@ $(DBG_FLGS) -L$(LIBEXPDIR) -lsbfs -lsbms -levlsq -lwin -ltdm_sqlcli -larkcmp_dll -larkcmplib -lcommon -lsort -lexecutor -lcomexe -lcli $(OBJS)
@@ -99,7 +101,9 @@ $(OBJS): $(EXPROOT)/lib/jdbcT2.jar
$(OUTDIR)/type2version.o: $(TRAF_HOME)/export/include/SCMBuildStr.h
clean:
- $(MAVEN) clean
+ -@if [ -d target ] ; then \
+ $(MAVEN) clean ; \
+ fi
$(RM) $(LIBEXPDIR)/libjdbcT2.so
$(RM) -f $(EXPROOT)/lib/jdbcT2*.jar
$(RM) -rf $(OUTDIR)
diff --git a/core/conn/trafci/Makefile b/core/conn/trafci/Makefile
index bc0b26f3ba..b489328827 100644
--- a/core/conn/trafci/Makefile
+++ b/core/conn/trafci/Makefile
@@ -27,15 +27,20 @@ all:Trafci_deploy
Trafci_deploy:Trafci_installer
Trafci_installer:Trafci_jar
Trafci_jar:
- mvn clean install -DskipTests$
+ @if [ ! -f target/trafciInstaller.jar ] ; then \
+ mvn install -DskipTests ; \
+ fi
Trafci_installer:
- ./getBuildInfo
- export buildId=`head -n 1 buildId`
- mvn -f installer_pom.xml -DbldId=${buildId} clean package -DskipTests
+ @if [ ! -f target/trafciInstaller.tar ] ; then \
+ ./getBuildInfo ; \
+ export buildId=`head -n 1 buildId` ; \
+ mvn -f installer_pom.xml -DbldId=${buildId} clean package -DskipTests ; \
+ fi
Trafci_deploy:
zip -r ../clients/trafci.zip -j target/trafciInstaller.jar utils/README
java -jar target/trafciInstaller.jar -silent -installDir ${TRAF_HOME}
clean:
- mvn -f installer_pom.xml clean
- mvn -f pom.xml clean
+ -@if [ -d target ]; then \
+ mvn -f pom.xml clean ; \
+ fi
diff --git a/core/rest/Makefile b/core/rest/Makefile
index 530e49cf65..74c9cbf446 100644
--- a/core/rest/Makefile
+++ b/core/rest/Makefile
@@ -32,10 +32,12 @@ GENVERS =./genvers
all: build_all
build_all: build_chk
- echo "$(MAVEN) site package -DskipTests"
- echo "### For full Maven output, see file build_rest.log"
- set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile'
- $(RM) $(VFILE)
+ @if [ ! -f target/rest-${TRAFODION_VER}.jar ] ; then \
+ echo "$(MAVEN) site package -DskipTests" ; \
+ echo "### For full Maven output, see file build_rest.log" ; \
+ set -o pipefail && $(MAVEN) site package -DskipTests | tee build_rest.log | grep --line-buffered -E -e '^\[[^WId]' -e '^\[INFO\] B[Uu][Ii][Ll][Dd]' -e 'to compile' ; \
+ $(RM) $(VFILE) ; \
+ fi
build_chk:
$(GENVERS) > $(VFILE)
@@ -43,7 +45,9 @@ build_chk:
@if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_TRAFODION_REST_TARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_TRAFODION_REST_TARNAME); fi
clean:
- -$(MAVEN) clean |grep ERROR
+ -@if [ -d target ] ; then \
+ $(MAVEN) clean |grep ERROR ; \
+ fi
$(RM) build_rest.log
$(RM) $(VFILE)
$(RM) ../../${DISTRIBUTION_DIR}/$(BLD_TRAFODION_REST_TARNAME)
diff --git a/core/rest/pom.xml b/core/rest/pom.xml
index 52c276ddf5..b6f7853256 100644
--- a/core/rest/pom.xml
+++ b/core/rest/pom.xml
@@ -536,6 +536,15 @@
</dependencies>
<profiles>
+ <profile>
+ <id>doclint-java8-disable</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
+ <properties>
+ <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ </properties>
+ </profile>
<!-- JDBC drivers needed for compile, but not site docs
This allows turning off dependency on command line (-P '!jdbc') -->
<profile>
@@ -640,6 +649,7 @@
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<docfilessubdirs>true</docfilessubdirs>
+ <additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<reportSets>
<reportSet>
diff --git a/core/sqf/hbase_utilities/Makefile b/core/sqf/hbase_utilities/Makefile
index 9c960fc50f..6848b53829 100644
--- a/core/sqf/hbase_utilities/Makefile
+++ b/core/sqf/hbase_utilities/Makefile
@@ -27,20 +27,21 @@ include ../macros.gmk #top level
all: build_all
-build_all:
- $(MAKE) mavenbuild
- echo "$(MAVEN) site package -DskipTests"
- echo "### For full Maven output, see file build_utility.log"
+build_all: mavenbuild
mavenbuild:
- # create a jar manifest file with the correct version information
- mkdir -p src/main/resources
- $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 > src/main/resources/trafodion-utility.jar.mf
- # 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-utility-*.jar $(TRAF_HOME)/export/lib
+ @if [ ! -f target/trafodion-utility-${TRAFODION_VER}.jar ]; then \
+ echo "$(MAVEN) site package -DskipTests" ; \
+ echo "### For full Maven output, see file build_utility.log" ; \
+ mkdir -p src/main/resources ; \
+ $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 > src/main/resources/trafodion-utility.jar.mf ; \
+ set -o pipefail && $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' ; \
+ cp -pf target/trafodion-utility-*.jar $(TRAF_HOME)/export/lib ; \
+ fi
clean:
- $(MAVEN) clean
+ -@if [ -d target ] ; then \
+ $(MAVEN) clean ; \
+ fi
$(RM) build_utility.log
$(RM) -rf $(TRAF_HOME)/export/lib/trafodion-utility-*.jar
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index c52821fb54..070b32bde8 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -21,148 +21,48 @@
# This Makefile is just a thin shell to Maven, which is used to do the real build
-BLD_HBASE_APACHE10_TRX_JARNAME =hbase-trx-apache1_0-$(TRAFODION_VER).jar
-BLD_HBASE_APACHE11_TRX_JARNAME =hbase-trx-apache1_1-$(TRAFODION_VER).jar
-BLD_HBASE_APACHE12_TRX_JARNAME =hbase-trx-apache1_2-$(TRAFODION_VER).jar
-BLD_HBASE_CDH54_TRX_JARNAME =hbase-trx-cdh5_4-$(TRAFODION_VER).jar
-BLD_HBASE_CDH55_TRX_JARNAME =hbase-trx-cdh5_5-$-$(TRAFODION_VER).jar
-BLD_HBASE_CDH57_TRX_JARNAME =hbase-trx-cdh5_7-$-$(TRAFODION_VER).jar
-BLD_HBASE_MAPR_TRX_JARNAME =hbase-trx-mapr4_0-$(TRAFODION_VER).jar
-BLD_HBASE_HDP_TRX_JARNAME =hbase-trx-hdp2_3-$(TRAFODION_VER).jar
-BLD_HBASE_SSCC_TRX_JARNAME =hbase-trx-sscc-$(TRAFODION_VER).jar
-
VFILE =hbase-trx.jar.versions
GENVERS =./genvers
UNCOMMENT_STRING =./uncomment_string
REINSTATE_ORIG =./reinstate_orig
+#When add one more hadoop version, please addthe names in below 4 lines in order
+VERSION_NAMES =0 1 2 3 4 5 6
+JAR_NAMES =cdh5_4 cdh5_5 cdh5_7 hdp2_3 apache1_0 apache1_1 apache1_2
+POM_NAMES =cdh54 cdh55 cdh57 hdp apache10 apache11 apache12
+UNCOMMENT_NAMES =CDH5.4 CDH5.5 CDH5.7 HDP APACHE1.0 APACHE1.1 APACHE1.2
.NOTPARALLEL: all
-all: build_all
-
-jdk_1_7_cdh54: build_chk_cdh54
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) CDH5.4
- echo "$(MAVEN) package -DskipTests"
- echo "### For full Maven output, see file build_trx.log"
- set -o pipefail && $(MAVEN) -f pom.xml.cdh54 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_CDH54_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_cdh55: build_chk_cdh55
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) CDH5.5
- set -o pipefail && $(MAVEN) -f pom.xml.cdh55 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_CDH55_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_cdh57: build_chk_cdh57
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) CDH5.7
- set -o pipefail && $(MAVEN) -f pom.xml.cdh57 package install -DskipTests | tee -a build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_CDH57_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_mapr: build_chk_mapr
- set -o pipefail && $(MAVEN) -f pom.xml.mapr package -DskipTests | tee -a build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_MAPR_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_hdp: build_chk_hdp
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) HDP2.3
- set -o pipefail && $(MAVEN) -f pom.xml.hdp package -DskipTests | tee -a build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_HDP_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_apache10: build_chk_apache10
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) APACHE1.0
- set -o pipefail && $(MAVEN) -f pom.xml.apache10 package -DskipTests | tee build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE10_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-jdk_1_7_apache11: build_chk_apache11
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) APACHE1.1
- set -o pipefail && $(MAVEN) -f pom.xml.apache11 package -DskipTests | tee build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE11_TRX_JARNAME) $(TRAF_HOME)/export/lib
+all:
+ @pom_nms=($(shell echo $(POM_NAMES))); \
+ uncomment_nms=($(shell echo $(UNCOMMENT_NAMES))); \
+ jar_nms=($(shell echo $(JAR_NAMES))); \
+ version_nms=($(shell echo $(VERSION_NAMES))); \
+ length=$${#version_nms[@]}; \
+ let 'length=length-1'; \
+ $(GENVERS) > $(VFILE); \
+ for i in `echo $${version_nms[@]}` ; do \
+ jar_nm=target/hbase-trx-$${jar_nms[$${i}]}-$(TRAFODION_VER).jar ; \
+ if [ ! -f $${jar_nm} ]; then \
+ if [ $(GENVERS) -nt $${jar_nm} ]; then echo "update manifest"; $(RM) -f $${jar_nm}; fi ; \
+ if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt $${jar_nm} ]; then echo "update manifest"; $(RM) -f $${jar_nm}; fi ; \
+ echo $${uncomment_nms[$${i}]}; \
+ $(REINSTATE_ORIG); \
+ $(UNCOMMENT_STRING) $${uncomment_nms[$${i}]}; \
+ echo "$${i}/$${length}: $(MAVEN) -f pom.xml.$${pom_nms[$${i}]} package -DskipTests"; \
+ echo "### For full Maven output, see file build_trx.log"; \
+ set -o pipefail && $(MAVEN) -f pom.xml.$${pom_nms[$${i}]} package install -DskipTests | tee -a build_trx.log; \
+ fi ; \
+ mkdir -p $(TRAF_HOME)/export/lib; \
+ cp -pf $${jar_nm} $(TRAF_HOME)/export/lib; \
+ done ; \
$(RM) $(VFILE)
-jdk_1_7_apache12: build_chk_apache12
- $(REINSTATE_ORIG)
- $(UNCOMMENT_STRING) APACHE1.2
- set -o pipefail && $(MAVEN) -f pom.xml.apache12 package -DskipTests | tee build_trx.log
- mkdir -p $(TRAF_HOME)/export/lib
- cp -pf target/$(BLD_HBASE_APACHE12_TRX_JARNAME) $(TRAF_HOME)/export/lib
- $(RM) $(VFILE)
-
-build_all: jdk_1_7_cdh54 jdk_1_7_cdh55 jdk_1_7_cdh57 jdk_1_7_hdp jdk_1_7_apache10 jdk_1_7_apache11 jdk_1_7_apache12
-
-build_chk_apache10:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE10_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE10_TRX_JARNAME); fi
-
-build_chk_apache11:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE11_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE11_TRX_JARNAME); fi
-
-build_chk_apache12:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_APACHE12_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_APACHE12_TRX_JARNAME); fi
-
-build_chk_cdh54:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH54_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH54_TRX_JARNAME); fi
-
-build_chk_cdh55:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH55_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH55_TRX_JARNAME); fi
-
-build_chk_cdh57:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_CDH57_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_CDH57_TRX_JARNAME); fi
-
-build_chk_mapr:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_MAPR_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_MAPR_TRX_JARNAME); fi
-
-build_chk_hdp:
- $(GENVERS) > $(VFILE)
- @if [ $(GENVERS) -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
- @if [ $(TRAF_HOME)/export/include/SCMBuildStr.h -nt target/$(BLD_HBASE_HDP_TRX_JARNAME) ]; then echo "update manifest"; $(RM) -f target/$(BLD_HBASE_HDP_TRX_JARNAME); fi
-
clean:
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE10_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE11_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_APACHE12_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH54_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH55_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_CDH57_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_MAPR_TRX_JARNAME)
- $(RM) $(TRAF_HOME)/export/lib/$(BLD_HBASE_HDP_TRX_JARNAME)
+ $(RM) $(TRAF_HOME)/export/lib/hbase-trx-*-$(TRAFODION_VER).jar
$(REINSTATE_ORIG)
- -$(MAVEN) -f pom.xml.apache10 clean | grep ERROR
- -$(MAVEN) -f pom.xml.apache11 clean | grep ERROR
- -$(MAVEN) -f pom.xml.apache12 clean | grep ERROR
- -$(MAVEN) -f pom.xml.cdh54 clean | grep ERROR
- -$(MAVEN) -f pom.xml.cdh55 clean | grep ERROR
- -$(MAVEN) -f pom.xml.cdh57 clean | grep ERROR
- -$(MAVEN) -f pom.xml.mapr clean | grep ERROR
- -$(MAVEN) -f pom.xml.hdp clean | grep ERROR
+ -@if [ -d target ]; then \
+ $(MAVEN) -f pom.xml.apache10 clean | grep ERROR 2>/dev/null ; \
+ fi
$(RM) build_trx.log
$(RM) $(VFILE)
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
index 12859d85fb..0eaaca3a51 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -64,14 +64,18 @@ endif
all: $(PROGS) mavenbuild
mavenbuild:
- # create a jar manifest file with the correct version information
- mkdir -p src/main/resources
- $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf
- # run maven
- set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib
+ @mkdir -p src/main/resources ; \
+ $(TRAF_HOME)/export/include/SCMBuildJava.sh 1.0.1 >src/main/resources/trafodion-dtm.jar.mf ; \
+ if [ ! -f target/trafodion-dtm-cdh-${TRAFODION_VER}.jar ]; then \
+ set -o pipefail; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' ; \
+ fi ; \
+ if [ ! -f target/trafodion-dtm-apache-${TRAFODION_VER}.jar ]; then \
+ set -o pipefail; $(MAVEN) -f pom.xml.apache package -DskipTests | tee maven_build_apache.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' ; \
+ fi ; \
+ if [ ! -f target/trafodion-dtm-hdp-${TRAFODION_VER}.jar ]; then \
+ set -o pipefail; $(MAVEN) -f pom.xml.hdp package -DskipTests | tee maven_build_hdp.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR' ; \
+ cp -pf target/trafodion-dtm-*.jar $(TRAF_HOME)/export/lib ; \
+ fi
$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS)
$(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS)
@@ -100,7 +104,9 @@ clean:
$(RM) *.gcda *.gcno *.gcov
$(RM) -f $(OUTDIR)/*.o
$(RM) -rf $(TRAF_HOME)/export/lib/trafodion-dtm-*.jar
- -$(MAVEN) -f pom.xml clean
+ -@if [ -d target ]; then \
+ $(MAVEN) -f pom.xml clean ; \
+ fi
cleanall: clean
$(RM) -rf $(BUILD_PLAT)
diff --git a/core/sql/lib_mgmt/Makefile b/core/sql/lib_mgmt/Makefile
index 3dd21007bd..081e210ba6 100644
--- a/core/sql/lib_mgmt/Makefile
+++ b/core/sql/lib_mgmt/Makefile
@@ -22,10 +22,14 @@
INSTALL_LIBDIR := ${TRAF_HOME}/export/lib
CP :=/bin/cp -f
all:
- @$(MAVEN) package -DskipTests
- mkdir -p ${INSTALL_LIBDIR}
- ${CP} target/lib_mgmt-${TRAFODION_VER}.jar ${INSTALL_LIBDIR}/lib_mgmt.jar
+ @if [ ! -f target/lib_mgmt-${TRAFODION_VER}.jar ] ; then \
+ $(MAVEN) package -DskipTests ; \
+ mkdir -p ${INSTALL_LIBDIR} ; \
+ ${CP} target/lib_mgmt-${TRAFODION_VER}.jar ${INSTALL_LIBDIR}/lib_mgmt.jar ; \
+ fi
clean:
@rm -f ${INSTALL_LIBDIR}/lib_mgmt.jar
- @$(MAVEN) clean
+ -@if [ -d target ] ; then \
+ $(MAVEN) clean ; \
+ fi
cleanall: clean
With regards,
Apache Git Services