You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/10/20 18:38:54 UTC
[1/4] incubator-trafodion git commit: TRAFODION-1541 Fix make errors
when building outside of git
Repository: incubator-trafodion
Updated Branches:
refs/heads/master aa86b53b6 -> bc0ad1601
TRAFODION-1541 Fix make errors when building outside of git
Removed the Koraktor Maven plugin from SQL and hbasetmlib2 pom files,
since it fails when we build a source tree that is not managed by git.
Additional changes:
- Added "clean" steps to remove the built jar files
- Suppressed "svn not found" error when building outside of git
- Added maven to traf_tools_setup.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db970e1c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/db970e1c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/db970e1c
Branch: refs/heads/master
Commit: db970e1ce6857ae4bd639fc5273395bac3d63ba0
Parents: 92b17fa
Author: Hans Zeller <ha...@esgyn.com>
Authored: Mon Oct 19 21:31:32 2015 +0000
Committer: Hans Zeller <ha...@esgyn.com>
Committed: Mon Oct 19 21:31:32 2015 +0000
----------------------------------------------------------------------
core/sqf/build-scripts/build.branch | 6 ++--
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 7 ++++-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 33 ++--------------------
core/sql/nskgmake/Makerules.mk | 8 ++++--
core/sql/pom.xml | 33 ++--------------------
install/traf_tools_setup.sh | 11 ++++++++
6 files changed, 32 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/core/sqf/build-scripts/build.branch
----------------------------------------------------------------------
diff --git a/core/sqf/build-scripts/build.branch b/core/sqf/build-scripts/build.branch
index f809beb..d191a3e 100755
--- a/core/sqf/build-scripts/build.branch
+++ b/core/sqf/build-scripts/build.branch
@@ -52,9 +52,9 @@ if [[ "$USE_GIT" == "1" ]];then
branch=$ZUUL_BRANCH;
fi
else
- rev=`svn info .. | grep '^Last Changed Rev:' | sed 's|Last Changed Rev: ||'`
- url=`svn info .. | grep '^URL:' | sed 's|URL: ||'`
- reporoot=`svn info .. | grep '^Repository Root:' | sed 's|Repository Root: ||'`
+ 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$||'`
fi
if [ $f = 1 ]; then
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/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 90e5937..aaf12c8 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -64,8 +64,12 @@ endif
all: $(PROGS) mavenbuild
mavenbuild:
+ # 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/jarmanifest.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/*.jar $(MY_SQROOT)/export/lib
+ cp -pf target/trafodion-dtm-*.jar $(MY_SQROOT)/export/lib
$(LIBEXPDIR)/libshbasetmlib.so: $(LIBSTMOBJS)
$(CXX) $(DTMOBJS) $(LNK_FLGS) $(LIBTMB) -shared -o $@ $(LIBSTMOBJS)
@@ -93,6 +97,7 @@ clean:
$(RM) $(PROGS)
$(RM) *.gcda *.gcno *.gcov
$(RM) -f $(OUTDIR)/*.o
+ $(RM) -rf $(MY_SQROOT)/export/lib/trafodion-dtm-*.jar
cleanall: clean
$(RM) -rf $(BUILD_PLAT)
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
index 17f1fba..0905a19 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
@@ -68,40 +68,13 @@
<build>
<plugins>
<plugin>
- <groupId>com.github.koraktor</groupId>
- <artifactId>mavanagaiata</artifactId>
- <version>0.7.2</version>
- <configuration>
- <dirtyFlag>false</dirtyFlag>
- <dirtyIgnoreUntracked>false</dirtyIgnoreUntracked>
- <gitDir>${env.MY_SQROOT}/../../.git</gitDir>
- <dateFormat>ddMMMyyyy</dateFormat>
- </configuration>
- <executions>
- <execution>
- <id>git-commit</id>
- <phase>validate</phase>
- <goals>
- <goal>commit</goal>
- <goal>branch</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestEntries>
- <Implementation-Version-1>Version ${project.version}</Implementation-Version-1>
- <Implementation-Version-2>Release ${project.version}</Implementation-Version-2>
- <Implementation-Version-3>Build ${env.SQ_BUILD_TYPE}</Implementation-Version-3>
- <Implementation-Version-4>[${user.name}]</Implementation-Version-4>
- <Implementation-Version-5>Branch ${mvngit.commit.abbrev}-${mvngit.branch}</Implementation-Version-5>
- <Implementation-Version-6>Date ${maven.build.timestamp}</Implementation-Version-6>
- <Product-Name>${project.name}</Product-Name>
- </manifestEntries>
+ <manifestFile>
+ src/main/resources/jarmanifest.mf
+ </manifestFile>
</archive>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/core/sql/nskgmake/Makerules.mk
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk
index a2bdcff..be604c8 100755
--- a/core/sql/nskgmake/Makerules.mk
+++ b/core/sql/nskgmake/Makerules.mk
@@ -273,8 +273,12 @@ endif
# Java files get built through Maven
mavenbuild:
+ # 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/jarmanifest.mf
+ # run maven
set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
- cp -pf ../target/*.jar $(MY_SQROOT)/export/lib
+ cp -pf ../target/trafodion-sql-*.jar $(MY_SQROOT)/export/lib
# This is where the top-level is declared to build everything.
buildall: $(FINAL_LIBS) $(FINAL_DLLS) $(FINAL_INSTALL_OBJS) $(FINAL_EXES) mavenbuild
@@ -291,4 +295,4 @@ clean:
@echo "Removing coverage files"
@-find $(TOPDIR) -maxdepth 1 -name '*.gcov' -print | xargs rm -f
@cd ..; $(MAVEN) clean
-
+ @rm -rf $(MY_SQROOT)/export/lib/trafodion-sql-*.jar
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/core/sql/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml b/core/sql/pom.xml
index 1253091..d73c279 100755
--- a/core/sql/pom.xml
+++ b/core/sql/pom.xml
@@ -85,40 +85,13 @@
<build>
<plugins>
<plugin>
- <groupId>com.github.koraktor</groupId>
- <artifactId>mavanagaiata</artifactId>
- <version>0.7.2</version>
- <configuration>
- <dirtyFlag>false</dirtyFlag>
- <dirtyIgnoreUntracked>false</dirtyIgnoreUntracked>
- <gitDir>${env.MY_SQROOT}/../../.git</gitDir>
- <dateFormat>ddMMMyyyy</dateFormat>
- </configuration>
- <executions>
- <execution>
- <id>git-commit</id>
- <phase>validate</phase>
- <goals>
- <goal>commit</goal>
- <goal>branch</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
- <manifestEntries>
- <Implementation-Version-1>Version ${project.version}</Implementation-Version-1>
- <Implementation-Version-2>Release ${project.version}</Implementation-Version-2>
- <Implementation-Version-3>Build ${env.SQ_BUILD_TYPE}</Implementation-Version-3>
- <Implementation-Version-4>[${user.name}]</Implementation-Version-4>
- <Implementation-Version-5>Branch ${mvngit.commit.abbrev}-${mvngit.branch}</Implementation-Version-5>
- <Implementation-Version-6>Date ${maven.build.timestamp}</Implementation-Version-6>
- <Product-Name>${project.name}</Product-Name>
- </manifestEntries>
+ <manifestFile>
+ src/main/resources/jarmanifest.mf
+ </manifestFile>
</archive>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db970e1c/install/traf_tools_setup.sh
----------------------------------------------------------------------
diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh
index a2290bc..a1a0e2e 100755
--- a/install/traf_tools_setup.sh
+++ b/install/traf_tools_setup.sh
@@ -260,3 +260,14 @@ make install
if [ $VERBOSE -eq 1 ]; then
echo "STEP completed: installation of THRIFT"
fi
+
+# install maven, if not available already
+MAVEN_VERSION=`mvn --version 2>/dev/null | grep 'Apache Maven' | cut -f 3 -d ' '`
+if [[ "$MAVEN_VERSION" != "3.0.5" ]]; then
+ # install maven
+ cd $BASEDIR
+ wget http://archive.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+ cd $TOOLSDIR
+ # there is no install, simply extract the files into $TOOLSDIR
+ tar -xzf $BASEDIR/apache-maven-3.0.5-bin.tar.gz
+fi
[2/4] incubator-trafodion git commit: Fixing maven version installed
in TOOLSDIR.
Posted by rm...@apache.org.
Fixing maven version installed in TOOLSDIR.
Addressing comment by Roberta.
https://github.com/apache/incubator-trafodion/pull/134#discussion_r42432212
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/8dca6cda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/8dca6cda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/8dca6cda
Branch: refs/heads/master
Commit: 8dca6cdacfd1db92ae91ca3760fad88983492547
Parents: db970e1
Author: Hans Zeller <ha...@esgyn.com>
Authored: Mon Oct 19 23:19:39 2015 +0000
Committer: Hans Zeller <ha...@esgyn.com>
Committed: Mon Oct 19 23:19:39 2015 +0000
----------------------------------------------------------------------
install/traf_tools_setup.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/8dca6cda/install/traf_tools_setup.sh
----------------------------------------------------------------------
diff --git a/install/traf_tools_setup.sh b/install/traf_tools_setup.sh
index a1a0e2e..a812865 100755
--- a/install/traf_tools_setup.sh
+++ b/install/traf_tools_setup.sh
@@ -263,11 +263,11 @@ fi
# install maven, if not available already
MAVEN_VERSION=`mvn --version 2>/dev/null | grep 'Apache Maven' | cut -f 3 -d ' '`
-if [[ "$MAVEN_VERSION" != "3.0.5" ]]; then
+if [[ ! "$MAVEN_VERSION" =~ "3." ]]; then
# install maven
cd $BASEDIR
- wget http://archive.apache.org/dist/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz
+ wget http://archive.apache.org/dist/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
cd $TOOLSDIR
# there is no install, simply extract the files into $TOOLSDIR
- tar -xzf $BASEDIR/apache-maven-3.0.5-bin.tar.gz
+ tar -xzf $BASEDIR/apache-maven-3.3.3-bin.tar.gz
fi
[4/4] incubator-trafodion git commit: Merge [TRAFODION-1541] PR 134
Fix make errors
Posted by rm...@apache.org.
Merge [TRAFODION-1541] PR 134 Fix make errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/bc0ad160
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bc0ad160
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bc0ad160
Branch: refs/heads/master
Commit: bc0ad1601c5f4548e2ba2d2ec9bb5d848d5b529b
Parents: aa86b53 7fd43af
Author: Roberta Marton <ro...@esgyn.com>
Authored: Tue Oct 20 16:36:53 2015 +0000
Committer: Roberta Marton <ro...@esgyn.com>
Committed: Tue Oct 20 16:36:53 2015 +0000
----------------------------------------------------------------------
core/sqf/build-scripts/build.branch | 6 ++--
core/sqf/src/seatrans/.gitignore | 1 +
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 7 ++++-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 33 ++--------------------
core/sql/nskgmake/Makerules.mk | 8 ++++--
core/sql/pom.xml | 33 ++--------------------
install/traf_tools_setup.sh | 11 ++++++++
7 files changed, 33 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-trafodion git commit: Fixing untracket file issue of
earlier commit
Posted by rm...@apache.org.
Fixing untracket file issue of earlier commit
Earlier commit left generated jar manifest files as untracked files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7fd43af2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7fd43af2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7fd43af2
Branch: refs/heads/master
Commit: 7fd43af27fbe439746f857cc682892b4df9089b4
Parents: 8dca6cd
Author: Hans Zeller <ha...@esgyn.com>
Authored: Mon Oct 19 23:40:21 2015 +0000
Committer: Hans Zeller <ha...@esgyn.com>
Committed: Mon Oct 19 23:40:21 2015 +0000
----------------------------------------------------------------------
core/sqf/src/seatrans/.gitignore | 1 +
core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 2 +-
core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml | 2 +-
core/sql/nskgmake/Makerules.mk | 2 +-
core/sql/pom.xml | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7fd43af2/core/sqf/src/seatrans/.gitignore
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/.gitignore b/core/sqf/src/seatrans/.gitignore
index 4c3c286..794f239 100644
--- a/core/sqf/src/seatrans/.gitignore
+++ b/core/sqf/src/seatrans/.gitignore
@@ -1,3 +1,4 @@
hbase-trx/target/
tm/hbasetmlib2/target/
tm/hbasetmlib2/testrun
+*.jar.mf
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7fd43af2/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 aaf12c8..33fdcab 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/Makefile
@@ -66,7 +66,7 @@ all: $(PROGS) mavenbuild
mavenbuild:
# 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/jarmanifest.mf
+ $(MY_SQROOT)/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'
cp -pf target/trafodion-dtm-*.jar $(MY_SQROOT)/export/lib
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7fd43af2/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
index 0905a19..d13e43e 100644
--- a/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
+++ b/core/sqf/src/seatrans/tm/hbasetmlib2/pom.xml
@@ -73,7 +73,7 @@
<configuration>
<archive>
<manifestFile>
- src/main/resources/jarmanifest.mf
+ src/main/resources/trafodion-dtm.jar.mf
</manifestFile>
</archive>
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7fd43af2/core/sql/nskgmake/Makerules.mk
----------------------------------------------------------------------
diff --git a/core/sql/nskgmake/Makerules.mk b/core/sql/nskgmake/Makerules.mk
index be604c8..83450bc 100755
--- a/core/sql/nskgmake/Makerules.mk
+++ b/core/sql/nskgmake/Makerules.mk
@@ -275,7 +275,7 @@ endif
mavenbuild:
# 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/jarmanifest.mf
+ $(MY_SQROOT)/export/include/SCMBuildJava.sh 1.0.1 >../src/main/resources/trafodion-sql.jar.mf
# run maven
set -o pipefail && cd ..; $(MAVEN) package -DskipTests | tee maven_build.log | grep -e '\[INFO\] Building' -e '\[INFO\] BUILD SUCCESS' -e 'ERROR'
cp -pf ../target/trafodion-sql-*.jar $(MY_SQROOT)/export/lib
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7fd43af2/core/sql/pom.xml
----------------------------------------------------------------------
diff --git a/core/sql/pom.xml b/core/sql/pom.xml
index d73c279..579a3ab 100755
--- a/core/sql/pom.xml
+++ b/core/sql/pom.xml
@@ -90,7 +90,7 @@
<configuration>
<archive>
<manifestFile>
- src/main/resources/jarmanifest.mf
+ src/main/resources/trafodion-sql.jar.mf
</manifestFile>
</archive>
</configuration>