Author: snagel
Date: Tue Sep 18 20:52:08 2012
New Revision: 1387356
URL: http://svn.apache.org/viewvc?rev=1387356&view=rev
Log:
NUTCH-1415 release packages to contain top level folder apache-nutch-x.x
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/build.xml
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1387356&r1=1387355&r2=1387356&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Tue Sep 18 20:52:08 2012
@@ -2,6 +2,8 @@ Nutch Change Log
Release 2.1 - Current Development
+* NUTCH-1415 release packages to contain top level folder apache-nutch-x.x
(snagel)
+
* NUTCH-1432 property storage.schema does not work anymore, should be
storage.schema.webpage and storage.schema.host (lewismc)
* NUTCH-1468 Redirects that are external links not adhering to
db.ignore.external.links (Matt MacDonald via ferdy)
Modified: nutch/branches/2.x/build.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/build.xml?rev=1387356&r1=1387355&r2=1387356&view=diff
==============================================================================
--- nutch/branches/2.x/build.xml (original)
+++ nutch/branches/2.x/build.xml Tue Sep 18 20:52:08 2012
@@ -700,14 +700,13 @@
<!-- ================================================================== -->
<target name="tar-src" depends="package-src" description="--> generate
src.tar.gz distribution package">
<tar compression="gzip" longfile="gnu"
- destfile="${src.dist.version.dir}.tar.gz"
basedir="${src.dist.version.dir}">
- <tarfileset dir="${dist.dir}" mode="664">
- <exclude name="${src.dist.version.dir}/bin/*" />
- <exclude name="${src.dist.version.dir}/runtime/*" />
- <include name="${src.dist.version.dir}/**" />
+ destfile="${src.dist.version.dir}.tar.gz">
+ <tarfileset dir="${src.dist.version.dir}" mode="664"
prefix="${final.name}">
+ <exclude name="src/bin/*" />
+ <include name="**" />
</tarfileset>
- <tarfileset dir="${dist.dir}" mode="755">
- <include name="${src.dist.version.dir}/bin/*" />
+ <tarfileset dir="${src.dist.version.dir}" mode="755"
prefix="${final.name}">
+ <include name="src/bin/*" />
</tarfileset>
</tar>
</target>
@@ -717,13 +716,13 @@
<!-- ================================================================== -->
<target name="tar-bin" depends="package-bin" description="--> generate
bin.tar.gz distribution package">
<tar compression="gzip" longfile="gnu"
- destfile="${bin.dist.version.dir}.tar.gz"
basedir="${bin.dist.version.dir}">
- <tarfileset dir="${dist.dir}" mode="664">
- <exclude name="${bin.dist.version.dir}/bin/*" />
- <include name="${bin.dist.version.dir}/**" />
+ destfile="${bin.dist.version.dir}.tar.gz">
+ <tarfileset dir="${bin.dist.version.dir}" mode="664"
prefix="${final.name}">
+ <exclude name="bin/*" />
+ <include name="**" />
</tarfileset>
- <tarfileset dir="${dist.dir}" mode="755">
- <include name="${bin.dist.version.dir}/bin/*" />
+ <tarfileset dir="${bin.dist.version.dir}" mode="755"
prefix="${final.name}">
+ <include name="bin/*" />
</tarfileset>
</tar>
</target>
@@ -733,14 +732,13 @@
<!-- ================================================================== -->
<target name="zip-src" depends="package-src" description="--> generate
src.zip distribution package">
<zip compress="true" casesensitive="yes"
- destfile="${src.dist.version.dir}.zip" basedir="${src.dist.version.dir}">
- <zipfileset dir="${dist.dir}" filemode="664">
- <exclude name="${src.dist.version.dir}/bin/*" />
- <exclude name="${src.dist.version.dir}/runtime/*" />
- <include name="${src.dist.version.dir}/**" />
+ destfile="${src.dist.version.dir}.zip">
+ <zipfileset dir="${src.dist.version.dir}" filemode="664"
prefix="${final.name}">
+ <exclude name="src/bin/*" />
+ <include name="**" />
</zipfileset>
- <zipfileset dir="${dist.dir}" filemode="755">
- <include name="${src.dist.version.dir}/bin/*" />
+ <zipfileset dir="${src.dist.version.dir}" filemode="755"
prefix="${final.name}">
+ <include name="src/bin/*" />
</zipfileset>
</zip>
</target>
@@ -750,13 +748,13 @@
<!-- ================================================================== -->
<target name="zip-bin" depends="package-bin" description="--> generate
bin.zip distribution package">
<zip compress="true" casesensitive="yes"
- destfile="${bin.dist.version.dir}.zip" basedir="${bin.dist.version.dir}">
- <zipfileset dir="${dist.dir}" filemode="664">
- <exclude name="${bin.dist.version.dir}/bin/*" />
- <include name="${bin.dist.version.dir}/**" />
+ destfile="${bin.dist.version.dir}.zip">
+ <zipfileset dir="${bin.dist.version.dir}" filemode="664"
prefix="${final.name}">
+ <exclude name="bin/*" />
+ <include name="**" />
</zipfileset>
- <zipfileset dir="${dist.dir}" filemode="755">
- <include name="${bin.dist.version.dir}/bin/*" />
+ <zipfileset dir="${bin.dist.version.dir}" filemode="755"
prefix="${final.name}">
+ <include name="bin/*" />
</zipfileset>
</zip>
</target>
