geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r350189 - /geronimo/trunk/modules/assembly/maven.xml
Date Thu, 01 Dec 2005 06:39:33 GMT
Author: jsisson
Date: Wed Nov 30 22:39:23 2005
New Revision: 350189

URL: http://svn.apache.org/viewcvs?rev=350189&view=rev
Log:
GERONIMO-1232 - Fix startup.sh is not executable issue.
Set mode of 755 on *.sh files in ant tar task. Also add fixcrlf processing to assembly:build
goal to ensure shell scripts only have LFs and batch files have CRLFs.

Modified:
    geronimo/trunk/modules/assembly/maven.xml

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=350189&r1=350188&r2=350189&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Nov 30 22:39:23 2005
@@ -690,10 +690,26 @@
         <m:makeRelativePath var="geronimo.assembly.dir.name"
             basedir="${geronimo.assembly.dir}/.."
             path="${geronimo.assembly.dir}"/>
+        <!--fixcrlf processing needed so:
+        1. Shell scripts only have LFs, as CRs cause the scripts to abort
+           and the CRs also appear as ^M in editors such as vi.
+        2. Batch files on windows should contain CRLFs so they are editable
+           using notepad (the default editor in Windows) -->	    
+        <ant:fixcrlf srcdir="${geronimo.assembly.dir}/.." 
+            includes="${geronimo.assembly.dir.name}/bin/*.sh" eol="lf" />
+        <ant:fixcrlf srcdir="${geronimo.assembly.dir}/.." 
+            includes="${geronimo.assembly.dir.name}/bin/*.bat" eol="crlf" />
+
+        <!-- build a tar.gz file ensuring execute permission is set for
+            shell script files on the tar task so it works on windows -->
         <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
             <ant:tar longfile="gnu" compression="gzip" tarfile="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz">
                 <ant:tarfileset dir="${geronimo.assembly.dir}/..">
                     <ant:include name="${geronimo.assembly.dir.name}/**"/>
+                    <ant:exclude name="${geronimo.assembly.dir.name}/bin/*.sh"/>
+                </ant:tarfileset>
+                <ant:tarfileset dir="${geronimo.assembly.dir}/.." mode="755">
+                    <ant:include name="${geronimo.assembly.dir.name}/bin/*.sh"/>
                 </ant:tarfileset>
             </ant:tar>
             <checksum file="${geronimo.assembly.distributions.dir}/${maven.final.name}.tar.gz"
algorithm="MD5" fileext=".md5"/>



Mime
View raw message