incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1359625 - in /incubator/ooo/branches/AOO34: ./ main/ main/bootstrap.1 main/configure.in main/external_deps.lst main/ooo.lst main/solenv/bin/download_external_dependencies.pl main/solenv/bin/modules/ExtensionsLst.pm
Date Tue, 10 Jul 2012 12:05:03 GMT
Author: af
Date: Tue Jul 10 12:05:03 2012
New Revision: 1359625

URL: http://svn.apache.org/viewvc?rev=1359625&view=rev
Log:
#i119732# Added alternative to fetch_tarballs.sh.
          (Merged from trunk)

Added:
    incubator/ooo/branches/AOO34/main/external_deps.lst
      - copied unchanged from r1346831, incubator/ooo/trunk/main/external_deps.lst
    incubator/ooo/branches/AOO34/main/solenv/bin/download_external_dependencies.pl
      - copied unchanged from r1346831, incubator/ooo/trunk/main/solenv/bin/download_external_dependencies.pl
Removed:
    incubator/ooo/branches/AOO34/main/ooo.lst
Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/main/   (props changed)
    incubator/ooo/branches/AOO34/main/bootstrap.1
    incubator/ooo/branches/AOO34/main/configure.in
    incubator/ooo/branches/AOO34/main/solenv/bin/modules/ExtensionsLst.pm

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1346024,1346831,1347553

Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main:r1346024,1346831,1347553

Modified: incubator/ooo/branches/AOO34/main/bootstrap.1
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/bootstrap.1?rev=1359625&r1=1359624&r2=1359625&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/bootstrap.1 (original)
+++ incubator/ooo/branches/AOO34/main/bootstrap.1 Tue Jul 10 12:05:03 2012
@@ -39,7 +39,7 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstli
 
 # fetch or update external tarballs
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
-	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+    download_external_dependencies.pl $SRC_ROOT/external_deps.lst
 fi
 
 # ------------------------------------------------------------------------------

Modified: incubator/ooo/branches/AOO34/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/configure.in?rev=1359625&r1=1359624&r2=1359625&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/configure.in (original)
+++ incubator/ooo/branches/AOO34/main/configure.in Tue Jul 10 12:05:03 2012
@@ -4848,31 +4848,6 @@ if test "$BUILD_MOZAB" = "TRUE"; then
    if test -z "$MOZILLA_VERSION"; then
       MOZILLA_VERSION=1.1.14
    fi
-   MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source"
-   MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst`
-   AC_MSG_CHECKING([for mozilla sources])
-   if test -z "$MOZILLA_FETCH_FILE"; then
-      AC_MSG_RESULT([not found])
-      HAVE_MOZILLA_TARBALL=n
-   else
-      AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE])
-      if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then
-         if test -z "$DO_FETCH"; then
-            AC_MSG_RESULT([will be fetched])
-            HAVE_MOZILLA_TARBALL=y
-         else
-            AC_MSG_RESULT([not found])
-            HAVE_MOZILLA_TARBALL=n
-         fi
-      else
-         AC_MSG_RESULT([found])
-         HAVE_MOZILLA_TARBALL=y
-      fi
-   fi
-   if test "$HAVE_MOZILLA_TARBALL" != "y"; then
-      AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found.
-Use "./fetch_tarballs.sh ooo.lst" to download.])
-   fi
    if test "$_os" = "WINNT"; then
       AC_MSG_CHECKING([for moztools binaries])
       if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then

Modified: incubator/ooo/branches/AOO34/main/solenv/bin/modules/ExtensionsLst.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/solenv/bin/modules/ExtensionsLst.pm?rev=1359625&r1=1359624&r2=1359625&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/solenv/bin/modules/ExtensionsLst.pm (original)
+++ incubator/ooo/branches/AOO34/main/solenv/bin/modules/ExtensionsLst.pm Tue Jul 10 12:05:03
2012
@@ -268,7 +268,7 @@ sub EvaluateSelector($$)
             return $left_result || $right_result;
         }
     }
-    elsif ($expression =~ /^\s*(.+?)\s$/)
+    elsif ($expression =~ /^\s*(.+?)\s*$/)
     {
         return EvaluateTerm($1, $languages);
     }



Mime
View raw message