You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2012/05/22 22:18:23 UTC
svn commit: r1341609 - in /nutch/branches/nutchgora: CHANGES.txt build.xml
conf/nutch-default.xml default.properties
Author: lewismc
Date: Tue May 22 20:18:22 2012
New Revision: 1341609
URL: http://svn.apache.org/viewvc?rev=1341609&view=rev
Log:
final commit before rolling 2.0RC
Modified:
nutch/branches/nutchgora/CHANGES.txt
nutch/branches/nutchgora/build.xml
nutch/branches/nutchgora/conf/nutch-default.xml
nutch/branches/nutchgora/default.properties
Modified: nutch/branches/nutchgora/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/CHANGES.txt?rev=1341609&r1=1341608&r2=1341609&view=diff
==============================================================================
--- nutch/branches/nutchgora/CHANGES.txt (original)
+++ nutch/branches/nutchgora/CHANGES.txt Tue May 22 20:18:22 2012
@@ -1,6 +1,8 @@
Nutch Change Log
-Release nutchgora - Current Development
+Release 2.1 (22/02/2012)
+
+* NUTCH-XX Commit to add configuration for separation of ant distribution targets (lewismc + jnioche)
* NUTCH-1364 Add a counter for malformed urls (Jason Trost via lewismc)
Modified: nutch/branches/nutchgora/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/build.xml?rev=1341609&r1=1341608&r2=1341609&view=diff
==============================================================================
--- nutch/branches/nutchgora/build.xml (original)
+++ nutch/branches/nutchgora/build.xml Tue May 22 20:18:22 2012
@@ -600,59 +600,59 @@
</target>
<!-- ================================================================== -->
- <!-- D I S T R I B U T I O N -->
- <!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="package" depends="runtime, javadoc">
- <mkdir dir="${dist.version.dir}" />
- <mkdir dir="${dist.version.dir}/lib" />
- <mkdir dir="${dist.version.dir}/runtime" />
- <mkdir dir="${dist.version.dir}/docs" />
- <mkdir dir="${dist.version.dir}/docs/api" />
- <mkdir dir="${dist.version.dir}/ivy" />
-
- <copy todir="${dist.version.dir}/lib" includeEmptyDirs="false">
- <fileset dir="lib" />
- </copy>
-
- <copy todir="${dist.version.dir}/runtime">
- <fileset dir="runtime" />
- </copy>
-
- <chmod perm="ugo+x" type="file">
- <fileset dir="${dist.version.dir}/runtime/deploy/bin" />
- <fileset dir="${dist.version.dir}/runtime/local/bin" />
- </chmod>
-
- <copy todir="${dist.version.dir}/conf">
- <fileset dir="${conf.dir}" excludes="**/*.template" />
- </copy>
-
- <copy todir="${dist.version.dir}/docs/api">
- <fileset dir="${build.javadoc}" />
- </copy>
-
- <copy todir="${dist.version.dir}">
- <fileset dir=".">
- <include name="*.txt" />
- <include name="KEYS" />
- </fileset>
- </copy>
+ <!-- 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"/>
- <copy todir="${dist.version.dir}/src" includeEmptyDirs="true">
- <fileset dir="src" />
- </copy>
+ <copy todir="${dist.version.dir}-src/lib" includeEmptyDirs="false">
+ <fileset dir="lib"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-src/runtime">
+ <fileset dir="runtime"/>
+ </copy>
- <copy todir="${dist.version.dir}/ivy" includeEmptyDirs="true">
- <fileset dir="ivy" />
- </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"/>
+ </chmod>
- <copy todir="${dist.version.dir}/" file="build.xml" />
- <copy todir="${dist.version.dir}/" file="default.properties" />
+ <copy todir="${dist.version.dir}-src/conf">
+ <fileset dir="${conf.dir}" excludes="**/*.template"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-src/docs/api">
+ <fileset dir="${build.javadoc}"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-src">
+ <fileset dir=".">
+ <include name="*.txt" />
+ <!--<include name="KEYS" />-->
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.version.dir}-src/src" includeEmptyDirs="true">
+ <fileset dir="src"/>
+ </copy>
+
+ <copy todir="${dist.version.dir}-src/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"/>
+
+ </target>
- </target>
-
<target name="package-bin" depends="runtime, javadoc">
<mkdir dir="${dist.version.dir}-bin"/>
<mkdir dir="${dist.version.dir}-bin/lib"/>
@@ -694,36 +694,67 @@
</target>
- <!-- ================================================================== -->
- <!-- Make release tarball -->
- <!-- ================================================================== -->
- <target name="tar" depends="package">
- <tar compression="gzip" longfile="gnu"
- destfile="${dist.dir}/${final.name}.tar.gz">
- <tarfileset dir="${dist.dir}" mode="664">
- <exclude name="${final.name}/bin/*" />
- <include name="${final.name}/**" />
- </tarfileset>
- <tarfileset dir="${dist.dir}" mode="755">
- <include name="${final.name}/bin/*" />
- </tarfileset>
- </tar>
- </target>
+ <!-- ================================================================== -->
+ <!-- Make src-release tarball -->
+ <!-- ================================================================== -->
+ <target name="tar" depends="package-src">
+ <tar compression="gzip" longfile="gnu"
+ destfile="${dist.dir}/${final.name}-src.tar.gz">
+ <tarfileset dir="${dist.dir}" mode="664">
+ <exclude name="${final.name}/bin/*" />
+ <include name="${final.name}/**" />
+ </tarfileset>
+ <tarfileset dir="${dist.dir}" mode="755">
+ <include name="${final.name}/bin/*" />
+ </tarfileset>
+ </tar>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Make bin release tarball -->
+ <!-- ================================================================== -->
+ <target name="tar-bin" depends="package-bin">
+ <tar compression="gzip" longfile="gnu"
+ destfile="${dist.dir}/${final.name}-bin.tar.gz">
+ <tarfileset dir="${dist.dir}" mode="664">
+ <exclude name="${final.name}/bin/*" />
+ <include name="${final.name}/**" />
+ </tarfileset>
+ <tarfileset dir="${dist.dir}" mode="755">
+ <include name="${final.name}/bin/*" />
+ </tarfileset>
+ </tar>
+ </target>
- <!-- ================================================================== -->
- <!-- Make release tarball -->
- <!-- ================================================================== -->
- <target name="zip" depends="package">
- <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}.zip">
+ <!-- ================================================================== -->
+ <!-- Make src release zip -->
+ <!-- ================================================================== -->
+ <target name="zip" depends="package-src">
+ <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}-src.zip">
<zipfileset dir="${dist.dir}" filemode="664">
- <exclude name="${final.name}/bin/*" />
- <include name="${final.name}/**" />
+ <exclude name="${final.name}/bin/*" />
+ <include name="${final.name}/**" />
</zipfileset>
<zipfileset dir="${dist.dir}" filemode="755">
- <include name="${final.name}/bin/*" />
+ <include name="${final.name}/bin/*" />
</zipfileset>
- </zip>
- </target>
+ </zip>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Make bin release zip -->
+ <!-- ================================================================== -->
+ <target name="zip-bin" depends="package-bin">
+ <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}-bin.zip">
+ <zipfileset dir="${dist.dir}" filemode="664">
+ <exclude name="${final.name}/bin/*" />
+ <include name="${final.name}/**" />
+ </zipfileset>
+ <zipfileset dir="${dist.dir}" filemode="755">
+ <include name="${final.name}/bin/*" />
+ </zipfileset>
+ </zip>
+ </target>
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
Modified: nutch/branches/nutchgora/conf/nutch-default.xml
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/conf/nutch-default.xml?rev=1341609&r1=1341608&r2=1341609&view=diff
==============================================================================
--- nutch/branches/nutchgora/conf/nutch-default.xml (original)
+++ nutch/branches/nutchgora/conf/nutch-default.xml Tue May 22 20:18:22 2012
@@ -125,7 +125,7 @@
<property>
<name>http.agent.version</name>
- <value>Nutch-2.0-dev</value>
+ <value>Nutch-2.0</value>
<description>A version string to advertise in the User-Agent
header.</description>
</property>
Modified: nutch/branches/nutchgora/default.properties
URL: http://svn.apache.org/viewvc/nutch/branches/nutchgora/default.properties?rev=1341609&r1=1341608&r2=1341609&view=diff
==============================================================================
--- nutch/branches/nutchgora/default.properties (original)
+++ nutch/branches/nutchgora/default.properties Tue May 22 20:18:22 2012
@@ -14,8 +14,8 @@
# limitations under the License.
-name=Nutch
-version=2.0-dev
+name=nutch
+version=2.0
final.name=${name}-${version}
year=2012