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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jun 25 12:48:33 2008
New Revision: 12963
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12963&view=rev

Log:
2008-06-25  Rene Engelhard  <rene debian org>

        * patches/dev300/ant-test.diff: move ...
        * patches/dev300/ant-regexp-test.diff: .. to here with sane name
        * patches/dev300/ant-regexÃ-test.diff: sanitize


Added:
   trunk/patches/dev300/ant-regexp-test.diff
      - copied, changed from r12962, /trunk/patches/dev300/ant-test.diff
Removed:
   trunk/patches/dev300/ant-test.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Copied: trunk/patches/dev300/ant-regexp-test.diff (from r12962, /trunk/patches/dev300/ant-test.diff)
==============================================================================
--- /trunk/patches/dev300/ant-test.diff	(original)
+++ trunk/patches/dev300/ant-regexp-test.diff	Wed Jun 25 12:48:33 2008
@@ -1,45 +1,61 @@
-Index: config_office/configure.in
+Index: 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
--
+retrieving revision 1.271
+diff -u -u -r1.271 configure.in
+--- config_office/configure.in	13 Jun 2008 14:10:42 -0000	1.271
++++ config_office/configure.in	25 Jun 2008 12:44:33 -0000
+@@ -6013,6 +6017,53 @@
+ AC_SUBST(ANT_LIB)
+ fi
+ 
++if test "$ENABLE_MEDIAWIKI" = "YES"; then
++AC_MSG_CHECKING([for whether ant supports mapper type="regexp"])
++rm -rf confdir
 +mkdir confdir
- cat > conftest.xml << EOF
-     <project name="conftest" default="conftest">
--	<target name="conftest">
++cat > conftest.java << EOF
++    public class conftest {
++	int testmethod(int a, int b) {
++            return a + b;
++	}
++    }
++EOF
++
++cat > conftest.xml << EOF
++    <project name="conftest" default="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>
++            <javac srcdir="." includes="conftest.java">
++	    </javac>
 +	</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"
++        <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
++  if test "$JAVACISGCJ" = "yes"; then
++    JAVA_HOME=; export JAVA_HOME
++    ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
++  else
++    ant_cmd="$ANT -buildfile conftest.xml 1>&2"
++  fi
++  AC_TRY_EVAL(ant_cmd)
++  if test $? = 0 && test -f ./conftest.class ; then
++    AC_MSG_RESULT([yes]) 
++    rm -rf confdir
++  else
++    echo "configure: Ant test failed" >&5
++    cat conftest.java >&5
++    cat conftest.xml >&5
++    rm -rf confdir
++    AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
++  fi
++fi
++rm -f conftest* core core.* *.core
++
+ AC_MSG_CHECKING([which languages to be built])
+ WITH_LANG="$with_lang"
+ if test -z "$WITH_LANG"; then

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jun 25 12:48:33 2008
@@ -513,7 +513,7 @@
 win32-invalid-names.diff, n#277603, tml
 
 # ensure that ant can do regexp matches.
-ant-test.diff, i#89383, michael
+ant-regexp-test.diff, i#89383, michael
 
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to