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/10/17 11:47:33 UTC
svn commit: r1533024 - in /openoffice/branches/Remove_MOZ/main:
postprocess/packcomponents/makefile.mk scp2/source/ooo/file_library_ooo.scp
Author: hdu
Date: Thu Oct 17 09:47:33 2013
New Revision: 1533024
URL: http://svn.apache.org/r1533024
Log:
#i122365# #i91209# disable the mozab compononent again on Mac
Modified:
openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
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=1533024&r1=1533023&r2=1533024&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk Thu Oct 17 09:47:33 2013
@@ -359,12 +359,11 @@ my_components += directx5canvas
my_components += adabas
.END
-.IF ("$(SYSTEM_MOZILLA)" == "YES") || ("$(WITH_MOZILLA)" != "YES")
-.IF "$(OS)" != "MACOSX"
-my_components += mozab
-.ELIF
-my_components += mozbootstrap
-.END
+.IF ("$(SYSTEM_MOZILLA)" == "YES") || ("$(WITH_MOZILLA)" == "YES")
+ my_components += mozbootstrap
+ .IF "$(OS)" != "MACOSX" // #i91209# mozilla address books disabled on OSX
+ my_components += mozab
+ .END
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
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=1533024&r1=1533023&r2=1533024&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 Thu Oct 17 09:47:33 2013
@@ -921,14 +921,13 @@ File gid_File_Lib_Mcnttype
#endif
End
-/*#if !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) && !defined(MACOSX)
- // #i91209#
+#if defined(WITH_MOZILLA)
+
+#if !defined(MACOSX) // #i91209# mozilla address books disabled on Mac
STD_LIB_FILE(gid_File_Lib_Mozab,mozab)
STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
+#endif
-#else*/
-
-#ifndef OS2
File gid_File_Lib_Mozbootstrap
TXT_FILE_BODY;
Styles = (PACKED);
@@ -939,9 +938,9 @@ File gid_File_Lib_Mozbootstrap
Name = "mozbootstrap.dll";
#endif
End
-#endif
-/*#endif*/
+#endif // WITH_MOZILLA
+
#ifdef SYSTEM_LIBWPD
STD_LIB_FILE(gid_File_Lib_Wpft,wpft)