Mailing-List: contact hama-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: hama-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1076189 - in /incubator/hama/trunk: README.txt bin/hama
 build.xml conf/ conf/groomservers conf/groomservers.template
 conf/hama-env.sh conf/hama-env.sh.template conf/hama-site.xml
 conf/hama-site.xml.template
Date: Wed, 02 Mar 2011 12:30:18 -0000
To: hama-commits@incubator.apache.org
From: edwardyoon@apache.org
Message-Id: <20110302123018.F343D23888EC@eris.apache.org>

Author: edwardyoon
Date: Wed Mar  2 12:30:18 2011
New Revision: 1076189

URL: http://svn.apache.org/viewvc?rev=1076189&view=rev
Log:
Fix build script.

Added:
    incubator/hama/trunk/README.txt
    incubator/hama/trunk/conf/groomservers.template
      - copied unchanged from r1075304, incubator/hama/trunk/conf/groomservers
    incubator/hama/trunk/conf/hama-env.sh.template
      - copied unchanged from r1075304, incubator/hama/trunk/conf/hama-env.sh
    incubator/hama/trunk/conf/hama-site.xml.template
      - copied unchanged from r1075304, incubator/hama/trunk/conf/hama-site.xml
Removed:
    incubator/hama/trunk/conf/groomservers
    incubator/hama/trunk/conf/hama-env.sh
    incubator/hama/trunk/conf/hama-site.xml
Modified:
    incubator/hama/trunk/bin/hama
    incubator/hama/trunk/build.xml
    incubator/hama/trunk/conf/   (props changed)

Added: incubator/hama/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/README.txt?rev=1076189&view=auto
==============================================================================
--- incubator/hama/trunk/README.txt (added)
+++ incubator/hama/trunk/README.txt Wed Mar  2 12:30:18 2011
@@ -0,0 +1,7 @@
+For the latest information about Hama, please visit our website at:
+
+   http://incubator.apache.org/hama
+
+and our wiki, at:
+
+   http://wiki.apache.org/hama/

Modified: incubator/hama/trunk/bin/hama
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/bin/hama?rev=1076189&r1=1076188&r2=1076189&view=diff
==============================================================================
--- incubator/hama/trunk/bin/hama (original)
+++ incubator/hama/trunk/bin/hama Wed Mar  2 12:30:18 2011
@@ -117,10 +117,7 @@ IFS=
 if [ -d "$HAMA_HOME/webapps" ]; then
   CLASSPATH=${CLASSPATH}:$HAMA_HOME
 fi
-for f in $HAMA_HOME/hama-*-core.jar; do
-  CLASSPATH=${CLASSPATH}:$f;
-done
-for f in $HAMA_HOME/build/hama-*-dev.jar; do # TODO - should be changed before initial release
+for f in $HAMA_HOME/hama-**.jar; do
   CLASSPATH=${CLASSPATH}:$f;
 done
 

Modified: incubator/hama/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/build.xml?rev=1076189&r1=1076188&r2=1076189&view=diff
==============================================================================
--- incubator/hama/trunk/build.xml (original)
+++ incubator/hama/trunk/build.xml Wed Mar  2 12:30:18 2011
@@ -18,7 +18,7 @@
 -->
 
 <project name="hama" default="jar">
-	<property name="version" value="0.2.0-dev" />
+	<property name="version" value="0.2.0" />
 	<property name="Name" value="Hama" />
 	<property name="final.name" value="hama-${version}" />
 	<property name="year" value="2009" />
@@ -91,6 +91,18 @@
 		<copy todir="${build.lib}">
 			<fileset dir="${lib.dir}" />
 		</copy>
+		
+	    <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
+	    <touch millis="0" file="${touch.temp.file}">
+	      <fileset dir="${conf.dir}" includes="**/*.template"/>
+	    </touch>
+	    <delete file="${touch.temp.file}"/>
+
+	    <copy todir="${conf.dir}" verbose="true">
+	      <fileset dir="${conf.dir}" includes="**/*.template"/>
+	      <mapper type="glob" from="*.template" to="*"/>
+	    </copy>
+
 	</target>
 
 	<!-- ================================================================== -->
@@ -127,25 +139,51 @@
 
 	<target name="package" depends="jar,javadoc,examples,compile-test" description="Build distribution">
 		<mkdir dir="${dist.dir}" />
+	    <mkdir dir="${dist.dir}/lib"/>
+	    <mkdir dir="${dist.dir}/bin"/>
+	    <mkdir dir="${dist.dir}/docs"/>
+	    <mkdir dir="${dist.dir}/docs/api"/>
+		
 		<copy todir="${dist.dir}" includeEmptyDirs="false" flatten="true">
 			<fileset dir="${build.dir}">
 				<include name="${final.name}.jar" />
+				<include name="${final.name}-examples.jar" />
 				<include name="${final.name}-test.jar" />
 			</fileset>
 		</copy>
-		<mkdir dir="${dist.dir}/lib" />
+		
+	    <copy todir="${dist.dir}/bin">
+	      <fileset dir="bin"/>
+	    </copy>
+		
+	    <copy todir="${dist.dir}/conf">
+	      <fileset dir="${conf.dir}" excludes="**/*.template"/>
+	    </copy>
+		
 		<copy todir="${dist.dir}/lib">
 			<fileset dir="${build.lib}" />
 		</copy>
+		
+	    <copy todir="${dist.dir}/docs">
+	      <fileset dir="${build.docs}"/>
+	    </copy>
+		
 		<copy todir="${dist.dir}">
 			<fileset dir=".">
 				<include name="*.txt" />
 			</fileset>
 		</copy>
+	    <copy todir="${dist.dir}/" file="build.xml"/>
+		
 		<mkdir dir="${dist.dir}/src" />
 		<copy todir="${dist.dir}/src" includeEmptyDirs="true">
 			<fileset dir="src" excludes="**/*.template **/docs/build/**/*" />
 		</copy>
+		
+		
+	    <chmod perm="ugo+x" type="file" parallel="false">
+	        <fileset dir="${dist.dir}/bin"/>
+	    </chmod>
 	</target>
 
 	<!-- ================================================================== -->

Propchange: incubator/hama/trunk/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar  2 12:30:18 2011
@@ -0,0 +1 @@
+grromservers