bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject git commit: BIGTOP-1390. JDK Woes (Olaf Flebbe via rvs)
Date Fri, 08 Aug 2014 16:26:18 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master e0bbd3def -> 1bcf2e93c


BIGTOP-1390. JDK Woes (Olaf Flebbe via rvs)


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/1bcf2e93
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/1bcf2e93
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/1bcf2e93

Branch: refs/heads/master
Commit: 1bcf2e93ced11ea022a031c23fb6bf673413500d
Parents: e0bbd3d
Author: Roman Shaposhnik <rvs@apache.org>
Authored: Fri Aug 8 09:19:45 2014 -0700
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Fri Aug 8 09:19:45 2014 -0700

----------------------------------------------------------------------
 .../src/common/oozie/do-component-build         |  3 ++-
 bigtop.mk                                       |  6 ++++++
 packages.gradle                                 | 21 +++++++++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/1bcf2e93/bigtop-packages/src/common/oozie/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/oozie/do-component-build b/bigtop-packages/src/common/oozie/do-component-build
index 4446811..0af95ac 100755
--- a/bigtop-packages/src/common/oozie/do-component-build
+++ b/bigtop-packages/src/common/oozie/do-component-build
@@ -90,8 +90,9 @@ for pom in $POM_FILES; do
   fi
 done
 
+export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=128m"
 # Invoke Oozie build script
-${WORKDIR}/bin/mkdistro.sh -DskipTests -Dhadoop.version=${HADOOP_VERSION} ${EXTRA_GOALS}
-Dmaven.repo.local=${HOME}/.m2/repository "$@"
+${WORKDIR}/bin/mkdistro.sh -DjavaVersion=${JDK_VERSION} -DskipTests -Dhadoop.version=${HADOOP_VERSION}
${EXTRA_GOALS} -Dmaven.repo.local=${HOME}/.m2/repository "$@"
 MKDISTRO_RESULT=$?
 if [ "${MKDISTRO_RESULT}" != "0" ]; then
   echo "ERROR: mkdistro.sh failed with error ${MKDISTRO_RESULT}"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/1bcf2e93/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 04c1273..7123f5a 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -15,6 +15,12 @@
 
 BIGTOP_VERSION=0.8.0
 
+# JDK Version
+JDK_VERSION=1.7
+JDK_BASE_VERSION=$(JDK_VERSION)
+$(eval BIGTOP_BOM += JDK_VERSION=$(JDK_VERSION))
+
+
 # Hadoop 0.20.0-based hadoop package
 HADOOP_NAME=hadoop
 HADOOP_RELNOTES_NAME=Apache Hadoop

http://git-wip-us.apache.org/repos/asf/bigtop/blob/1bcf2e93/packages.gradle
----------------------------------------------------------------------
diff --git a/packages.gradle b/packages.gradle
index d8ad36f..16c1e19 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -467,13 +467,24 @@ def readBOM = {
   bomfile.eachLine {
     if (!it.startsWith("#") && !it.isEmpty()) {
       if (it.startsWith("\$(eval")) {
+        // should either match $(eval $(call PACKAGE,xxxx,XXXX))
         def pattern = ~/.*call PACKAGE,(\w+[-\w+]*),(\w+)/
         def m = it =~ pattern
-        assert m.size() == 1
-        def target = m[0][1]
-        def variable = m[0][2]
-        genTasks(target, variable)
-        targets.add(target)
+	def variable = ""
+        if (m.size() == 1) {
+	  def target = m[0][1]
+          variable = m[0][2]
+          genTasks(target, variable)
+          targets.add(target)
+        } else {
+	  // or match $(eval BIGTOP_BOM += XXXX_VERSION=$(XXXX_VERSION))
+	  pattern = ~/.*BIGTOP_BOM \+= (\w+)_VERSION=\$\((\w+)_VERSION\)\).*/
+	  m = it =~ pattern
+	  print m.size()
+	  assert(m.size() == 1)
+	  assert( m[0][1]== m[0][2])
+	  variable = m[0][1]
+        }
         // Store the component name in the list
         components.add(variable)
         return


Mime
View raw message