geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsis...@apache.org
Subject svn commit: r356035 - /geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
Date Sun, 11 Dec 2005 21:42:21 GMT
Author: jsisson
Date: Sun Dec 11 13:41:57 2005
New Revision: 356035

URL: http://svn.apache.org/viewcvs?rev=356035&view=rev
Log:
revert changes accidentally checked in with svn property changes

Modified:
    geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly

Modified: geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly?rev=356035&r1=356034&r2=356035&view=diff
==============================================================================
--- geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.0/plugins/geronimo-assembly-plugin/plugin.jelly Sun Dec 11 13:41:57
2005
@@ -237,51 +237,7 @@
         <!-- Create a tar.gz file 
              Explicitly set execute permission on script files so builds on windows are consistent
with unix -->
 
-        <!-- Establish patternset used by later fixcrlf processing -->
-        <ant:fileset dir="${geronimo.assembly.dest}" >
-            <ant:patternset id="geronimo.fixcrlf.patternset">
-                <ant:include name="**/*.bat" />
-                <ant:include name="**/*.dtd" />
-                <ant:include name="**/*.properties" />
-                <ant:include name="**/*.sh" />
-                <ant:include name="**/*.txt" />
-                <ant:include name="**/*.xml" />
-                <ant:include name="**/*.xsd" />
-                <ant:include name="STATUS" />
-            </ant:patternset>
-        </ant:fileset>
-
-        <!-- Create a zip file -->
-        <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
-            <ant:echo>Preparing CRLF line endings in text based files for zip distribution</ant:echo>
-            <!-- The zip distribution shall have CRLF line endings and is
-                 targeted at Windows platforms.  Non-Windows platforms should
-                 use the tar distribution, as it contains extra file attributes
-                 such as permissions.
-                 Since we cannot assume we are running on a Windows platform, 
-                 we fix line endings in the zip distribution to be LF's. -->
-            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="crlf"> 
-                <patternset refid="geronimo.fixcrlf.patternset"/>
-            </ant:fixcrlf>
-
-            <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
-                <ant:zipfileset dir="${geronimo.assembly.dest}/..">
-                    <ant:include name="${geronimo.assembly.name}/**"/>
-                    <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
-                </ant:zipfileset>
-            </ant:zip>
-            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="MD5"
fileext=".md5"/>
-            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="SHA"
fileext=".sha"/>
-        </j:if>
-    </goal>
-
         <j:if test="${context.getVariable('geronimo.assembly.tar') == 'true'}">
-            <ant:echo>Preparing LF line endings in text based files for tar.gz distribution</ant:echo>
-
-            <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
-                <patternset refid="geronimo.fixcrlf.patternset"/>
-            </ant:fixcrlf>
-
             <ant:tar longfile="gnu" compression="gzip" tarfile="${maven.build.dir}/${maven.final.name}.tar.gz">
                 <ant:tarfileset dir="${geronimo.assembly.dest}/..">
                     <ant:include name="${geronimo.assembly.name}/**"/>
@@ -296,15 +252,18 @@
             <checksum file="${maven.build.dir}/${maven.final.name}.tar.gz" algorithm="SHA"
fileext=".sha"/>
         </j:if>
 
-        <!-- Ensure the files in the assembly directory are left with LF endings 
-             for Geronimo developers who may run Geronimo from there. -->
+        <!-- Create a zip file -->
         <j:if test="${context.getVariable('geronimo.assembly.zip') == 'true'}">
-            <j:if test="${context.getVariable('geronimo.assembly.tar') != 'true'}">
-                <ant:fixcrlf srcdir="${geronimo.assembly.dest}" eol="lf"> 
-                    <patternset refid="geronimo.fixcrlf.patternset"/>
-                </ant:fixcrlf>
-            </j:if>
+            <ant:zip zipfile="${maven.build.dir}/${maven.final.name}.zip">
+                <ant:zipfileset dir="${geronimo.assembly.dest}/..">
+                    <ant:include name="${geronimo.assembly.name}/**"/>
+                    <ant:exclude name="${geronimo.assembly.name}/var/log/*.log"/>
+                </ant:zipfileset>
+            </ant:zip>
+            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="MD5"
fileext=".md5"/>
+            <checksum file="${maven.build.dir}/${maven.final.name}.zip" algorithm="SHA"
fileext=".sha"/>
         </j:if>
+    </goal>
 
     <!-- Maven artifict tags are broken so we must copy by hand -->
     <goal name="assemble:install" description="Deploy a binary distribution" prereqs="clean,assemble:package-assembly">



Mime
View raw message