openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zheng...@apache.org
Subject svn commit: r1498395 - in /openoffice/branches/Remove_MOZ/main: ./ connectivity/prj/ connectivity/source/drivers/mozab/ connectivity/source/drivers/mozab/bootstrap/ connectivity/source/drivers/mozab/mozillasrc/ libxmlsec/prj/ postprocess/packcomponents...
Date Mon, 01 Jul 2013 12:04:09 GMT
Author: zhengfan
Date: Mon Jul  1 12:04:08 2013
New Revision: 1498395

URL: http://svn.apache.org/r1498395
Log:
i122365, Remove the Mozilla libraries, exclude NSS, dependency from AOO

Modified:
    openoffice/branches/Remove_MOZ/main/.gitignore
    openoffice/branches/Remove_MOZ/main/configure.in
    openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/makefile.mk
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile.mk
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile_mozab.mk
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
    openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
    openoffice/branches/Remove_MOZ/main/external_deps.lst
    openoffice/branches/Remove_MOZ/main/libxmlsec/prj/build.lst
    openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk
    openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk
    openoffice/branches/Remove_MOZ/main/postprocess/rebase/coffbase.txt
    openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
    openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_ooo.scp
    openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk
    openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
    openoffice/branches/Remove_MOZ/main/set_soenv.in
    openoffice/branches/Remove_MOZ/main/xmlsecurity/prj/build.lst

Modified: openoffice/branches/Remove_MOZ/main/.gitignore
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/.gitignore?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/.gitignore (original)
+++ openoffice/branches/Remove_MOZ/main/.gitignore Mon Jul  1 12:04:08 2013
@@ -57,7 +57,6 @@ TAGS
 # externals
 /external/unowinreg/unowinreg.dll
 /external/msvcp90/*
-/moz/zipped/*.zip
 
 # $INPATH output directories
 /*/unxlng??

Modified: openoffice/branches/Remove_MOZ/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/configure.in?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/configure.in (original)
+++ openoffice/branches/Remove_MOZ/main/configure.in Mon Jul  1 12:04:08 2013
@@ -324,33 +324,6 @@ 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     
 ],,enable_nss_module=yes)
@@ -1428,7 +1401,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 +1419,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 +1432,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 +4736,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 +4758,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 +4772,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"
@@ -5019,77 +4810,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

Modified: openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/prj/build.lst Mon Jul  1 12:04:08 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

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx Mon Jul  1 12:04:08 2013
@@ -32,16 +32,20 @@ using namespace com::sun::star::mozilla;
 using namespace connectivity::mozab;
 #include <MNSFolders.hxx>
 #include "MNSProfileDiscover.hxx"
+/*
 #ifndef MINIMAL_PROFILEDISCOVER
 #  include "MNSProfileManager.hxx"
 #  include "MNSRunnable.hxx"
 #endif
 #include <MNSInit.hxx>
+*/
 
 static MozillaBootstrap *pMozillaBootstrap=NULL;
 static Reference<XMozillaBootstrap> xMozillaBootstrap;
 extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
 {
+	return NULL;
+	/*
 	if (!pMozillaBootstrap)
 	{
 		pMozillaBootstrap=new connectivity::mozab::MozillaBootstrap( _rxFactory );
@@ -49,6 +53,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void*  S
 		xMozillaBootstrap = pMozillaBootstrap;
 	}
 	return  pMozillaBootstrap;
+	 */
 }
 
 // --------------------------------------------------------------------------------
@@ -67,6 +72,8 @@ MozillaBootstrap::~MozillaBootstrap()
 // -----------------------------------------------------------------------------
 void MozillaBootstrap::Init()
 {
+	return;
+	/*
 	sal_Bool aProfileExists=sal_False;
 
 #ifndef MINIMAL_PROFILEDISCOVER
@@ -75,24 +82,30 @@ void MozillaBootstrap::Init()
 
 	m_ProfileManager = new ProfileManager();
 #else
-	(void)aProfileExists; /* avoid warning about unused parameter */
+	(void)aProfileExists; // avoid warning about unused parameter 
 #endif
 	m_ProfileAccess = new ProfileAccess();
 	bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
+	*/
 }
 
 // --------------------------------------------------------------------------------
 void MozillaBootstrap::disposing()
 {
+	/*
 	::osl::MutexGuard aGuard(m_aMutex);
 	OMozillaBootstrap_BASE::disposing();
+	 */
 }
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
 rtl::OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
+	return rtl::OUString();
+	/*
 	return rtl::OUString::createFromAscii(MOZAB_MozillaBootstrap_IMPL_NAME);
+	 */
 }
 //------------------------------------------------------------------------------
 Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -100,7 +113,8 @@ Sequence< ::rtl::OUString > MozillaBoots
 	// which service is supported 
 	// for more information @see com.sun.star.mozilla.MozillaBootstrap
 	Sequence< ::rtl::OUString > aSNS( 1 );
-	aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+	//aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+	aSNS[0] = ::rtl::OUString();
 	return aSNS;
 }
 
@@ -113,6 +127,8 @@ Sequence< ::rtl::OUString > MozillaBoots
 //------------------------------------------------------------------
 sal_Bool SAL_CALL MozillaBootstrap::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
 {
+	return sal_False;
+	/*
 	Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
 	const ::rtl::OUString* pSupported = aSupported.getConstArray();
 	const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
@@ -120,6 +136,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supp
 		;
 
 	return pSupported != pEnd;
+	 */
 }
 
 //------------------------------------------------------------------
@@ -132,32 +149,40 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 // XProfileDiscover
 ::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->getProfileCount(product);
+	return 0;
+	//return m_ProfileAccess->getProfileCount(product);
 }
 ::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( ::com::sun::star::mozilla::MozillaProductType product, ::com::sun::star::uno::Sequence< ::rtl::OUString >& list ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->getProfileList(product,list);
+	return 0;
+	//return m_ProfileAccess->getProfileList(product,list);
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->getDefaultProfile(product);
+	return ::rtl::OUString();
+	//return m_ProfileAccess->getDefaultProfile(product);
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->getProfilePath(product,profileName);
+	return ::rtl::OUString();
+	//return m_ProfileAccess->getProfilePath(product,profileName);
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->isProfileLocked(product,profileName);
+	return sal_True;
+	//return m_ProfileAccess->isProfileLocked(product,profileName);
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_ProfileAccess->getProfileExists(product,profileName);
+	return sal_False;
+	//return m_ProfileAccess->getProfileExists(product,profileName);
 }
 
 // XProfileManager
 ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return -1;
+
 #ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->bootupProfile(product,profileName);
 #else
@@ -168,6 +193,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 }
 ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return -1;
 #ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->shutdownProfile();
 #else
@@ -176,6 +202,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 }
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return ::com::sun::star::mozilla::MozillaProductType_Default;
 #ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->getCurrentProduct();
 #else
@@ -184,6 +211,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return ::rtl::OUString();
 #ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->getCurrentProfile();
 #else
@@ -192,6 +220,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return sal_True;
 #ifndef MINIMAL_PROFILEDISCOVER
 	return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile());
 #else
@@ -200,6 +229,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return ::rtl::OUString();
 #ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->setCurrentProfile(product,profileName);
 #else
@@ -212,6 +242,7 @@ Sequence< ::rtl::OUString > SAL_CALL Moz
 // XProxyRunner
 ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return -1;
 #ifndef MINIMAL_PROFILEDISCOVER
 	::rtl::OUString profileName = aCode->getProfileName();
 	::rtl::OUString currProfileName = getCurrentProfile();
@@ -243,13 +274,17 @@ component_getImplementationEnvironment(
                 uno_Environment ** /*ppEnv*/
             )
 {
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    //*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
 static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
+	/*
         MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
         return *pBootstrap;
+	 */
+	MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(NULL);
+	return *pBootstrap;
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
@@ -257,6 +292,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SA
                                         void* pServiceManager,
                                         void* /*pRegistryKey*/)
 {
+	return 0;
+	/*
         void* pRet = 0;
 
         if (pServiceManager)
@@ -280,6 +317,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SA
         }
 
         return pRet;
+	 */
 };
 
 #endif

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx Mon Jul  1 12:04:08 2013
@@ -47,8 +47,8 @@ namespace connectivity
 			::osl::Mutex				m_aMutex;		// mutex is need to control member access
 			virtual ~MozillaBootstrap();
 		protected:
-			ProfileAccess * m_ProfileAccess;
-			ProfileManager	* m_ProfileManager;
+			//ProfileAccess * m_ProfileAccess;
+			//ProfileManager	* m_ProfileManager;
 		public:
 
 			void Init();

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/makefile.mk Mon Jul  1 12:04:08 2013
@@ -52,14 +52,14 @@ MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$
 INCPRE += -I../mozillasrc
 
 # --- Files -------------------------------------
+SLOFILES += $(SLO)$/MMozillaBootstrap.obj
+#SLOFILES += \
+#	$(SLO)$/MNSINIParser.obj \
+#	$(SLO)$/MNSProfileDiscover.obj \
+#	$(SLO)$/MMozillaBootstrap.obj \
+#	$(SLO)$/MNSFolders.obj
 
-SLOFILES += \
-	$(SLO)$/MNSINIParser.obj \
-	$(SLO)$/MNSProfileDiscover.obj \
-	$(SLO)$/MMozillaBootstrap.obj \
-	$(SLO)$/MNSFolders.obj
-
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" )
+#.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES" ) || ( "$(WITH_MOZILLA)" == "NO" ) || ( "$(OS)" == "MACOSX" )
 CDEFS+=-DMINIMAL_PROFILEDISCOVER
 
 SHL1TARGET=$(TARGET)
@@ -82,14 +82,14 @@ $(MISC)/mozbootstrap.component .ERRREMOV
         '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
         $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
 
-.ELSE
-SLOFILES += \
-	$(SLO)$/MNSInit.obj			            \
-	$(SLO)$/MNSProfileManager.obj	\
-	$(SLO)$/MNSRunnable.obj	\
-	$(SLO)$/MNSProfile.obj					\
-	$(SLO)$/MNSProfileDirServiceProvider.obj
-.ENDIF
+#.ELSE
+#SLOFILES += \
+#	$(SLO)$/MNSInit.obj			            \
+#	$(SLO)$/MNSProfileManager.obj	\
+#	$(SLO)$/MNSRunnable.obj	\
+#	$(SLO)$/MNSProfile.obj					\
+#	$(SLO)$/MNSProfileDirServiceProvider.obj
+#.ENDIF
 
 # --- Targets ----------------------------------
 

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h Mon Jul  1 12:04:08 2013
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsIServiceManager.h"
 #include "nsIEventQueueService.h"
 #include "nsIChromeRegistry.h"
@@ -46,5 +46,5 @@
 #include "nsEmbedAPI.h"
 
 #include "nsDirectoryService.h"
-
+*/
 #include "post_include_mozilla.h"

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h Mon Jul  1 12:04:08 2013
@@ -81,5 +81,5 @@
 #include "nsHashtable.h"
 #include "nsIAtom.h"
 #include "nsCRT.h"
-
+*/
 #include "post_include_mozilla.h"

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h Mon Jul  1 12:04:08 2013
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsIDirectoryService.h"
 #include "nsILocalFile.h"
 #include "nsString.h"
@@ -33,5 +33,5 @@
 #pragma disable_warn
     // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again
 #endif
-
+*/
 #include "post_include_mozilla.h"

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h Mon Jul  1 12:04:08 2013
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
@@ -38,5 +38,5 @@
 #include "nsVoidArray.h"
 #include "nsIFile.h"
 #include "nsILocalFile.h"
-
+*/
 #include "post_include_mozilla.h"

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h Mon Jul  1 12:04:08 2013
@@ -25,7 +25,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include "nsCOMPtr.h"
 #include "nsISupports.h"
 #include "nsString.h"
@@ -76,5 +76,5 @@
 
 #include "nsIPlatformCharset.h"
 #include <MNSInit.hxx>
-
+*/
 #include "post_include_mozilla.h"

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile.mk Mon Jul  1 12:04:08 2013
@@ -27,45 +27,45 @@ TARGET=mozab
 TARGET2=$(TARGET)drv
 VISIBILITY_HIDDEN=TRUE
 
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
+#.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || ( "$(OS)" == "MACOSX" ) || ( "$(OS)" == "OS2" )
 all: 
 	@echo "    Not building the mozilla address book driver"
 	@echo "    dependency to Mozilla developer snapshots not feasable at the moment"
 	@echo "    see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
 	@echo "    see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
-.ENDIF
+#.ENDIF
 
 # --- begin of mozilla specific stuff
 MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
 MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 
-.IF "$(OS)"=="WNT" 
-  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
-  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-
-  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
-  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
-
-  .IF "$(COM)"=="GCC"
-    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
-  .ELSE
-    LIB += $(MOZ_LIB)
-    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
-  .ENDIF
-
-.ELSE "$(OS)"=="WNT" 
-  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
-.ENDIF
+#.IF "$(OS)"=="WNT" 
+#  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
+#  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
+
+#  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
+#  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
+
+#  .IF "$(COM)"=="GCC"
+#    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
+#  .ELSE
+#    LIB += $(MOZ_LIB)
+#    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
+#  .ENDIF
+
+#.ELSE "$(OS)"=="WNT" 
+#  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
+#.ENDIF
 # --- end of mozilla specific stuff
 
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 VISIBILITY_HIDDEN=TRUE
 
-.IF "$(OS)"!="WNT" 
+#.IF "$(OS)"!="WNT" 
 COMPONENT_CONFIG_DATA=$(TARGET)2.xcu
 COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
-.ENDIF
+#.ENDIF
 
 # --- Settings ----------------------------------
 
@@ -73,97 +73,6 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
 
 .INCLUDE :  $(PRJ)$/version.mk
 
-# --- Files -------------------------------------
-
-SLOFILES=\
-		$(SLO)$/MDriver.obj						\
-		$(SLO)$/MServices.obj
-			
-# --- MOZAB BASE Library -----------------------------------
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS=\
-	$(CPPULIB)					\
-	$(CPPUHELPERLIB)			\
-	$(SALLIB)					\
-	$(DBTOOLSLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)$(DLLPOSTFIX)
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=	$(SHL1TARGET)
-DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
-			$(SLB)$/$(TARGET).lib
-DEFLIB1NAME=$(TARGET)
-
-
-# --- Files -------------------------------------
-MOZSLOFILES=\
-	$(SLO)$/MNSInit.obj			            \
-	$(SLO)$/MQueryHelper.obj			    \
-	$(SLO)$/MDatabaseMetaDataHelper.obj		\
-	$(SLO)$/MQuery.obj			            \
-	$(SLO)$/MTypeConverter.obj              \
-	$(SLO)$/MNameMapper.obj					\
-	$(SLO)$/MNSMozabProxy.obj	\
-	$(SLO)$/MNSTerminateListener.obj	\
-	$(SLO)$/MMozillaBootstrap.obj	\
-	$(SLO)$/MNSFolders.obj	\
-	$(SLO)$/MNSProfileDiscover.obj	\
-	$(SLO)$/MNSProfileManager.obj	\
-	$(SLO)$/MNSINIParser.obj	\
-	$(SLO)$/MNSRunnable.obj	\
-	$(SLO)$/MNSProfile.obj					\
-	$(SLO)$/MNSProfileDirServiceProvider.obj    \
-	$(SLO)$/MLdapAttributeMap.obj
-
-
-SLO2FILES=\
-		$(SLO)$/MConfigAccess.obj				\
-		$(SLO)$/MCatalog.obj					\
-		$(SLO)$/MColumns.obj					\
-		$(SLO)$/MTable.obj						\
-		$(SLO)$/MTables.obj						\
-		$(SLO)$/MColumnAlias.obj				\
-		$(SLO)$/MPreparedStatement.obj			\
-		$(SLO)$/MStatement.obj					\
-		$(SLO)$/MResultSetMetaData.obj			\
-		$(SLO)$/MResultSet.obj					\
-		$(SLO)$/MDatabaseMetaData.obj			\
-		$(SLO)$/MConnection.obj					\
-		$(MOZSLOFILES)
-
-DEPOBJFILES=$(SLO2FILES)
-
-# --- MOZAB BASE Library -----------------------------------
-
-SHL2VERSIONMAP= $(TARGET2).map
-SHL2NOCHECK=TRUE
-SHL2TARGET=	$(TARGET2)$(DLLPOSTFIX)
-SHL2OBJS=$(SLO2FILES)
-SHL2STDLIBS=\
-	$(CPPULIB)					\
-	$(CPPUHELPERLIB)			\
-	$(VOSLIB)					\
-	$(SALLIB)					\
-	$(DBTOOLSLIB)				\
-	$(COMPHELPERLIB)			\
-	$(MOZ_LIB_XPCOM)
-
-.IF "$(GUI)"=="WNT"
-	SHL2STDLIBS += \
-                 $(SHELL32LIB)
-.ENDIF # "$(GUI)"=="WNT"
-
-SHL2DEPN=
-SHL2IMPLIB=	i$(TARGET2)
-SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=	$(SHL2TARGET)
-
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
@@ -175,12 +84,6 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
 	@echo _TI				>$@
 	@echo _real				>>$@
 
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
-	@echo ------------------------------
-	@echo _TI				>$@
-	@echo _real				>>$@
-
-
 ALLTAR : $(MISC)/mozab.component
 
 $(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile_mozab.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile_mozab.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile_mozab.mk (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/makefile_mozab.mk Mon Jul  1 12:04:08 2013
@@ -32,26 +32,26 @@ CDEFS += -DMOZILLA_INTERNAL_API
 
 MOZINC = . \
         -I.. \
-        -I$(MOZ_INC) \
-        -I$(MOZ_INC)$/nspr \
-        -I$(MOZ_INC)$/xpcom \
-	    -I$(MOZ_INC)$/string \
-	    -I$(MOZ_INC)$/rdf \
-	    -I$(MOZ_INC)$/msgbase \
-	    -I$(MOZ_INC)$/addrbook \
-	    -I$(MOZ_INC)$/mork \
-	    -I$(MOZ_INC)$/locale \
-	    -I$(MOZ_INC)$/pref \
-	    -I$(MOZ_INC)$/mime \
-	    -I$(MOZ_INC)$/chrome \
-	    -I$(MOZ_INC)$/necko \
-	    -I$(MOZ_INC)$/intl \
-	    -I$(MOZ_INC)$/profile \
-	    -I$(MOZ_INC)$/embed_base \
-	    -I$(MOZ_INC)$/mozldap \
-	    -I$(MOZ_INC)$/uconv \
-	    -I$(MOZ_INC)$/xpcom_obsolete \
-	    -I$(MOZ_INC)$/content
+        -I$(MOZ_INC)
+#       -I$(MOZ_INC)$/nspr \
+#        -I$(MOZ_INC)$/xpcom \
+#	    -I$(MOZ_INC)$/string \
+#	    -I$(MOZ_INC)$/rdf \
+#	    -I$(MOZ_INC)$/msgbase \
+#	    -I$(MOZ_INC)$/addrbook \
+#	    -I$(MOZ_INC)$/mork \
+#	    -I$(MOZ_INC)$/locale \
+#	    -I$(MOZ_INC)$/pref \
+#	    -I$(MOZ_INC)$/mime \
+#	    -I$(MOZ_INC)$/chrome \
+#	    -I$(MOZ_INC)$/necko \
+#	    -I$(MOZ_INC)$/intl \
+#	    -I$(MOZ_INC)$/profile \
+#	    -I$(MOZ_INC)$/embed_base \
+#	    -I$(MOZ_INC)$/mozldap \
+#	    -I$(MOZ_INC)$/uconv \
+#	    -I$(MOZ_INC)$/xpcom_obsolete \
+#	    -I$(MOZ_INC)$/content
 	    
 .IF "$(GUI)" == "WNT"
   CDEFS +=    \

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx Mon Jul  1 12:04:08 2013
@@ -34,7 +34,7 @@
 #if defined __GNUC__
     #pragma GCC system_header
 #endif
-
+/*
 #include <nsDebug.h>
 
 #include <nsCOMPtr.h>
@@ -71,7 +71,7 @@
 #include <nsILDAPMessage.h>
 
 #include <prerr.h>
-
+*/
 #include "post_include_mozilla.h"
 
 #endif // _CONNECTIVITY_MAB_NS_INCLUDE_HXX_

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx Mon Jul  1 12:04:08 2013
@@ -32,18 +32,18 @@
 #include <osl/conditn.hxx>
 
 #include "pre_include_mozilla.h"
-#include <nsIProxyObjectManager.h>
+//#include <nsIProxyObjectManager.h>
 // More Mozilla includes for LDAP Connection Test
-#include "prprf.h"
-#include "nsILDAPURL.h"
-#include "nsILDAPMessage.h"
-#include "nsILDAPMessageListener.h"
-#include "nsILDAPErrors.h"
-#include "nsILDAPConnection.h"
-#include "nsILDAPOperation.h"
+//#include "prprf.h"
+//#include "nsILDAPURL.h"
+//#include "nsILDAPMessage.h"
+//#include "nsILDAPMessageListener.h"
+//#include "nsILDAPErrors.h"
+//#include "nsILDAPConnection.h"
+//#include "nsILDAPOperation.h"
 #include "post_include_mozilla.h"
-#include "MQuery.hxx"
-#include <MQueryHelper.hxx>
+//#include "MQuery.hxx"
+//#include <MQueryHelper.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <unotools/processfactory.hxx>
 #include "com/sun/star/mozilla/XProxyRunner.hpp"
@@ -60,16 +60,18 @@ using namespace connectivity::mozab;
 /* Implementation file */
 
 static ::osl::Mutex	m_aThreadMutex;
-extern nsresult NewAddressBook(const ::rtl::OUString * aName);
+//extern nsresult NewAddressBook(const ::rtl::OUString * aName);
 
 
 MNSMozabProxy::MNSMozabProxy()
 {
+/*
   m_Args = NULL;
 #if OSL_DEBUG_LEVEL > 0
   m_oThreadID = osl_getThreadIdentifier(NULL);
 #endif
   acquire();
+*/
 }
 
 MNSMozabProxy::~MNSMozabProxy()
@@ -78,6 +80,7 @@ MNSMozabProxy::~MNSMozabProxy()
 
 sal_Int32 MNSMozabProxy::StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile)
 {
+/*
     OSL_TRACE( "IN : MNSMozabProxy::StartProxy() \n" );
     ::osl::MutexGuard aGuard(m_aThreadMutex);
 	m_Product = aProduct;
@@ -93,30 +96,34 @@ sal_Int32 MNSMozabProxy::StartProxy(RunA
 	}
 	const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy > aCode(this);
 	return xRunner->Run(aCode);
+*/
+	return -1;
 }
 
-extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
-						::std::vector< ::rtl::OUString >*   _rStrings,
-                        ::std::vector< ::rtl::OUString >*   _rTypes,
-                        sal_Int32* pErrorId );
+//extern nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryType,MNameMapper *nmap,
+//						::std::vector< ::rtl::OUString >*   _rStrings,
+//                        ::std::vector< ::rtl::OUString >*   _rTypes,
+//                        sal_Int32* pErrorId );
 
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MNSMozabProxy::getProductType(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_Product;
+	return ::com::sun::star::mozilla::MozillaProductType_Default;
 }
 ::rtl::OUString SAL_CALL MNSMozabProxy::getProfileName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-	return m_Profile;
+	return rtl::OUString();
 }
 
 sal_Int32 SAL_CALL MNSMozabProxy::run(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+	return (sal_Int32)0x80070057L;//NS_ERROR_INVALID_ARG;
+/*
 #if OSL_DEBUG_LEVEL > 0
 	OSL_TRACE( "IN : MNSMozabProxy::Run() Caller thread :%4d \n" , m_oThreadID );
 #else
 	OSL_TRACE( "IN : MNSMozabProxy::Run() \n" );
 #endif
-	nsresult rv = NS_ERROR_INVALID_ARG;
+	//nsresult rv = NS_ERROR_INVALID_ARG;
 	if (m_Args == NULL)
     	return NS_ERROR_INVALID_ARG;
     switch(m_Args->funcIndex)
@@ -159,8 +166,9 @@ sal_Int32 SAL_CALL MNSMozabProxy::run(  
 	   	return NS_ERROR_INVALID_ARG;
     }
     return rv;
+*/
 }
-
+/*
 nsresult MNSMozabProxy::QueryHelperStub()
 {
     nsresult rv = NS_ERROR_INVALID_ARG;
@@ -197,6 +205,7 @@ nsresult MNSMozabProxy::QueryHelperStub(
 	}
 	return rv;
 }
+
 //-------------------------------------------------------------------
 
 #define NS_LDAPCONNECTION_CONTRACTID     "@mozilla.org/network/ldap-connection;1"
@@ -258,11 +267,6 @@ void MLDAPMessageListener::setConnection
     m_aCondition.set();
 }
 
-NS_IMETHODIMP MLDAPMessageListener::OnLDAPInit(nsILDAPConnection* /*aConn*/, nsresult aStatus )
-{
-    setConnectionStatus( NS_SUCCEEDED( aStatus ) ? sal_True : sal_False );
-    return aStatus;
-}
 
 NS_IMETHODIMP MLDAPMessageListener::OnLDAPMessage( nsILDAPMessage* aMessage )
 {
@@ -398,3 +402,4 @@ MNSMozabProxy::InitLDAP(sal_Char* sUri, 
         m_Args->arg5 = messageListener;
     return rv;
 }
+*/
\ No newline at end of file

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx Mon Jul  1 12:04:08 2013
@@ -96,18 +96,18 @@ namespace connectivity
         public:
         	sal_Int32 StartProxy(RunArgs * args,::com::sun::star::mozilla::MozillaProductType aProduct,const ::rtl::OUString &aProfile); //Call this to start proxy
 
-        protected:
-			nsresult testLDAPConnection();
-			nsresult InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* sPasswd,sal_Bool * nUseSSL);
-			nsresult QueryHelperStub();
+        //protected:
+			//nsresult testLDAPConnection();
+			//nsresult InitLDAP(sal_Char* sUri, sal_Unicode* sBindDN, sal_Unicode* sPasswd,sal_Bool * nUseSSL);
+			//nsresult QueryHelperStub();
         private:
-			::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner > xRunner;
+			//::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XProxyRunner > xRunner;
 
-            RunArgs * m_Args;
-			::com::sun::star::mozilla::MozillaProductType m_Product;
-			::rtl::OUString m_Profile;
+            //RunArgs * m_Args;
+			//::com::sun::star::mozilla::MozillaProductType m_Product;
+			//::rtl::OUString m_Profile;
 #if OSL_DEBUG_LEVEL > 0
-            oslThreadIdentifier m_oThreadID;
+            //oslThreadIdentifier m_oThreadID;
 #endif
         };
     }

Modified: openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/connectivity/source/drivers/mozab/mozillasrc/makefile.mk Mon Jul  1 12:04:08 2013
@@ -55,15 +55,15 @@ INCPRE += -I../bootstrap
 
 # --- Files -------------------------------------
 
-SLOFILES = \
-	$(SLO)$/MQueryHelper.obj			    \
-	$(SLO)$/MDatabaseMetaDataHelper.obj		\
-	$(SLO)$/MQuery.obj			            \
-	$(SLO)$/MTypeConverter.obj              \
-	$(SLO)$/MNameMapper.obj					\
-	$(SLO)$/MNSMozabProxy.obj	            \
-	$(SLO)$/MNSTerminateListener.obj        \
-	$(SLO)$/MLdapAttributeMap.obj           \
+SLOFILES = $(SLO)$/MNSMozabProxy.obj
+#	$(SLO)$/MQueryHelper.obj			    \
+#	$(SLO)$/MDatabaseMetaDataHelper.obj		\
+#	$(SLO)$/MQuery.obj			            \
+#	$(SLO)$/MTypeConverter.obj              \
+#	$(SLO)$/MNameMapper.obj					\
+#	$(SLO)$/MNSMozabProxy.obj	            
+#	$(SLO)$/MNSTerminateListener.obj        \
+#	$(SLO)$/MLdapAttributeMap.obj           \
 
 .ENDIF
 

Modified: openoffice/branches/Remove_MOZ/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/external_deps.lst?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/external_deps.lst (original)
+++ openoffice/branches/Remove_MOZ/main/external_deps.lst Mon Jul  1 12:04:08 2013
@@ -76,7 +76,7 @@ if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=Y
     URL1 = http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (WITH_MOZILLA != NO)
+if (ENABLE_NSS_MODULE != NO)
     MD5 = 1f24ab1d39f4a51faf22244c94a6203f
     name = xmlsec1-1.2.14.tar.gz
     URL1 = ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-1.2.14.tar.gz
@@ -304,13 +304,6 @@ if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA
     URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R3.zip
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
-if (ENABLE_CATEGORY_B==YES && WITH_MOZILLA!=NO && BUILD_MOZAB==TRUE)
-    MD5 = a169ab152209200a7bad29a275cb0333
-    name = seamonkey-1.1.14.source.tar.gz
-    # This seems to be the original host, but the MD5 sum does not match.
-    # URL1 = ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.4/seamonkey-1.1.4.source.tar.gz
-    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
 if (ENABLE_CATEGORY_B==YES && ENABLE_NSS_MODULE==YES)
     MD5 = b92261a5679276c400555004937af965
     name = nss-3.12.6-with-nspr-4.8.4.tar.gz

Modified: openoffice/branches/Remove_MOZ/main/libxmlsec/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/libxmlsec/prj/build.lst?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/libxmlsec/prj/build.lst (original)
+++ openoffice/branches/Remove_MOZ/main/libxmlsec/prj/build.lst Mon Jul  1 12:04:08 2013
@@ -1,3 +1,3 @@
-ls  libxmlsec   : stlport soltools LIBXML2:libxml2 MOZ:moz SO:moz_prebuilt NULL
+ls  libxmlsec   : stlport soltools LIBXML2:libxml2 NSS:nss SO:moz_prebuilt NULL
 ls	libxmlsec			    usr1	-	all	ls_mkout NULL
 ls	libxmlsec			    nmake	-	all	ls_xmlsec1 NULL

Modified: openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk Mon Jul  1 12:04:08 2013
@@ -359,13 +359,13 @@ my_components += directx5canvas
 my_components += adabas
 .END
 
-.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
-    "$(WITH_MOZILLA)" != "NO"
-my_components += mozab
-.ELIF "$(OS)" == "OS2"
-.ELSE
+#.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
+#    "$(WITH_MOZILLA)" != "NO"
+#my_components += mozab
+#.ELIF "$(OS)" == "OS2"
+#.ELSE
 my_components += mozbootstrap
-.END
+#.END
 
 .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
 my_components += desktopbe1

Modified: openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/packregistry/makefile.mk Mon Jul  1 12:04:08 2013
@@ -359,11 +359,11 @@ MY_FILES_main += $(MY_MOD)/DataAccess/ka
 .END
 .IF "$(SYSTEM_MOZILLA)" != "YES" && "$(WITH_MOZILLA)" != "NO" && \
         "$(OS)" != "MACOSX"
-.IF "$(OS)" == "WNT"
-MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
-.ELSE
-MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
-.END
+#.IF "$(OS)" == "WNT"
+#MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
+#.ELSE
+#MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
+#.END
 .END
 .IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu

Modified: openoffice/branches/Remove_MOZ/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/postprocess/rebase/coffbase.txt?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/rebase/coffbase.txt (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/rebase/coffbase.txt Mon Jul  1 12:04:08 2013
@@ -159,8 +159,6 @@ localedata_euro.dll 0x0000000061b60000 0
 localedata_others.dll 0x0000000061aa0000 0x000b0000
 logmi.dll        0x0000000061a70000 0x00020000
 mcnttype.dll     0x0000000061950000 0x00010000
-mozabmi.dll      0x00000000597a0000 0x00020000
-mozabdrvmi.dll   0x00000000597d0000 0x00070000
 msci_uno.dll     0x0000000061860000 0x00010000
 mysql2.dll       0x0000000061820000 0x00030000
 namingservice.uno.dll 0x0000000061800000 0x00010000

Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp Mon Jul  1 12:04:08 2013
@@ -921,12 +921,12 @@ File gid_File_Lib_Mcnttype
   #endif
 End
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
+/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
                                                                 // #i91209#
 STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
 STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 
-#else
+#else*/
 
 #ifndef OS2
 File gid_File_Lib_Mozbootstrap
@@ -941,7 +941,7 @@ File gid_File_Lib_Mozbootstrap
 End
 #endif
 
-#endif
+/*#endif*/
 
 #ifdef SYSTEM_LIBWPD
 STD_LIB_FILE(gid_File_Lib_Wpft,wpft)

Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_ooo.scp?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_ooo.scp Mon Jul  1 12:04:08 2013
@@ -1091,7 +1091,7 @@ File gid_File_Mod_Text
     Name = "text.mod";
 End
 
-#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) 
+/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) 
 
 File gid_File_Mozilla_Runtime
     TXT_FILE_BODY;
@@ -1100,7 +1100,7 @@ File gid_File_Mozilla_Runtime
     Name = "mozruntime.zip";
 End
 
-#endif
+#endif*/
 
 File gid_File_Share_Registry_Main_Xcd
     TXT_FILE_BODY;

Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk Mon Jul  1 12:04:08 2013
@@ -120,17 +120,17 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR
 SCPDEFS+=-DUSE_SYSTEM_STL
 .ENDIF
 
-.IF "$(WITH_MOZILLA)" == "NO"
-SCPDEFS+=-DWITHOUT_MOZILLA
-.ENDIF
+#.IF "$(WITH_MOZILLA)" == "NO"
+#SCPDEFS+=-DWITHOUT_MOZILLA
+#.ENDIF
 
 .IF "$(WITH_MYSPELL_DICTS)" == "NO"
 SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
 .ENDIF
 
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-SCPDEFS+=-DSYSTEM_MOZILLA
-.ENDIF
+#.IF "$(SYSTEM_MOZILLA)" == "YES"
+#SCPDEFS+=-DSYSTEM_MOZILLA
+#.ENDIF
 
 .IF "$(WITH_LDAP)" == "YES"
 SCPDEFS+=-DWITH_LDAP

Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/module_hidden_ooo.scp Mon Jul  1 12:04:08 2013
@@ -325,8 +325,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Hsqldb_2,
 	gid_File_Lib_Jdbc,
 	gid_File_Lib_Mcnttype,
-	gid_File_Lib_Mozab_2,
-	gid_File_Lib_Mozabdrv,
 	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql,
 	gid_File_Lib_Odbc,

Modified: openoffice/branches/Remove_MOZ/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/set_soenv.in?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/set_soenv.in (original)
+++ openoffice/branches/Remove_MOZ/main/set_soenv.in Mon Jul  1 12:04:08 2013
@@ -109,10 +109,10 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV
      $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
      $USE_DIRECTX5, $ATL_LIB, $ATL_LIB_X64, $HAVE_ATLTHUNK, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR,
      $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
-     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLABUILD,
 	 $PROEXT, $TARFILE_LOCATION,
      $ENABLE_HUNSPELL, $ENABLE_HYPHEN,
-     $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
+     $SYSTEM_PYTHON, $EPM_FLAGS);
 #
 #-------------------------------------------
 # IId. Declaring the aliases.
@@ -150,7 +150,6 @@ $warnfile       = "warn";           # lo
 $Warning        = "";               # container for warning messages
 $STLPORT4       = '@STLPORT4@';     # Location of STLport4
 $SYSTEM_PYTHON	= '@SYSTEM_PYTHON@';
-$SYSTEM_MOZILLA = '@SYSTEM_MOZILLA@';
 $JDK 		= '@JDK@';
 $JAVAFLAGS 		= '@JAVAFLAGS@';
 $MINGW          = '@WITH_MINGWIN@'; # use MinGW for Windows build
@@ -161,8 +160,6 @@ if ( $MINGW eq "yes" )
 else
 { $CC             = PathFormat('@CC@');           # C compiler
   $CXX            = PathFormat('@CXX@'); }        # C++ compiler
-$MOZILLA_VERSION	= '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla
-$MOZILLA_TOOLKIT	= '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla
 $FLIPCMD        = "";               # Flip '/' to '\' wrapper (only for winnt)
 $GLIBC          = "";               # Whether the platform uses glibc
 $PROEXT         = "@PROEXT@";
@@ -870,40 +867,6 @@ if ($platform =~ m/cygwin/)
 {  $ASM_PATH = PathFormat('@ASM_HOME@');
 }
 
-# Check for prebuild mozab libraries if we don't build them # ourselves
-# and we're also not using the external system mozilla installation.
-#
-# FIXME! This check should be done in configure and not here, but
-# the $OS, $COM, $CPU variables are not yet present there.
-#
-if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILLA@" ne "YES" )
-{  print("\nChecking for prebuilt Mozilla libraries ...");
-   my $mozbinfile = $SRC_ROOT."/moz/zipped/";
-   if ( $^O eq 'MSWin32' ) {
-       chomp( $mozbinfile = qx{cygpath -d "$mozbinfile"} );
-   }
-   $mozbinfile .= $OS.$COM.$CPU;
-   if ( -e $mozbinfile."inc.zip"
-        and -e $mozbinfile."lib.zip"
-        and -e $mozbinfile."runtime.zip" )
-   {   print " found.\n";
-       $PREBUILD_MOZAB = "YES";
-   }
-   else
-   {   print " not found!\n\n";
-       print "If you don\'t use the system mozilla and also not build the needed\n";
-       print "mozilla libraries yourself you have to provide the needed files\n";
-       print "$OS$COM$CPU\{inc,lib,runtime\}.zip in moz/zipped/ .\n";
-       print "These files can be found here:\n";
-       print "  <http://tools.openoffice.org/moz_prebuild/680/>.\n\n";
-       die;
-   }
-}
-else
-{
-   $PREBUILD_MOZAB = "";
-}
-
 #
 # E. Determining the envionment values based on the information
 #    that was gathered earlier on.
@@ -1397,10 +1360,6 @@ elsif ($platform =~ m/darwin/) 
 
 }
 
-if ($SYSTEM_MOZILLA eq "YES")
-{
-       $SOLARLIB .= $L."@MOZ_LIB@"
-}
 
 # Location of the compiler include search directory paths.
 $SOLARINC             = $I.$cur_dir.
@@ -1653,10 +1612,6 @@ ToFile( "PROFULLSWITCH",     "@PROFULLSW
 ToFile( "PROEXT",            $PROEXT,            "e" );
 ToFile( "VALGRIND_CFLAGS",   "@VALGRIND_CFLAGS@",  "e" );
 ToFile( "UNIXWRAPPERNAME",   "@UNIXWRAPPERNAME@","e" );
-ToFile( "BUILD_MOZAB",       "@BUILD_MOZAB@",    "e" );
-ToFile( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
-ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
-ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
 ToFile( "ENABLE_NSS_MODULE",  "@ENABLE_NSS_MODULE@", "e" );
 ToFile( "MOZILLABUILD",  "@MOZILLABUILD@", "e" );
 ToFile( "BUILD_VER_STRING",  "@BUILD_VER_STRING@", "e" );
@@ -1880,17 +1835,7 @@ ToFile( "THES_SYSTEM_DIR",   "@THES_SYST
 ToFile( "ENABLE_LOCKDOWN",   "@ENABLE_LOCKDOWN@",  "e" );
 ToFile( "WITH_LDAP",         "@WITH_LDAP@",        "e" );
 ToFile( "WITH_OPENLDAP",     "@WITH_OPENLDAP@",    "e" );
-ToFile( "WITH_MOZILLA",      "@WITH_MOZILLA@",     "e" );
-ToFile( "SYSTEM_MOZILLA",    "@SYSTEM_MOZILLA@",   "e" );
-ToFile( "MOZ_FLAVOUR",       "@MOZ_FLAVOUR@",      "e" );
-ToFile( "NSPR_LIB",          "@NSPR_LIB@",         "e" );
-ToFile( "NSS_LIB",           "@NSS_LIB@",          "e" );
 ToFile( "MOZ_INC",           "@MOZ_INC@",          "e" );
-ToFile( "MOZ_LIB",           "@MOZ_LIB@",          "e" );
-ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
-ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
-ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
-ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
 ToFile( "WITH_CATA_FONTS",   "@WITH_CATA_FONTS@",  "e" );
 ToFile( "WITH_CATB_FONTS",   "@WITH_CATB_FONTS@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );

Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/prj/build.lst?rev=1498395&r1=1498394&r2=1498395&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/prj/build.lst (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/prj/build.lst Mon Jul  1 12:04:08 2013
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
+xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL



Mime
View raw message