ooo-build r12962 - in trunk: . patches/dev300

[michael svn gnome org]

Author: michael
Date: Wed Jun 25 11:30:45 2008
New Revision: 12962
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12962&view=rev

Log:
2008-06-25  Michael Meeks  <michael meeks novell com>

        * patches/dev300/ant-test.diff,
        * patches/dev300/apply: check for ant regex.



Added:
   trunk/patches/dev300/ant-test.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Added: trunk/patches/dev300/ant-test.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ant-test.diff	Wed Jun 25 11:30:45 2008
@@ -0,0 +1,45 @@
+Index: config_office/configure.in
+===================================================================
+RCS file: /cvs/tools/config_office/configure.in,v
+retrieving revision 1.270
+diff -u -p -r1.270 configure.in
+--- config_office/configure.in	6 Jun 2008 12:05:12 -0000	1.270
++++ config_office/configure.in	25 Jun 2008 11:28:30 -0000
+@@ -5890,13 +6085,20 @@ cat > conftest.java << EOF
+ 	}
+     }
+ EOF
+-
++mkdir confdir
+ cat > conftest.xml << EOF
+     <project name="conftest" default="conftest">
+-	<target name="conftest">
++	<target name="conftest" depends="copytest">
+             <javac srcdir="." includes="conftest.java">
+ 	    </javac>
+ 	</target>
++	<target name="copytest">
++            <copy todir="confdir">
++                <fileset dir="confdir" includes="**/*.abc" casesensitive="yes"/>
++                <filterset/>
++                <mapper type="regexp" from="^(.*[/\\])foo([/\\].*)" to="\1baa\2"/>
++            </copy>
++	</target>
+     </project>
+ EOF
+   oldJAVA_HOME=$JAVA_HOME
+@@ -5921,12 +6123,13 @@ EOF
+     echo "configure: Ant test failed" >&5
+     cat conftest.java >&5
+     cat conftest.xml >&5
+-    AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
++    AC_MSG_WARN([Ant does not work - Some Java projects will not build, do you have ant-apache-regexp installed ?!])
+     ANT_HOME=""
+     echo "Ant does not work - Some Java projects will not build!" >>warn
+   fi
+   JAVA_HOME=$oldJAVA_HOME
+   rm -f conftest* core core.* *.core
++  rmdir confdir
+ fi
+ if test -z "$ANT_HOME"; then
+    ANT_HOME="NO_ANT_HOME"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jun 25 11:30:45 2008
@@ -512,6 +512,8 @@
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+# ensure that ant can do regexp matches.
+ant-test.diff, i#89383, michael
 
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to