Author: rvs
Date: Thu Oct 6 18:39:05 2011
New Revision: 1179756
URL: http://svn.apache.org/viewvc?rev=1179756&view=rev
Log:
Fixing versioning of the artifacts
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.22/bigtop.mk
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build?rev=1179756&r1=1179755&r2=1179756&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hadoop/do-component-build
Thu Oct 6 18:39:05 2011
@@ -27,8 +27,8 @@ else
JSVC_URL=http://archive.apache.org/dist/commons/daemon/binaries/1.0.2/linux/commons-daemon-1.0.2-bin-linux-i386.tar.gz
fi
-for project in common hdfs mapreduce ; do
- cd $project
+for project in common hdfs mapred ; do
+ cd $project || cd mapreduce
ant \
-Djava5.home=$JAVA5_HOME \
-Dforrest.home=$FORREST_HOME \
@@ -39,7 +39,7 @@ for project in common hdfs mapreduce ; d
-Dlibhdfs=1 -Dfusedfs=true -Dcompile.c++=true
-Djdiff.build.dir=build/docs/jdiff-cloudera \
api-report bin-package $BUILD_CONTRIB package \
"$@"
- (cd build/hadoop-*-0.22 ; tar cf - * ) | (cd ../build ; tar xf - )
+ (cd build/hadoop-$project-0.22.0 || cd mapreduce ; tar cf - * ) | (cd
../build ; tar xf - )
for file in $STITCH_FILES ; do
[ -f $file ] && cat $file >> ../$file
@@ -47,11 +47,9 @@ for project in common hdfs mapreduce ; d
BUILD_CONTRIB="compile-contrib"
cd ..
-done
-# NOTE: This is a total hack and needs to be generalized for future versions
of Bigtop
-# Installing maven artifacts for downstream components
-for i in hadoop-common hadoop-hdfs hadoop-mapred ; do
- mvn install:install-file -Dfile=build/$i-0.22.jar
-DgroupId=org.apache.hadoop -DartifactId=$i -Dversion=0.22-SNAPSHOT
-Dpackaging=jar
- mvn install:install-file -Dfile=build/$i-test-0.22.jar
-DgroupId=org.apache.hadoop -DartifactId=$i -Dversion=0.22-SNAPSHOT
-Dpackaging=jar -Dclassifier=test
+ # NOTE: This is a total hack and needs to be generalized for future versions
of Bigtop
+ # Installing maven artifacts for downstream components
+ mvn install:install-file -Dfile=build/hadoop-$i-0.22.0.jar
-DgroupId=org.apache.hadoop -DartifactId=hadoop-$i -Dversion=0.22.0-SNAPSHOT
-Dpackaging=jar
+ mvn install:install-file -Dfile=build/hadoop-$i-test-0.22.0.jar
-DgroupId=org.apache.hadoop -DartifactId=hadoop-$i -Dversion=0.22.0-SNAPSHOT
-Dpackaging=jar -Dclassifier=test
done
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop.mk?rev=1179756&r1=1179755&r2=1179756&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop.mk (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop.mk Thu Oct 6 18:39:05 2011
@@ -18,8 +18,8 @@ BIGTOP_VERSION=0.1.0-incubating
# Hadoop 0.20.0-based hadoop package
HADOOP_NAME=hadoop
HADOOP_RELNOTES_NAME=Apache Hadoop
-HADOOP_BASE_VERSION=0.22
-HADOOP_PKG_VERSION=0.22
+HADOOP_BASE_VERSION=0.22.0
+HADOOP_PKG_VERSION=0.22.0
HADOOP_RELEASE_VERSION=1
HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
#HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
