forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r406816 - /forrest/trunk/main/targets/site.xml
Date Tue, 16 May 2006 03:58:41 GMT
Author: crossley
Date: Mon May 15 20:58:39 2006
New Revision: 406816

URL: http://svn.apache.org/viewcvs?rev=406816&view=rev
Log:
Ant task fixcrlf with default @eol is broken on Mac OS X (see Ant bug 39585)
so add a workaround.
Issue: FOR-492

Modified:
    forrest/trunk/main/targets/site.xml

Modified: forrest/trunk/main/targets/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/site.xml?rev=406816&r1=406815&r2=406816&view=diff
==============================================================================
--- forrest/trunk/main/targets/site.xml (original)
+++ forrest/trunk/main/targets/site.xml Mon May 15 20:58:39 2006
@@ -192,10 +192,26 @@
     <!-- Fix inconsistent line endings. Workaround for FOR-492
       Default "eol" attribute will set line endings appropriate to current OS.
     -->
-    <fixcrlf srcdir="${project.site-dir}">
-      <include name="**/*.html"/>
-    </fixcrlf>
-    
+<!-- However, due to Ant bug 39585, fixcrlf/@eol is broken on "Mac OS X" so
+     add another workaround.
+-->
+    <condition property="isUnix">
+      <os family="unix"/>
+    </condition>
+    <if>
+      <equals arg1="${isUnix}" arg2="true"/>
+      <then>
+        <fixcrlf srcdir="${project.site-dir}" eol="unix">
+          <include name="**/*.html"/>
+        </fixcrlf>
+      </then>
+      <else>
+        <fixcrlf srcdir="${project.site-dir}">
+          <include name="**/*.html"/>
+        </fixcrlf>
+      </else>
+    </if>
+
     <echo>
 -----------------------------
 Static site was successfully generated at:



Mime
View raw message