Changeset 20204

Timestamp:

2009-08-11T10:54:32+12:00 (14 years ago)

Author:

oranfry

Message:

added more tests to dcff task

Location:

other-projects/trunk/anttasks

Files:

• build.xml (modified) (2 diffs)
• src/test/dcff.txt (modified) (1 diff)

other-projects/trunk/anttasks/build.xml

@@ -40 +40 @@
         <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="test.classpath"/>
         <typedef name="gpv" classname="org.greenstone.anttasks.GetPropertyValue" classpathref="test.classpath"/>
-        <typedef name="sevenzip" classname="org.greenstone.anttasks.WindowsSevenZipWrapper" classpathref="test.classpath"/>
         <mkdir dir="test"/>
     </target>
@@ -114 +113 @@
         <dcff file="test/dcff4.txt" startTag="&lt;!--start--&gt;" endTag="&lt;!--end--&gt;"/>
 
+        <!-- test 5 -->
+        <copy file="src/test/dcff.txt" tofile="test/dcff5.txt"/>
+        <dcff file="test/dcff5.txt" startTag="&lt;!--\s*if\s*(?!.*linux)[^ ]+\s*--&gt;" endTag="&lt;!--\s*/if\s*--&gt;" />
+
+
         </target>
 

other-projects/trunk/anttasks/src/test/dcff.txt

@@ -16 +16 @@
 more text
 b<!--start-->row<!--end-->n
+
+<!-- if linux -->
+linux stuff
+<!-- /if -->
+<!-- if windows -->
+windows stuff -->
+<!-- /if -->
+<!-- if mac|windows -->
+mac and windows stuff
+<!-- /if -->
+
 even more text