Author: lewismc Date: Tue May 22 20:07:55 2012 New Revision: 1341603 URL: http://svn.apache.org/viewvc?rev=1341603&view=rev Log: commit to add new ant targets to build.xml
Modified: nutch/trunk/CHANGES.txt nutch/trunk/build.xml Modified: nutch/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1341603&r1=1341602&r2=1341603&view=diff ============================================================================== --- nutch/trunk/CHANGES.txt (original) +++ nutch/trunk/CHANGES.txt Tue May 22 20:07:55 2012 @@ -1,5 +1,9 @@ Nutch Change Log +(trunk) Current Development: + +* NUTCH-XX Commit to add configuration for separation of ant distribution targets (lewismc + jnioche) + Release 1.5 - 04/15/2012 * NUTCH-1208 Don't include KEYS file in bin distribution (jnioche) Modified: nutch/trunk/build.xml URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1341603&r1=1341602&r2=1341603&view=diff ============================================================================== --- nutch/trunk/build.xml (original) +++ nutch/trunk/build.xml Tue May 22 20:07:55 2012 @@ -601,52 +601,52 @@ <!-- ================================================================== --> <!-- --> <!-- ================================================================== --> - <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"/> + <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}/lib" includeEmptyDirs="false"> + <copy todir="${dist.version.dir}-src/lib" includeEmptyDirs="false"> <fileset dir="lib"/> </copy> - <copy todir="${dist.version.dir}/runtime"> + <copy todir="${dist.version.dir}-src/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"/> + <fileset dir="${dist.version.dir}-src/runtime/deploy/bin"/> + <fileset dir="${dist.version.dir}-src/runtime/local/bin"/> </chmod> - <copy todir="${dist.version.dir}/conf"> + <copy todir="${dist.version.dir}-src/conf"> <fileset dir="${conf.dir}" excludes="**/*.template"/> </copy> - <copy todir="${dist.version.dir}/docs/api"> + <copy todir="${dist.version.dir}-src/docs/api"> <fileset dir="${build.javadoc}"/> </copy> - <copy todir="${dist.version.dir}"> + <copy todir="${dist.version.dir}-src"> <fileset dir="."> <include name="*.txt" /> <!--<include name="KEYS" />--> </fileset> </copy> - <copy todir="${dist.version.dir}/src" includeEmptyDirs="true"> + <copy todir="${dist.version.dir}-src/src" includeEmptyDirs="true"> <fileset dir="src"/> </copy> - <copy todir="${dist.version.dir}/ivy" includeEmptyDirs="true"> + <copy todir="${dist.version.dir}-src/ivy" includeEmptyDirs="true"> <fileset dir="ivy"/> </copy> - <copy todir="${dist.version.dir}/" file="build.xml"/> - <copy todir="${dist.version.dir}/" file="default.properties"/> + <copy todir="${dist.version.dir}-src/" file="build.xml"/> + <copy todir="${dist.version.dir}-src/" file="default.properties"/> </target> @@ -696,7 +696,23 @@ <!-- ================================================================== --> <target name="tar" depends="package"> <tar compression="gzip" longfile="gnu" - destfile="${dist.dir}/${final.name}.tar.gz"> + 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"> + <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}/**" /> @@ -710,8 +726,23 @@ <!-- ================================================================== --> <!-- Make release zip --> <!-- ================================================================== --> - <target name="zip" depends="package"> - <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}.zip"> + <target name="zip" depends="package-bin"> + <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}/**" /> + </zipfileset> + <zipfileset dir="${dist.dir}" filemode="755"> + <include name="${final.name}/bin/*" /> + </zipfileset> + </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}/**" />