Permalink
Browse files

KITCHEN-1300. Building RPMs from SRPMs in CDH needs to rebuild the pr…

…ojects
  • Loading branch information...
1 parent f42a2a9 commit a73d90867bd1630a9c27a3ef3f7da1e898c090de root committed Jun 18, 2011
Showing with 3 additions and 25 deletions.
  1. +1 −0 build.xml
  2. +2 −25 cloudera/do-release-build
View
@@ -879,6 +879,7 @@ to call at top-level: ant deploy-contrib compile-core-test
<tarfileset dir="." mode="644" prefix="flume-${version}">
<include name="build.xml" />
<include name="cloudera/**" />
+ <include name="cloudera-pom.xml" />
<include name="conf/**" />
<include name="CHANGELOG.html" />
<include name="DEVNOTES" />
View
@@ -21,29 +21,6 @@
set -ex
-JAVA32_HOME=${JAVA32_HOME:-$JAVA_HOME}
-
-# Check that JVMs support the right architectures
-# Passing -d with an architecture that's not supported results
-# in a non-zero exit code even with -version
-if ! $JAVA32_HOME/bin/java -d32 -version ; then
- echo Your jvm in $JAVA32_HOME seems like it doesnt support 32-bit mode 1>&2
- echo Please set JAVA32_HOME to point to a 32-bit JDK
- exit 1
-fi
-
-if ! [ -e $JAVA5_HOME/bin/java ]; then
- echo No JAVA5_HOME set. Forrest documentation requires Java 5 to be 1>&2
- echo installed. 1>&2
- exit 1
-fi
-
-if ! [ -e $FORREST_HOME/bin/forrest ]; then
- echo No FORREST_HOME set. Forrest documentation requires Forrest to be 1>&2
- echo installed. 1>&2
- exit 1
-fi
-
# Do the build
BIN_DIR=$(readlink -f $(dirname $0))
RELEASE_DIR=$BIN_DIR/..
@@ -53,7 +30,7 @@ mvn -N install
cd $RELEASE_DIR
mvn -f cloudera-pom.xml process-resources
-JAVA_HOME=$JAVA32_HOME ant clean tar -Dversion=${FULL_VERSION} -propertyfile cloudera/build.properties
+ant clean tar -Dversion=${FULL_VERSION} -propertyfile cloudera/build.properties
cd $BIN_DIR/maven-packaging
-mvn install $DO_MAVEN_DEPLOY
+mvn install $DO_MAVEN_DEPLOY

0 comments on commit a73d908

Please sign in to comment.