[ http://issues.apache.org/jira/browse/COCOON-445?page=all ]
Helma van der Linden closed COCOON-445:
---------------------------------------
Resolution: Fixed
> [PATCH] build dist-bin broken in HEAD
> -------------------------------------
>
> Key: COCOON-445
> URL: http://issues.apache.org/jira/browse/COCOON-445
> Project: Cocoon
> Type: Bug
> Components: * Cocoon Core
> Versions: 2.0.5-dev (Current CVS)
> Environment: Operating System: All
> Platform: All
> Reporter: Alfred Nathaniel
> Assignee: Cocoon Developers Team
>
> Three different problems:
> 1.) copy tofile/todir mix-up
> 2.) INSTALL file name changed
> 3.) *-block.jar not including in cocoon.war
> Here's the diff 1.269. Sorry, can't use cvs diff due to corporate firewall.
> *** build.xml.orig Fri Sep 27 18:23:38 2002
> --- build.xml Wed Oct 2 14:03:07 2002
> ***************
> *** 1796,1802 ****
> <include name="*.properties"/>
> </fileset>
> </copy>
> ! <copy file="INSTALL.src" tofile="${dist.src}/INSTALL" filtering="on"/>
>
> <chmod perm="+x" file="${dist.src}/run.sh"/>
> <chmod perm="+x" file="${dist.src}/build.sh"/>
> --- 1796,1802 ----
> <include name="*.properties"/>
> </fileset>
> </copy>
> ! <copy file="INSTALL-SRC.txt" tofile="${dist.src}/INSTALL"
> filtering="on"/>
>
> <chmod perm="+x" file="${dist.src}/run.sh"/>
> <chmod perm="+x" file="${dist.src}/build.sh"/>
> ***************
> *** 1862,1872 ****
> <exclude name="servlet*.jar"/>
> </fileset>
> </copy>
>
> <copy file="${build.dir}/${name}.jar"
> tofile="${dist.bin}/webapp/WEB-INF/lib/${name}-${version}.jar"/>
> <copy file="${build.dir}/${name}-samples.jar"
> ! tofile="${dist.bin}/webapp/WEB-INF/lib/"/>
>
> <copy todir="${dist.bin}/docs">
> <fileset dir="${build.docs}"/>
> --- 1862,1878 ----
> <exclude name="servlet*.jar"/>
> </fileset>
> </copy>
> + <copy todir="${dist.bin}/webapp/WEB-INF/lib">
> + <fileset dir="${build.dir}">
> + <include name="*-block.jar"/>
> + </fileset>
> + <mapper type="glob" from="*-block.jar" to="cocoon-*-block.jar"/>
> + </copy>
>
> <copy file="${build.dir}/${name}.jar"
> tofile="${dist.bin}/webapp/WEB-INF/lib/${name}-${version}.jar"/>
> <copy file="${build.dir}/${name}-samples.jar"
> ! todir="${dist.bin}/webapp/WEB-INF/lib/"/>
>
> <copy todir="${dist.bin}/docs">
> <fileset dir="${build.docs}"/>
> ***************
> *** 1890,1896 ****
> <include name="KEYS"/>
> </fileset>
> </copy>
> ! <copy file="INSTALL.bin" tofile="${dist.bin}/INSTALL" filtering="on"/>
>
> <!-- Build the war file -->
> <jar jarfile="${dist.bin}/${name}.war"
> --- 1896,1902 ----
> <include name="KEYS"/>
> </fileset>
> </copy>
> ! <copy file="INSTALL-BIN.txt" tofile="${dist.bin}/INSTALL"
> filtering="on"/>
>
> <!-- Build the war file -->
> <jar jarfile="${dist.bin}/${name}.war"
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
http://www.atlassian.com/software/jira
