DO NOT REPLY [Bug 13220] New: - [PATCH] build dist-bin broken in HEAD

[bu...@apache.org]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13220>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13220

[PATCH] build dist-bin broken in HEAD

           Summary: [PATCH] build dist-bin broken in HEAD
           Product: Cocoon 2
           Version: Current CVS
          Platform: All
        OS/Version: All
            Status: NEW
          Severity: Normal
          Priority: Other
         Component: core
        AssignedTo: cocoon-dev@xml.apache.org
        ReportedBy: Alfred.Nathaniel@swx.com


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"

---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org