Author: lewismc Date: Wed May 30 21:42:49 2012 New Revision: 1344477 URL: http://svn.apache.org/viewvc?rev=1344477&view=rev Log: commit to backport release1.5 changes to trunk
Modified: nutch/trunk/build.xml nutch/trunk/conf/nutch-default.xml nutch/trunk/default.properties Modified: nutch/trunk/build.xml URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1344477&r1=1344476&r2=1344477&view=diff ============================================================================== --- nutch/trunk/build.xml (original) +++ nutch/trunk/build.xml Wed May 30 21:42:49 2012 @@ -422,7 +422,7 @@ <ant dir="src/plugin" target="test" inheritAll="false"/> </target> - <target name="nightly" depends="test, tar"> + <target name="nightly" depends="test, tar-src, zip-src"> </target> <!-- ================================================================== --> @@ -596,96 +596,98 @@ includes="nutch-default.xml" style="conf/nutch-conf.xsl"/> </target> - <!-- ================================================================== --> + <!-- ================================================================== --> <!-- D I S T R I B U T I O N --> <!-- ================================================================== --> <!-- --> <!-- ================================================================== --> <target name="package-src" depends="runtime, javadoc"> - <mkdir dir="${dist.version.dir}-src"/> - <mkdir dir="${dist.version.dir}-src/lib"/> - <mkdir dir="${dist.version.dir}-src/runtime"/> - <mkdir dir="${dist.version.dir}-src/docs"/> - <mkdir dir="${dist.version.dir}-src/docs/api"/> - <mkdir dir="${dist.version.dir}-src/ivy"/> + <mkdir dir="${dist.dir}"/> + <mkdir dir="${src.dist.version.dir}"/> + <mkdir dir="${src.dist.version.dir}/lib"/> + <mkdir dir="${src.dist.version.dir}/runtime"/> + <mkdir dir="${src.dist.version.dir}/docs"/> + <mkdir dir="${src.dist.version.dir}/docs/api"/> + <mkdir dir="${src.dist.version.dir}/ivy"/> - <copy todir="${dist.version.dir}-src/lib" includeEmptyDirs="false"> + <copy todir="${src.dist.version.dir}/lib" includeEmptyDirs="false"> <fileset dir="lib"/> </copy> - <copy todir="${dist.version.dir}-src/runtime"> + <copy todir="${src.dist.version.dir}/runtime"> <fileset dir="runtime"/> </copy> <chmod perm="ugo+x" type="file"> - <fileset dir="${dist.version.dir}-src/runtime/deploy/bin"/> - <fileset dir="${dist.version.dir}-src/runtime/local/bin"/> + <fileset dir="${src.dist.version.dir}/runtime/deploy/bin"/> + <fileset dir="${src.dist.version.dir}/runtime/local/bin"/> </chmod> - <copy todir="${dist.version.dir}-src/conf"> + <copy todir="${src.dist.version.dir}/conf"> <fileset dir="${conf.dir}" excludes="**/*.template"/> </copy> - <copy todir="${dist.version.dir}-src/docs/api"> + <copy todir="${src.dist.version.dir}/docs/api"> <fileset dir="${build.javadoc}"/> </copy> - <copy todir="${dist.version.dir}-src"> + <copy todir="${src.dist.version.dir}"> <fileset dir="."> <include name="*.txt" /> <!--<include name="KEYS" />--> </fileset> </copy> - <copy todir="${dist.version.dir}-src/src" includeEmptyDirs="true"> + <copy todir="${src.dist.version.dir}/src" includeEmptyDirs="true"> <fileset dir="src"/> </copy> - <copy todir="${dist.version.dir}-src/ivy" includeEmptyDirs="true"> + <copy todir="${src.dist.version.dir}/ivy" includeEmptyDirs="true"> <fileset dir="ivy"/> </copy> - <copy todir="${dist.version.dir}-src/" file="build.xml"/> - <copy todir="${dist.version.dir}-src/" file="default.properties"/> + <copy todir="${src.dist.version.dir}/" file="build.xml"/> + <copy todir="${src.dist.version.dir}/" file="default.properties"/> </target> <target name="package-bin" depends="runtime, javadoc"> - <mkdir dir="${dist.version.dir}-bin"/> - <mkdir dir="${dist.version.dir}-bin/lib"/> - <mkdir dir="${dist.version.dir}-bin/bin"/> - <mkdir dir="${dist.version.dir}-bin/conf"/> - <mkdir dir="${dist.version.dir}-bin/docs"/> - <mkdir dir="${dist.version.dir}-bin/docs/api"/> - <mkdir dir="${dist.version.dir}-bin/plugins"/> + <mkdir dir="${dist.dir}"/> + <mkdir dir="${bin.dist.version.dir}"/> + <mkdir dir="${bin.dist.version.dir}/lib"/> + <mkdir dir="${bin.dist.version.dir}/bin"/> + <mkdir dir="${bin.dist.version.dir}/conf"/> + <mkdir dir="${bin.dist.version.dir}/docs"/> + <mkdir dir="${bin.dist.version.dir}/docs/api"/> + <mkdir dir="${bin.dist.version.dir}/plugins"/> - <copy todir="${dist.version.dir}-bin/lib" includeEmptyDirs="false"> + <copy todir="${bin.dist.version.dir}/lib" includeEmptyDirs="false"> <fileset dir="runtime/local/lib"/> </copy> - <copy todir="${dist.version.dir}-bin/bin"> + <copy todir="${bin.dist.version.dir}/bin"> <fileset dir="runtime/local/bin"/> </copy> <chmod perm="ugo+x" type="file"> - <fileset dir="${dist.version.dir}-bin/bin"/> + <fileset dir="${bin.dist.version.dir}/bin"/> </chmod> - <copy todir="${dist.version.dir}-bin/conf"> + <copy todir="${bin.dist.version.dir}/conf"> <fileset dir="runtime/local/conf" excludes="**/*.template"/> </copy> - <copy todir="${dist.version.dir}-bin/docs/api"> + <copy todir="${bin.dist.version.dir}/docs/api"> <fileset dir="${build.javadoc}"/> </copy> - <copy todir="${dist.version.dir}-bin"> + <copy todir="${bin.dist.version.dir}"> <fileset dir="."> <include name="*.txt" /> </fileset> </copy> - <copy todir="${dist.version.dir}-bin/plugins" includeEmptyDirs="true"> + <copy todir="${bin.dist.version.dir}/plugins" includeEmptyDirs="true"> <fileset dir="runtime/local/plugins"/> </copy> @@ -694,15 +696,15 @@ <!-- ================================================================== --> <!-- Make src release tarball --> <!-- ================================================================== --> - <target name="tar" depends="package-src"> + <target name="tar-src" depends="package-src"> <tar compression="gzip" longfile="gnu" - destfile="${dist.dir}/${final.name}-src.tar.gz"> + destfile="${src.dist.version.dir}.tar.gz" basedir="${src.dist.version.dir}"> <tarfileset dir="${dist.dir}" mode="664"> - <exclude name="${final.name}/bin/*" /> - <include name="${final.name}/**" /> + <exclude name="${src.dist.version.dir}/bin/*" /> + <include name="${src.dist.version.dir}/**" /> </tarfileset> <tarfileset dir="${dist.dir}" mode="755"> - <include name="${final.name}/bin/*" /> + <include name="${src.dist.version.dir}/bin/*" /> </tarfileset> </tar> </target> @@ -712,13 +714,13 @@ <!-- ================================================================== --> <target name="tar-bin" depends="package-bin"> <tar compression="gzip" longfile="gnu" - destfile="${dist.dir}/${final.name}-bin.tar.gz"> + destfile="${bin.dist.version.dir}.tar.gz" basedir="${bin.dist.version.dir}"> <tarfileset dir="${dist.dir}" mode="664"> - <exclude name="${final.name}/bin/*" /> - <include name="${final.name}/**" /> + <exclude name="${bin.dist.version.dir}/bin/*" /> + <include name="${bin.dist.version.dir}/**" /> </tarfileset> <tarfileset dir="${dist.dir}" mode="755"> - <include name="${final.name}/bin/*" /> + <include name="${bin.dist.version.dir}/bin/*" /> </tarfileset> </tar> </target> @@ -726,14 +728,15 @@ <!-- ================================================================== --> <!-- Make src release zip --> <!-- ================================================================== --> - <target name="zip" depends="package-src"> - <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}-src.zip"> + <target name="zip-src" depends="package-src"> + <zip compress="true" casesensitive="yes" + destfile="${src.dist.version.dir}.zip" basedir="${src.dist.version.dir}"> <zipfileset dir="${dist.dir}" filemode="664"> - <exclude name="${final.name}/bin/*" /> - <include name="${final.name}/**" /> + <exclude name="${src.dist.version.dir}/bin/*" /> + <include name="${src.dist.version.dir}/**" /> </zipfileset> <zipfileset dir="${dist.dir}" filemode="755"> - <include name="${final.name}/bin/*" /> + <include name="${src.dist.version.dir}/bin/*" /> </zipfileset> </zip> </target> @@ -742,13 +745,14 @@ <!-- Make bin release zip --> <!-- ================================================================== --> <target name="zip-bin" depends="package-bin"> - <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}-bin.zip"> + <zip compress="true" casesensitive="yes" + destfile="${bin.dist.version.dir}.zip" basedir="${bin.dist.version.dir}"> <zipfileset dir="${dist.dir}" filemode="664"> - <exclude name="${final.name}/bin/*" /> - <include name="${final.name}/**" /> + <exclude name="${bin.dist.version.dir}/bin/*" /> + <include name="${bin.dist.version.dir}/**" /> </zipfileset> <zipfileset dir="${dist.dir}" filemode="755"> - <include name="${final.name}/bin/*" /> + <include name="${bin.dist.version.dir}/bin/*" /> </zipfileset> </zip> </target> Modified: nutch/trunk/conf/nutch-default.xml URL: http://svn.apache.org/viewvc/nutch/trunk/conf/nutch-default.xml?rev=1344477&r1=1344476&r2=1344477&view=diff ============================================================================== --- nutch/trunk/conf/nutch-default.xml (original) +++ nutch/trunk/conf/nutch-default.xml Wed May 30 21:42:49 2012 @@ -123,7 +123,7 @@ <property> <name>http.agent.version</name> - <value>Nutch-1.5</value> + <value>Nutch-1.6-SNAPSHOT</value> <description>A version string to advertise in the User-Agent header.</description> </property> Modified: nutch/trunk/default.properties URL: http://svn.apache.org/viewvc/nutch/trunk/default.properties?rev=1344477&r1=1344476&r2=1344477&view=diff ============================================================================== --- nutch/trunk/default.properties (original) +++ nutch/trunk/default.properties Wed May 30 21:42:49 2012 @@ -1,5 +1,5 @@ -name=nutch -version=1.5 +name=apache-nutch +version=1.6-SNAPSHOT final.name=${name}-${version} year=2012 @@ -32,7 +32,8 @@ javadoc.link.hadoop=http://hadoop.apache javadoc.packages=org.apache.nutch.* dist.dir=./dist -dist.version.dir=${dist.dir}/${final.name} +src.dist.version.dir=${dist.dir}/${final.name}-src +bin.dist.version.dir=${dist.dir}/${final.name}-bin javac.debug=on javac.optimize=on