Author: hdu Date: Wed Oct 16 14:38:13 2013 New Revision: 1532779 URL: http://svn.apache.org/r1532779 Log: #i122365# remove dependencies of security features to Mozilla binaries
using the NSS library instead of the ancient Seamonkey 1.1.14 (released in 2008) binaries Modified: openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_resource_ooo.scp openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk 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=1532779&r1=1532778&r2=1532779&view=diff ============================================================================== --- openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk (original) +++ openoffice/branches/Remove_MOZ/main/postprocess/packcomponents/makefile.mk Wed Oct 16 14:38:13 2013 @@ -301,7 +301,7 @@ my_components += ScriptProviderForJavaSc my_components += ldapbe2 .END -.IF "$(WITH_MOZILLA)" != "NO" +.IF "$(ENABLE_NSS_MODULE)" != "NO" my_components += \ xmlsecurity \ xsec_fw \ @@ -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 ("$(SYSTEM_MOZILLA)" == "YES") || ("$(WITH_MOZILLA)" != "YES") +.IF "$(OS)" != "MACOSX" +my_components += mozab +.ELIF my_components += mozbootstrap -#.END +.END +.END .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2" my_components += desktopbe1 Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_resource_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_resource_ooo.scp?rev=1532779&r1=1532778&r2=1532779&view=diff ============================================================================== --- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_resource_ooo.scp (original) +++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_resource_ooo.scp Wed Oct 16 14:38:13 2013 @@ -111,7 +111,7 @@ STD_RES_FILE( gid_File_Res_Xsltdlg, xslt STD_RES_FILE( gid_File_Res_AVMedia, avmedia ) -#ifndef WITHOUT_MOZILLA +#ifdef ENABLE_XMLSEC STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec ) #endif 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=1532779&r1=1532778&r2=1532779&view=diff ============================================================================== --- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk (original) +++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk Wed Oct 16 14:38:13 2013 @@ -128,9 +128,10 @@ SCPDEFS+=-DUSE_SYSTEM_STL SCPDEFS+=-DWITHOUT_MYSPELL_DICTS .ENDIF -#.IF "$(SYSTEM_MOZILLA)" == "YES" -#SCPDEFS+=-DSYSTEM_MOZILLA -#.ENDIF +.IF "$(ENABLE_NSS_MODULE)" == "YES" +SCPDEFS+=-DENABLE_XMLSEC +SCPDEFS+=-DBUNDLE_NSS_LIBS +.ENDIF .IF "$(WITH_LDAP)" == "YES" SCPDEFS+=-DWITH_LDAP Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk?rev=1532779&r1=1532778&r2=1532779&view=diff ============================================================================== --- openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk (original) +++ openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk Wed Oct 16 14:38:13 2013 @@ -102,7 +102,7 @@ SHL2STDLIBS += \ SHL2STDLIBS +=-ldl .ENDIF -.IF "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(ENABLE_NSS_MODULE)"=="YES" .IF "$(NSPR_LIB)" != "" SHL2STDLIBS += $(NSPR_LIB) .ENDIF