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 13:49:08 UTC
svn commit: r1538582 - in /openoffice/branches/Remove_MOZ/main/xmlsecurity:
source/xmlsec/makefile.mk source/xmlsec/nss/makefile.mk
tools/demo/makefile.mk tools/demo/mozprofile.cxx util/makefile.mk
Author: hdu
Date: Mon Nov 4 12:49:08 2013
New Revision: 1538582
URL: http://svn.apache.org/r1538582
Log:
#i122365# replace xmlsecurity dependency from moz to nss
Modified:
openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/makefile.mk
openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/nss/makefile.mk
openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/makefile.mk
openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/mozprofile.cxx
openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk
Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/makefile.mk?rev=1538582&r1=1538581&r2=1538582&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/makefile.mk Mon Nov 4 12:49:08 2013
@@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
.ENDIF
-.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(ENABLE_NSS_MODULE)"!="YES"
@all:
- @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.."
-.ENDIF
+ @echo "No nss -> no libxmlsec -> no xmlsecurity.."
.ENDIF
.IF "$(CRYPTO_ENGINE)" == "mscrypto"
Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1538582&r1=1538581&r2=1538582&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/source/xmlsec/nss/makefile.mk Mon Nov 4 12:49:08 2013
@@ -37,11 +37,9 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGS+=-DSYSTEM_LIBXML $(LIBXML_CFLAGS)
.ENDIF
-.IF "$(WITH_MOZILLA)" == "NO" || "$(ENABLE_NSS_MODULE)"!="YES"
-.IF "$(SYSTEM_MOZILLA)" != "YES"
+.IF "$(ENABLE_NSS_MODULE)"!="YES"
@all:
- @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss"
-.ENDIF
+ @echo "No nss -> no libxmlsec -> no xmlsecurity/nss"
.ENDIF
.IF "$(SYSTEM_MOZILLA)" != "YES"
@@ -54,13 +52,6 @@ NSS_INC = $(MOZ_NSS_CFLAGS)
NSPR_INC = $(MOZ_INC)$/nspr
.ENDIF
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF # "$(COMNAME)"=="sunpro5"
-.ENDIF
-
.IF "$(GUI)" == "WNT"
.IF "$(DBG_LEVEL)" == "0"
INCPRE += \
@@ -118,11 +109,7 @@ SOLARINC += \
-I$(NSPR_INC) \
-I$(PRJ)$/source$/xmlsec
-.IF "$(SYSTEM_MOZILLA)" == "YES"
-SOLARINC += -DSYSTEM_MOZILLA $(NSS_INC)
-.ELSE
SOLARINC += -I$(NSS_INC)
-.ENDIF
SLOFILES = \
$(SLO)$/nssinitializer.obj \
Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/makefile.mk?rev=1538582&r1=1538581&r2=1538582&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/makefile.mk Mon Nov 4 12:49:08 2013
@@ -98,14 +98,6 @@ APP3STDLIBS+=$(SHARE_LIBS)
APP3OBJS= $(SHARE_OBJS) $(OBJ)$/multisigdemo.obj
#
-# ---------- mozprofile ----------
-#
-APP4TARGET=mozprofile
-APP4DEPN=makefile.mk
-APP4STDLIBS+=$(SHARE_LIBS)
-APP4OBJS= $(SHARE_OBJS) $(OBJ)$/mozprofile.obj
-
-#
# ---------- performance ----------
#
APP5TARGET=performance
@@ -137,8 +129,7 @@ REGISTERLIBS= \
dynamicloader.uno$(DLLPOST) \
namingservice.uno$(DLLPOST) \
bootstrap.uno$(DLLPOST) \
- sax.uno$(DLLPOST) \
- $(DLLPRE)mozab2$(DLLPOST)
+ sax.uno$(DLLPOST)
$(BIN)$/demo.rdb: \
makefile.mk \
Modified: openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/mozprofile.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/mozprofile.cxx?rev=1538582&r1=1538581&r2=1538582&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/mozprofile.cxx (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/tools/demo/mozprofile.cxx Mon Nov 4 12:49:08 2013
@@ -33,7 +33,6 @@
#include <xmlsecurity/biginteger.hxx>
#include <xmlsecurity/xmlsignaturehelper.hxx>
-#include <com/sun/star/mozilla/XMozillaBootstrap.hpp>
using namespace ::com::sun::star;
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=1538582&r1=1538581&r2=1538582&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk Mon Nov 4 12:49:08 2013
@@ -35,9 +35,9 @@ USE_DEFFILE=TRUE
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/target.pmk
-.IF "$(WITH_MOZILLA)" == "NO"
+.IF "$(ENABLE_NSS_MODULE)" != "YES"
@all:
- @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity..."
+ @echo "No nss -> no libxmlsec -> no xmlsecurity..."
.ENDIF
# --- Files --------------------------------------------------------
@@ -71,8 +71,6 @@ SHL2NAME=xsec_xmlsec
SHL2TARGET= $(SHL2NAME)
-.IF "$(ENABLE_NSS_MODULE)"=="YES" || "$(SYSTEM_MOZILLA)" == "YES"
-
SHL2LIBS= \
$(SLB)$/xs_comm.lib
@@ -84,8 +82,6 @@ SHL2LIBS += \
SHL2LIBS += \
$(SLB)$/xs_nss.lib
-.ENDIF
-
SHL2STDLIBS += \
$(SALLIB) \