You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/11/07 15:30:09 UTC
svn commit: r1539657 [32/50] - in /openoffice/branches/alg/aw080: ./
ext_sources/ extras/l10n/source/ast/ extras/l10n/source/bg/
extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/
extras/l10n/source/el/ extras/l10n/source/en-GB/ extra...
Modified: openoffice/branches/alg/aw080/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/configure.in?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/configure.in (original)
+++ openoffice/branches/alg/aw080/main/configure.in Thu Nov 7 14:29:41 2013
@@ -59,8 +59,7 @@ AC_ARG_ENABLE(online-update,
[ --disable-online-update Disables the Online Update feature.
],,enable_online_update=yes)
AC_ARG_ENABLE(ldap,
-[ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
- or OpenLDAP LDAP SDK
+[ --disable-ldap Disables the use of LDAP backend via OpenLDAP
],,)
AC_ARG_ENABLE(fetch-external,
[ --disable-fetch-external Disables fetching external tarballs from web sources.
@@ -70,8 +69,7 @@ AC_ARG_WITH(external-tar,
[ TARFILE_LOCATION="$withval"
])
AC_ARG_WITH(openldap,
-[ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
+[ --with-openldap Enables the use of the OpenLDAP
],,)
AC_ARG_ENABLE(lockdown,
[ --enable-lockdown Enables the gconf integration work in OOo
@@ -324,35 +322,8 @@ AC_ARG_ENABLE(static-gtk,
AC_ARG_ENABLE(layout,
[ --enable-layout Enable the compilation and use of layout dialogs
],,)
-AC_ARG_ENABLE(mozilla,
-[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
- binary for your platform, to build without this
- version, use this option.
-],,enable_mozilla="yes")
-AC_ARG_ENABLE(build-mozilla,
-[ --disable-build-mozilla Use this option if you do not want to build the
- mozilla components from the mozilla source code but
- take precompiled zips
-],,)
-AC_ARG_WITH(mozilla-version,
-[ --with-mozilla-version Choose which version of mozilla to use while building
- mozilla. Default: 1.7.5.
- Note that not all versions are supported.
-],,)
-AC_ARG_WITH(mozilla-toolkit,
-[ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla
- components. Default: gtk2
-],,)
-AC_ARG_WITH(system-mozilla,
-[ --with-system-mozilla Use mozilla already on system. Note that some
- components cannot be built against a contemporary
- mozilla. The flavour used can be specified by
- --with-system-mozilla=<flavour>. Supported are:
- libxul (default), xulrunner, firefox, seamonkey,
- mozilla
-], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
AC_ARG_ENABLE(nss_module,
-[ --disable-nss-module Whether to use provided NSS module
+[ --disable-nss-module Whether to use the NSS module that is used for xml-security
],,enable_nss_module=yes)
AC_ARG_ENABLE(kde,
[ --enable-kde Determines whether to use Qt/KDE vclplug on platforms
@@ -430,7 +401,7 @@ AC_ARG_WITH(external-thes-dir,
AC_ARG_WITH(system-libs,
[ --with-system-libs Use libs already on system -- enables all
- --with-system-* flags except mozilla and
+ --with-system-* flags except
odbc/sane/xrender-header(s)
],,)
AC_ARG_WITH(system-headers,
@@ -449,6 +420,9 @@ AC_ARG_WITH(system-jars,
AC_ARG_WITH(system-zlib,
[ --with-system-zlib Use zlib already on system
],,)
+AC_ARG_WITH(system-nss,
+[ --with-system-nss Use NSS already on system
+],,)
AC_ARG_WITH(system-openssl,
[ --with-system-openssl Use OpenSSL already on system
],,)
@@ -629,10 +603,6 @@ AC_ARG_WITH(system-mdds,
AC_ARG_WITH(system-vigra,
[ --with-system-vigra Use vigra already on system
],,)
-AC_ARG_ENABLE(Xaw,
-[ --disable-Xaw Disables the use of Xaw for the Netscape/Mozilla
- plugin
-],,)
AC_ARG_ENABLE(hunspell,
[ --enable-hunspell Determines whether to enable the Hunspell library.
If enabled, the library will be built unless you
@@ -1428,7 +1398,6 @@ ENABLE_CATEGORY_B=
AC_MSG_CHECKING([whether to enable category B components])
# Category B modules (libraries):
-# moz (seamonkey)
# nss (nss)
# hunspell (hunspell)
# hyphen (hyphen)
@@ -1447,10 +1416,9 @@ if test "$enable_category_b" = "yes"; th
enable_coinmp="yes"
enable_category_b_fonts="yes"
- AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
+ AC_MSG_RESULT([yes: allow modules, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
else
# Disable libaries.
- enable_mozilla="no"
enable_nss_module="no"
enable_hunspell="no"
enable_hyphen="no"
@@ -1461,7 +1429,7 @@ else
enable_coinmp="no"
enable_category_b_fonts="no"
- AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp])
+ AC_MSG_RESULT([no: disabled modules, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp])
fi
AC_SUBST(ENABLE_CATEGORY_B)
@@ -4765,40 +4733,19 @@ else
fi
AC_SUBST(SYSTEM_ODBC_HEADERS)
-WITH_MOZILLA=NO
-AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
-if test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([no])
- WITH_MOZILLA=NO
- ENABLE_NSS_MODULE=NO
-else
- AC_MSG_RESULT([yes])
- WITH_MOZILLA=YES
-fi
-
-AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity])
-if test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([no])
-elif test "$with_system_mozilla" = "yes"; then
- AC_MSG_RESULT([no, not possible with system-mozilla])
-else
- AC_MSG_RESULT([yes])
-fi
-
AC_MSG_CHECKING([whether to build XML Security support])
-if test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed])
+if test "$enable_nss_module" = "no"; then
+ AC_MSG_RESULT([no, since NSS disabled but needed])
else
AC_MSG_RESULT([yes])
fi
AC_MSG_CHECKING([whether to build LDAP configuration backend])
if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then
- if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then
+ if test "$with_openldap" = "yes"; then
AC_MSG_RESULT([yes])
WITH_LDAP=YES
else
- AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed])
WITH_LDAP=NO
fi
else
@@ -4808,7 +4755,7 @@ fi
if test "$WITH_LDAP" = "YES"; then
dnl ===================================================================
- dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK
+ dnl Test whether we want to use the OpenLDAP LDAP SDK
dnl ===================================================================
AC_MSG_CHECKING([which LDAP SDK to use])
if test -n "$with_openldap" && test "$with_openldap" != "no"; then
@@ -4822,170 +4769,11 @@ if test "$WITH_LDAP" = "YES"; then
# it has it. Test for it to be sure
AC_CHECK_LIB(ldap, ldap_set_option, [],
[AC_MSG_ERROR(openldap lib not found or functional)], [])
- else
- AC_MSG_RESULT([Netscape/Mozilla])
- # TODO. Actually do a sanity check and check for
- # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT
- WITH_OPENLDAP=NO
fi
fi
AC_SUBST(WITH_LDAP)
AC_SUBST(WITH_OPENLDAP)
-dnl ===================================================================
-dnl Check for system mozilla
-dnl ===================================================================
-AC_MSG_CHECKING([which mozilla to use])
-if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
- AC_MSG_RESULT([external])
- SYSTEM_MOZILLA=YES
- ENABLE_NSS_MODULE=NO
- enable_nss_module=no
- AC_MSG_CHECKING([which Mozilla flavour to use])
- if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
- MOZ_FLAVOUR=libxul
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
- MOZ_FLAVOUR=xulrunner
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
- MOZ_FLAVOUR=seamonkey
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "firefox"; then
- MOZ_FLAVOUR=firefox
- elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
- MOZ_FLAVOUR=mozilla
- else
- MOZ_FLAVOUR=libxul
- fi
- tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
- AC_MSG_RESULT($tmp)
-
- PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
- if test -z "$STANDALONENSS"; then
- PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
- else
- NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
- AC_SUBST(NSS_LIB)
- fi
-
- if $PKG_CONFIG --exists nspr ; then
- PKG_CHECK_MODULES( MOZ_NSPR, nspr )
- NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
- AC_SUBST(NSPR_LIB)
- else
- PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
- fi
-
- if test "$MOZ_FLAVOUR" != "libxul"; then
- PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
- MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
- MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
- fi
-
- if test -z "$HASXPCOM"; then
- PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
- MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
- MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
- if ! test -e "$MOZ_LIB/libxul.so"; then
- MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
- if test -e "$MOZ_LIB/sdk/lib/libxul.so"; then
- MOZ_LIB="$MOZ_LIB/sdk/lib"
- fi
- fi
- fi
-
- save_CPPFLAGS="$CPPFLAGS"
- save_LDFLAGS="$LDFLAGS"
- save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS"
- LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS"
- AC_CHECK_LIB(nss3, PK11_GetCertFromPrivateKey, [],
- [AC_MSG_ERROR(PK11_GetCertFromPrivateKey missing but needed.
-See https://bugzilla.mozilla.org/show_bug.cgi?id=262274.
-Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5))], [])
- LDFLAGS="$save_LDFLAGS"
- CPPFLAGS="$save_CPPFLAGS"
- LIBS="$save_LIBS"
-
- MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
- if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
- AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
- if test -d "$MOZ_INC/ldap"; then
- AC_MSG_RESULT([yes])
- MOZ_LDAP_CFLAGS="-I$MOZ_INC"
- else
- AC_MSG_ERROR([no.
-Could not find LDAP header include files in $MOZ_INC/ldap.
-Please recompile $tmp with --enable-ldap or use --with-openldap.])
- fi
- fi
-
- #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
- #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
- if test "$MOZ_FLAVOUR" = "libxul"; then
- MOZ_FLAVOUR="mozilla"
- fi
-
-elif test "$enable_mozilla" = "no"; then
- AC_MSG_RESULT([none])
- WITH_MOZILLA=NO
- ENABLE_NSS_MODULE=NO
- enable_nss_module=no
-else
- AC_MSG_RESULT([internal])
- SYSTEM_MOZILLA=NO
- BUILD_TYPE="$BUILD_TYPE MOZ"
- WITH_MOZILLA=YES
-if test -z "$with_mozilla_version"; then
- MOZILLA_VERSION=
-else
- AC_MSG_CHECKING([which mozilla version to build])
- MOZILLA_VERSION=$with_mozilla_version
- enable_build_mozilla=1
- AC_MSG_RESULT([$MOZILLA_VERSION])
-fi
-
-AC_SUBST(MOZILLA_VERSION)
-AC_SUBST(WITH_MOZILLA)
-
-AC_MSG_CHECKING([for toolkit mozilla should use])
-if test -z "$with_mozilla_toolkit"; then
- if test "$_os" != "WINNT" ; then
- if test "$_os" = "Darwin" ; then
- MOZILLA_TOOLKIT=mac
- AC_MSG_RESULT([mac])
- else
- MOZILLA_TOOLKIT=gtk2
- AC_MSG_RESULT([gtk2])
- fi
- fi
-else
- MOZILLA_TOOLKIT=$with_mozilla_toolkit
- enable_build_mozilla=1
- AC_MSG_RESULT([$MOZILLA_TOOLKIT])
-fi
-#if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then
-# #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not
-# #available using fink, mac (carbon) doesn't work because xcode installs conflicting headers
-# AC_MSG_ERROR([Only gtk2 toolkit supported on Mac, sorry.])
-#fi
-
-AC_SUBST(MOZILLA_TOOLKIT)
-
-# default to enabling build mozilla
-if test "$enable_build_mozilla" != "no"; then
- enable_build_mozilla=yes
-else
- enable_build_mozilla=
-fi
-
-AC_MSG_CHECKING([whether to build Mozilla/SeaMonkey])
-if test -n "$enable_build_mozilla"; then
- BUILD_MOZAB="TRUE"
- AC_MSG_RESULT([yes])
-else
- BUILD_MOZAB=""
- AC_MSG_RESULT([no])
-fi
-
AC_MSG_CHECKING([whether to build provided NSS module])
if test "$enable_nss_module" != "no"; then
ENABLE_NSS_MODULE="YES"
@@ -4994,7 +4782,7 @@ if test "$enable_nss_module" != "no"; th
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for Mozilla build tooling])
if test -z "$MOZILLABUILD" ; then
-AC_MSG_ERROR([Mozilla build tooling not found.
+AC_MSG_ERROR([Mozilla build tooling not found. It is needed for NSS.
Use the --with-mozilla-build option after installling the tools obtained
from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
else
@@ -5019,77 +4807,9 @@ else
AC_MSG_RESULT([no])
fi
-if test "$BUILD_MOZAB" = "TRUE"; then
- if test "$_os" = "WINNT"; then
- if test "$WITH_MINGWIN" != "yes"; then
- # compiling with MSVC. Only supported platform here is MSVS2005 at the moment.
- if test "$MSVSVER" != "2005"; then
- AC_MSG_ERROR([Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only.])
- fi
- else
- AC_MSG_WARN([Building SeaMonkey with mingwin is not tested, and likely to break.])
- echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn
- fi
- fi
-
- if test -z "$MOZILLA_VERSION"; then
- MOZILLA_VERSION=1.1.14
- fi
- if test "$_os" = "WINNT"; then
- AC_MSG_CHECKING([for moztools binaries])
- if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then
- AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip
-(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)])
- else
- AC_MSG_RESULT([ok])
- fi
- elif test "$_os" = "Darwin"; then
- if test "$MOZILLA_TOOLKIT" = "gtk2"; then
- AC_MSG_NOTICE([checking whether mozilla can be built...])
- PKG_CHECK_MODULES(MOZGTK2, gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8, AC_MSG_NOTICE([OK - can build mozilla]), AC_MSG_ERROR([Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages]))
- else
- PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.6.3, MOZIDL="TRUE", MOZIDL="")
- if test -z "$MOZIDL"; then
- AC_MSG_ERROR([libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit.])
- fi
- fi
- else
- # Generic Unix/Linux section
- if test "$MOZILLA_TOOLKIT" = "gtk2"; then
- PKG_CHECK_MODULES(MOZLIBREQ, gtk+-2.0, MOZGTK="TRUE", MOZGTK="")
- if test -z "$MOZGTK"; then
- AC_MSG_ERROR([GTK2 is needed to build mozilla.])
- fi
- PKG_CHECK_MODULES(MOZLIBREQ, libIDL-2.0 >= 0.8.0, MOZIDL="TRUE", MOZIDL="")
- if test -z "$MOZIDL"; then
- AC_MSG_ERROR([libIDL >= 0.8.0 is needed when using GTK2 to build mozilla.])
- fi
- else
- PKG_CHECK_MODULES(MOZLIBREQ, gtk+ >= 1.2.3, MOZGTK="TRUE", MOZGTK="")
- if test -z "$MOZGTK"; then
- AC_MSG_ERROR([gtk 1.2 is needed when not using GTK2 to build mozilla.])
- fi
- PKG_CHECK_MODULES(MOZLIBREQ, libidl >= 0.6.3 libidl <= 0.6.8, MOZIDL="TRUE", MOZIDL="")
- if test -z "$MOZIDL"; then
- AC_MSG_ERROR([libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla.])
- fi
- fi
- fi
-fi
-
-AC_SUBST(BUILD_MOZAB)
-
-fi
AC_SUBST(ENABLE_NSS_MODULE)
AC_SUBST(MOZILLABUILD)
-AC_SUBST(SYSTEM_MOZILLA)
-AC_SUBST(MOZ_FLAVOUR)
AC_SUBST(MOZ_INC)
-AC_SUBST(MOZ_LIB)
-AC_SUBST(MOZ_LIB_XPCOM)
-AC_SUBST(MOZ_NSPR_CFLAGS)
-AC_SUBST(MOZ_NSS_CFLAGS)
-AC_SUBST(MOZ_LDAP_CFLAGS)
dnl ===================================================================
dnl Check for system sane
@@ -5279,28 +4999,6 @@ fi
AC_SUBST(XLIB)
AC_SUBST(XAU_LIBS)
-if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then
- dnl ===================================================================
- dnl Check for using Xaw
- dnl ===================================================================
- AC_MSG_CHECKING([whether to use Xaw])
- if test "$enable_Xaw" = "no"; then
- DISABLE_XAW=TRUE
- AC_MSG_RESULT([no])
- AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])],
- [#include <X11/Intrinsic.h>])
- else
- AC_MSG_RESULT([yes])
- AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])],
- [#include <X11/Intrinsic.h>])
- AC_CHECK_LIB(Xaw, main, [],
- [AC_MSG_ERROR(Xaw library not found or functional)], [])
- fi
-fi
-AC_SUBST(DISABLE_XAW)
-
-
-
dnl ===================================================================
dnl Check if fontconfig/fontconfig.h is available
dnl ===================================================================
@@ -5381,6 +5079,23 @@ AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
dnl ===================================================================
+dnl Check for system nss
+dnl ===================================================================
+AC_MSG_CHECKING([which libnss to use])
+if test -n "$with_system_nss" -o -n "$with_system_libs" && test "$with_system_nss" != "no"; then
+ AC_MSG_RESULT([external])
+ PKG_CHECK_MODULES( NSS, nss )
+ SYSTEM_NSS=YES
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_NSS=NO
+ BUILD_TYPE="$BUILD_TYPE NSS"
+fi
+AC_SUBST(SYSTEM_NSS)
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+
+dnl ===================================================================
dnl Check for system openssl
dnl ===================================================================
if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
Modified: openoffice/branches/alg/aw080/main/connectivity/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/prj/build.lst?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/prj/build.lst (original)
+++ openoffice/branches/alg/aw080/main/connectivity/prj/build.lst Thu Nov 7 14:29:41 2013
@@ -1,4 +1,4 @@
-cn connectivity : shell L10N:l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
+cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\inc nmake - all cn_inc NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
@@ -8,9 +8,6 @@ cn connectivity\source\cpool
cn connectivity\source\resource nmake - all cn_res cn_inc NULL
cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file cn_inc NULL
-cn connectivity\source\drivers\mozab\bootstrap nmake - all cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_bootstrap cn_dbtools cn_inc NULL
cn connectivity\source\drivers\kab nmake - all cn_kab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
@@ -29,4 +26,4 @@ cn connectivity\source\simpledbt
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn connectivity\util nmake - all cn_util cn_ado cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
Modified: openoffice/branches/alg/aw080/main/connectivity/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/prj/d.lst?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/prj/d.lst (original)
+++ openoffice/branches/alg/aw080/main/connectivity/prj/d.lst Thu Nov 7 14:29:41 2013
@@ -17,7 +17,6 @@
..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\jdbc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mozab\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
@@ -46,8 +45,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
..\%__SRC%\misc\kab1.component %_DEST%\xml%_EXT%\kab1.component
..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mozab.component %_DEST%\xml%_EXT%\mozab.component
-..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml%_EXT%\mozbootstrap.component
..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
Modified: openoffice/branches/alg/aw080/main/connectivity/source/commontools/ConnectionWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/source/commontools/ConnectionWrapper.cxx?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/source/commontools/ConnectionWrapper.cxx (original)
+++ openoffice/branches/alg/aw080/main/connectivity/source/commontools/ConnectionWrapper.cxx Thu Nov 7 14:29:41 2013
@@ -196,7 +196,10 @@ namespace
{}
bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::com::sun::star::beans::PropertyValue& rhs) const
{
- return !!(lhs.Name.equalsIgnoreAsciiCase( rhs.Name ));
+ const rtl_uString* l = lhs.Name.pData;
+ const rtl_uString* r = rhs.Name.pData;
+ const int c = rtl_ustr_compareIgnoreAsciiCase_WithLength( l->buffer, l->length, r->buffer, r->length );
+ return (c < 0);
}
};
Modified: openoffice/branches/alg/aw080/main/connectivity/source/drivers/evoab2/NCatalog.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/source/drivers/evoab2/NCatalog.hxx?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/source/drivers/evoab2/NCatalog.hxx (original)
+++ openoffice/branches/alg/aw080/main/connectivity/source/drivers/evoab2/NCatalog.hxx Thu Nov 7 14:29:41 2013
@@ -48,5 +48,5 @@ namespace connectivity
};
}
}
-#endif // _CONNECTIVITY_MOZAB_CATALOG_HXX_
+#endif // _CONNECTIVITY_EVOAB_CATALOG_HXX_
Modified: openoffice/branches/alg/aw080/main/connectivity/source/resource/conn_shared_res.src
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/source/resource/conn_shared_res.src?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/source/resource/conn_shared_res.src (original)
+++ openoffice/branches/alg/aw080/main/connectivity/source/resource/conn_shared_res.src Thu Nov 7 14:29:41 2013
@@ -123,7 +123,7 @@ String STR_STMT_TYPE_NOT_SUPPORTED
String STR_UNSPECIFIED_ERROR
{
- Text [ en-US ] = "An unknown error occured.";
+ Text [ en-US ] = "An unknown error occurred.";
};
String STR_COULD_NOT_CREATE_ADDRESSBOOK
@@ -138,12 +138,12 @@ String STR_COULD_NOT_LOAD_LIB
String STR_ERROR_REFRESH_ROW
{
- Text [ en-US ] = "An error occured while refreshing the current row.";
+ Text [ en-US ] = "An error occurred while refreshing the current row.";
};
String STR_ERROR_GET_ROW
{
- Text [ en-US ] = "An error occured while getting the current row.";
+ Text [ en-US ] = "An error occurred while getting the current row.";
};
String STR_CAN_NOT_CANCEL_ROW_UPDATE
@@ -163,7 +163,7 @@ String STR_QUERY_INVALID_IS_NULL_COLUMN
String STR_ILLEGAL_MOVEMENT
{
- Text [ en-US ] = "Illegal cursor movement occured.";
+ Text [ en-US ] = "Illegal cursor movement occurred.";
};
String STR_COMMIT_ROW
@@ -375,7 +375,7 @@ String STR_NO_CONNECTION
// dbase
String STR_COULD_NOT_DELETE_INDEX
{
- Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occured.";
+ Text [ en-US ] = "The index could not be deleted. An unknown error while accessing the file system occurred.";
};
String STR_ONL_ONE_COLUMN_PER_INDEX
{
@@ -620,11 +620,11 @@ String STR_INVALID_FILE_URL
};
String STR_NO_TABLE_CONTAINER
{
- Text [ en-US ] = "An error occured while obtaining the connection's table container.";
+ Text [ en-US ] = "An error occurred while obtaining the connection's table container.";
};
String STR_NO_TABLE_EDITOR_DIALOG
{
- Text [ en-US ] = "An error occured while creating the table editor dialog.";
+ Text [ en-US ] = "An error occurred while creating the table editor dialog.";
};
String STR_NO_TABLENAME
{
Modified: openoffice/branches/alg/aw080/main/connectivity/version.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/connectivity/version.mk?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/connectivity/version.mk (original)
+++ openoffice/branches/alg/aw080/main/connectivity/version.mk Thu Nov 7 14:29:41 2013
@@ -69,23 +69,10 @@ DBPOOL_MICRO=0
# target
DBASE_TARGET=dbase
-# ----------------------------MOZAB settings-----------------------------------#
-# the major
-MOZAB_MAJOR=2
-# the minor
-MOZAB_MINOR=0
-# the micro
-MOZAB_MICRO=0
-
# ----------------------------MySQL settings-----------------------------------#
# target
MYSQL_TARGET=mysql
-
-# ----------------------------Evoab settings-----------------------------------#
-# target
-EVOAB_TARGET=evoab
-
# ----------------------------Kab settings-------------------------------------#
# target
KAB_TARGET=kab
Modified: openoffice/branches/alg/aw080/main/cppuhelper/source/findsofficepath.c
URL: http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/cppuhelper/source/findsofficepath.c?rev=1539657&r1=1539656&r2=1539657&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/cppuhelper/source/findsofficepath.c (original)
+++ openoffice/branches/alg/aw080/main/cppuhelper/source/findsofficepath.c Thu Nov 7 14:29:41 2013
@@ -97,14 +97,14 @@ static char* platformSpecific()
if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_USER 64 */
- path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+ path = getPathFromRegistryKey( HKEY_CURRENT_USER, SUBKEYNAME64 );
}
- else if ( path == NULL )
+ if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_MACHINE */
path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME );
}
- else if ( path == NULL )
+ if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_MACHINE 64*/
path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
@@ -117,7 +117,7 @@ static char* platformSpecific()
#include <unistd.h>
#include <limits.h>
-
+#include <stdio.h>
/*
* Gets the installation path from the PATH environment variable.
*
@@ -129,23 +129,38 @@ static char* platformSpecific()
*/
static char* platformSpecific()
{
+ char* path = NULL;
+
+#ifdef MACOSX
+ /* On MacOS we have no soffice link under /usr/bin but the default office location is known
+ and we check this only
+ */
+ const char* MACDEFAULTOFFICEPATH = "/Applications/OpenOffice.app/Contents/MacOS";
+ const char* MACDEFAULTSOFFICE = "/Applications/OpenOffice.app/Contents/MacOS/soffice";
+
+ if ( !access( MACDEFAULTSOFFICE, F_OK ) )
+ {
+ path = (char*) malloc( strlen(MACDEFAULTOFFICEPATH) + 1 );
+ strcpy( path, MACDEFAULTOFFICEPATH);
+ }
+ return path;
+#else
const int SEPARATOR = '/';
const char* PATHSEPARATOR = ":";
const char* PATHVARNAME = "PATH";
const char* APPENDIX = "/soffice";
- char* path = NULL;
char* env = NULL;
char* str = NULL;
char* dir = NULL;
char* file = NULL;
char* resolved = NULL;
- char* sep = NULL;
+ char* sep = NULL;
char buffer[PATH_MAX];
int pos;
- /* get the value of the PATH environment variable */
+/* get the value of the PATH environment variable */
env = getenv( PATHVARNAME );
str = (char*) malloc( strlen( env ) + 1 );
strcpy( str, env );
@@ -190,6 +205,7 @@ static char* platformSpecific()
free( str );
return path;
+#endif
}
#endif