Author: niallp
Date: Sun Mar 12 15:47:58 2006
New Revision: 385394

URL: http://svn.apache.org/viewcvs?rev=385394&view=rev
Log:
Correct "el" directory name in source/binary distros - thanks to Henri Yandell.
(note running the "dist" target on the source distro failed because the el 
directory was renamed to "struts-el" - now its not)

Modified:
    struts/action/branches/STRUTS_1_2_BRANCH/build.xml

Modified: struts/action/branches/STRUTS_1_2_BRANCH/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/build.xml?rev=385394&r1=385393&r2=385394&view=diff
==============================================================================
--- struts/action/branches/STRUTS_1_2_BRANCH/build.xml (original)
+++ struts/action/branches/STRUTS_1_2_BRANCH/build.xml Sun Mar 12 15:47:58 2006
@@ -533,8 +533,8 @@
              target="clean" inheritAll="false"/>
         <ant    dir="${struts.el.home}"
              target="dist" inheritAll="false"/>
-        <mkdir  dir="${dist.home}/contrib/struts-el"/>
-        <copy todir="${dist.home}/contrib/struts-el">
+        <mkdir  dir="${dist.home}/contrib/el"/>
+        <copy todir="${dist.home}/contrib/el">
            <fileset dir="${struts.el.home}/dist"/>
         </copy>
     </target>
@@ -595,23 +595,10 @@
                 <exclude name="dist/**"/>
                 <exclude name="release/**"/>
                 <exclude name="lib/**"/>
+                <exclude name="contrib/el/dist/**"/>
+                <exclude name="contrib/el/target/**"/>
             </fileset>
         </copy>
-
-        <!-- struts-el source -->
-        <mkdir dir="${stage.src.dir}/${upload.file.base}-src/contrib"/>
-        <mkdir 
dir="${stage.src.dir}/${upload.file.base}-src/contrib/struts-el"/>
-        <copy 
todir="${stage.src.dir}/${upload.file.base}-src/contrib/struts-el">
-            <fileset dir="${struts.el.home}">
-                <exclude name="build.properties"/>
-                <exclude name="target/**"/>
-                <exclude name="dist/**"/>
-                <exclude name="release/**"/>
-            </fileset>
-        </copy>
-
-        <!-- delete duplicate "el" directory -->
-        <delete dir="${stage.src.dir}/${upload.file.base}-src/contrib/el"/>
 
         <mkdir dir="${upload.dir}"/>
         <zip  zipfile="${upload.dir}/${upload.file.base}-bin.zip"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to