You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/04 14:16:20 UTC
svn commit: r1538586 - in /openoffice/branches/Remove_MOZ/main: configure.in
moz/ scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_ooo.scp
scp2/source/ooo/makefile.mk scp2/source/ooo/module_hidden_ooo.scp
set_soenv.in
Author: hdu
Date: Mon Nov 4 13:16:20 2013
New Revision: 1538586
URL: http://svn.apache.org/r1538586
Log:
#i123623# remove the moz module
The moz/Seamonkey module is no longer needed as the AOO dependency
on it for security has been replaced with NSS and the address books
provided by it have been dropped.
Removed:
openoffice/branches/Remove_MOZ/main/moz/
Modified:
openoffice/branches/Remove_MOZ/main/configure.in
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
Modified: openoffice/branches/Remove_MOZ/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/configure.in?rev=1538586&r1=1538585&r2=1538586&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/configure.in (original)
+++ openoffice/branches/Remove_MOZ/main/configure.in Mon Nov 4 13:16:20 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
@@ -403,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,
@@ -605,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
@@ -4788,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
@@ -5005,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 ===================================================================
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=1538586&r1=1538585&r2=1538586&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 Nov 4 13:16:20 2013
@@ -969,24 +969,6 @@ End
#if defined(WNT)
#if defined(M1400)
#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Common_Ure;
-// Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
File gid_File_Lib_Msvcm80
BIN_FILE_BODY;
Styles = (PACKED);
@@ -1858,24 +1840,6 @@ STD_LIB_FILE( gid_File_Lib_Oooimprovecor
STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#endif
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
- !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
- // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
- // gid_Brand_File_Lib_Msvcr80
-File gid_File_Moz_Msvcp80
- TXT_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("msvcp80");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-File gid_File_Moz_Msvcr80
- TXT_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("msvcr80");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-End
-#endif
-
#if defined(WNT)
File gid_File_Lib_Msvcr100
TXT_FILE_BODY;
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=1538586&r1=1538585&r2=1538586&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 Nov 4 13:16:20 2013
@@ -1091,17 +1091,6 @@ File gid_File_Mod_Text
Name = "text.mod";
End
-/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
-
-File gid_File_Mozilla_Runtime
- TXT_FILE_BODY;
- Styles = (ARCHIVE);
- Dir = SCP2_OOO_BIN_DIR;
- Name = "mozruntime.zip";
-End
-
-#endif*/
-
File gid_File_Share_Registry_Main_Xcd
TXT_FILE_BODY;
Styles = (PACKED, SCPZIP_REPLACE);
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=1538586&r1=1538585&r2=1538586&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk Mon Nov 4 13:16:20 2013
@@ -120,10 +120,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR
SCPDEFS+=-DUSE_SYSTEM_STL
.ENDIF
-#.IF "$(WITH_MOZILLA)" == "NO"
-#SCPDEFS+=-DWITHOUT_MOZILLA
-#.ENDIF
-
.IF "$(WITH_MYSPELL_DICTS)" == "NO"
SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
.ENDIF
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=1538586&r1=1538585&r2=1538586&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 Nov 4 13:16:20 2013
@@ -325,7 +325,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Hsqldb_2,
gid_File_Lib_Jdbc,
gid_File_Lib_Mcnttype,
- gid_File_Lib_Mozbootstrap,
gid_File_Lib_Mysql,
gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
@@ -714,10 +713,7 @@ Module gid_Module_Root_Files_7
Sortkey = "1900";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Help_Help_Zip,
- gid_File_Moz_Msvcp71,
- gid_File_Moz_Msvcr71,
- gid_File_Mozilla_Runtime);
+ Files = (gid_File_Help_Help_Zip);
End
Module gid_Module_Root_Files_Images
Modified: openoffice/branches/Remove_MOZ/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/set_soenv.in?rev=1538586&r1=1538585&r2=1538586&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/set_soenv.in (original)
+++ openoffice/branches/Remove_MOZ/main/set_soenv.in Mon Nov 4 13:16:20 2013
@@ -1952,7 +1952,6 @@ ToFile( "SYSTEM_PANGO", "@SYSTEM_PA
ToFile( "SYSTEM_LIBPNG", "@SYSTEM_LIBPNG@", "e" );
ToFile( "SYSTEM_LIBJPEG", "@SYSTEM_LIBJPEG@", "e" );
ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" );
-ToFile( "DISABLE_XAW", "@DISABLE_XAW@", "e" );
ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" );
ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" );
ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" );