CWS-TOOLING: integrate CWS jl127

2009-07-30 10:12:10 +0200 jl  r274470 : #i100873# switch on checking for symbol definitions. It works with the current xpcom lib.
2009-07-29 09:48:29 +0200 jl  r274443 : #i100873#
2009-07-29 09:47:36 +0200 jl  r274442 : #i100873# changes after resync with DEV300m53 which contains the seamonkey update
2009-07-28 10:00:03 +0200 jl  r274389 : #100873# Patches from tono
2009-07-27 16:59:39 +0200 jl  r274372 : CWS-TOOLING: rebase CWS jl127 to trunk@274203 (milestone: DEV300:m53)
2009-07-07 09:08:53 +0200 jl  r273768 : #100873#
2009-07-06 17:16:10 +0200 jl  r273754 : #100873#
2009-07-01 13:58:09 +0200 jl  r273576 : #100873# added to readme
2009-07-01 13:15:02 +0200 jl  r273573 : #100873# deliver lib files when building with MS compiler
2009-06-30 11:22:06 +0200 jl  r273498 : #i100873# accidentally commented out patch_files
2009-06-30 09:01:10 +0200 jl  r273489 : #100873# make rc.exe work in ooo windows build
2009-06-29 09:47:56 +0200 jl  r273451 : #i100873# applied mingw patch from tono
2009-06-24 12:52:14 +0200 jl  r273332 : #100873# reapplying the configure.in patch on version 273150
2009-06-24 12:51:12 +0200 jl  r273331 : #100873# reapplying the patch on version 273150
2009-06-23 17:17:36 +0200 jl  r273299 : #100873# manually modified patch from tono
2009-06-22 17:05:41 +0200 jl  r273243 : #100873# applying mingw patch from tono
2009-06-22 17:02:30 +0200 jl  r273242 : #100873# applying mingw patch from tono
2009-06-22 12:49:57 +0200 jl  r273216 : #100873# dependency to stlport
2009-06-19 11:56:16 +0200 jl  r273155 : #100873# undoing a previous change, instset_native complained about missing libjpipe.jnilib (jurt)
2009-06-19 10:13:03 +0200 jl  r273150 : #100873# ooo builds shall also use the new nss by default
2009-06-18 14:32:07 +0200 jl  r273117 : #110873# more debug output when verifying a certificate
2009-06-16 11:23:50 +0200 jl  r273012 : #i10873#
2009-06-16 10:57:41 +0200 jl  r273011 : #100873# wrong parameter definition in nsscrypto_initialize
2009-06-16 10:56:45 +0200 jl  r273010 : #100873# wrong parameter definition in nsscrypto_initialize
2009-06-15 16:20:42 +0200 jl  r272996 : #100873# initialization of NSS is now threadsafe
2009-06-10 12:50:46 +0200 jl  r272804 : #100873# rename in foreach fails in 4nt
2009-06-09 13:43:00 +0200 jl  r272768 : #i100873# deliver only .h from inc/nss otherwise we get a warning when nss/nssck.api is delivered
2009-06-08 16:15:44 +0200 jl  r272739 : #i100873#
2009-06-08 16:04:54 +0200 jl  r272738 : #i100873#
2009-06-08 15:45:52 +0200 jl  r272736 : #i100873#
2009-06-08 15:44:15 +0200 jl  r272735 : #i100873# unzipping of nss.tar.z not working with 4nt
2009-06-08 09:45:46 +0200 jl  r272720 : #i100873#
2009-06-03 13:53:52 +0200 jl  r272562 : #i100873#  MOZILLABUILD not correct
2009-06-03 13:17:54 +0200 jl  r272557 : #i100873#  readme and makefile changes from cws jl125, support of new nss module
2009-06-03 09:57:40 +0200 jl  r272544 : #i100873#  added readme
2009-06-02 16:47:47 +0200 jl  r272512 : #i100873#  removed no longer needed stuff regarding jnilibs
2009-06-02 15:54:42 +0200 jl  r272510 : #i100873# added NSS to BUILD_TYPE
2009-06-02 15:20:18 +0200 jl  r272508 : #i100873# DEREFERENCE option for copy command
2009-06-02 13:00:12 +0200 jl  r272496 : #i100873# PATCH_FILE_NAMES is now PATCH_FILES
2009-06-02 12:23:39 +0200 jl  r272494 : #i100873# build dependency to nss
2009-05-29 16:21:40 +0200 jl  r272470 : #i100873# seting ENABLE_NSS_MODULE==YES and includeing mozilla-build-1.3 folder in environment
2009-05-29 16:03:23 +0200 jl  r272468 : #i100873# use intermediate certificates when validating a certificate
2009-05-29 15:57:16 +0200 jl  r272466 : #i100873# use intermediate certificates when validating a certificate
2009-05-29 15:49:58 +0200 jl  r272464 : #i100873# using ENABLE_NSS_MODULE
2009-05-29 15:33:14 +0200 jl  r272463 : #i100873# using ENABLE_NSS_MODULE
2009-05-29 15:28:39 +0200 jl  r272461 : #i100873# build dependency to nss module
2009-05-29 15:24:57 +0200 jl  r272460 : #i100873# pass additional certificates into verifyCertificate function
2009-05-29 14:49:40 +0200 jl  r272458 : #i100873# new NSS module
2009-05-29 14:43:44 +0200 jl  r272457 : #i100873# new NSS module

4 files changed, 245 insertions, 12 deletions

diff --git a/moz/README b/moz/README
new file mode 100755
index 000000000000..6b1d0a2e169e
--- /dev/null
+++ b/moz/README
@@ -0,0 +1,4 @@
+Rebuild moz whenever changes have been made in the nss module. Those libs are

+merged into mozruntime.zip which is build in this project.

+

+Please read nss/readme.txt !!!
\ No newline at end of file
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index d7027620d27c..654cbc8d05e0 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -36,6 +36,46 @@ RUNTIME_DIR=$(MISC)$/$(MOZTARGET)runtime
 LIB_DIR=$(LB)
 INCLUDE_DIR=$(INCCOM)
 
+
+
+#If we build the NSS module then we do not need the old nss libs from here
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+
+
+.IF "$(OS)" == "SOLARIS" 
+.IF "$(CPU)" == "S" #32bit
+FREEBL_LIB=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+.ELIF "$(CPU)" == "U" #64bit unxsolu4
+FREEBL_LIB=freebl_64int_3 freebl_64fpu_3
+.ELSE
+FREEBL_LIB=freebl3
+.ENDIF #"$(CPU)" == "S"
+
+.ELSE # "$(OS)" == "SOLARIS" 
+FREEBL_LIB=freebl3
+.ENDIF # "$(OS)" == "SOLARIS" 
+
+
+NSS_MODULE_RUNTIME_LIST:= \
+    $(FREEBL_LIB) \
+    nspr4 \
+    nss3 \
+    nssckbi \
+    nssdbm3 \
+    nssutil3 \
+    plc4 \
+    plds4 \
+    smime3 \
+    softokn3 \
+    sqlite3 \
+    ssl3
+
+BIN_RUNTIMELIST= \
+    xpcom \
+    xpcom_core \
+    xpcom_compat	
+.ELSE
+
 .IF "$(GUI)" == "WNT"
     FREEBL_LIB=freebl3
 .ELSE # "$(GUI)" == "WNT"
@@ -46,6 +86,7 @@ INCLUDE_DIR=$(INCCOM)
     .ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
 .ENDIF # "$(GUI)" == "WNT"
 
+
 BIN_RUNTIMELIST=	\
     nspr4	\
     plc4	\
@@ -58,7 +99,8 @@ BIN_RUNTIMELIST=	\
     softokn3	\
     smime3 \
     $(FREEBL_LIB)
-    
+.ENDIF #  "$(ENABLE_NSS_MODULE)"=="YES"
+
 .IF "$(GUI)"=="WNT"
 BIN_RUNTIMELIST+=	\
     js3250 	\
@@ -87,7 +129,7 @@ COMPONENT_RUNTIMELIST=	\
     vcard	\
     i18n 	\
     pipnss
-    
+
 .IF "$(GUI)"=="WNT"
 COMPONENT_RUNTIMELIST+=	\
     xppref32	\
@@ -126,8 +168,52 @@ DEFAULTS_RUNTIMELIST=	\
     greprefs$/all.js	\
     greprefs$/security-prefs.js
 
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+#These headers come from the separate NSS module if enabled
+NSS_INCLUDE_LIST= nspr nss
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+
+
+LIBLIST=        \
+        libembed_base_s.a \
+        libmozreg_s.a \
+        libnslber32v50.a \
+        libnsldap32v50.a \
+    libxpcom_core.dll.a \
+        libxpcom.dll.a 
+
+.ELSE #"$(COM)"=="GCC"
+
+LIBLIST=        \
+        embed_base_s.lib \
+        mozreg_s.lib \
+        nslber32v50.lib \
+        nsldap32v50.lib \
+    xpcom_core.lib	\
+        xpcom.lib 
+
+.ENDIF #"$(COM)"=="GCC"
+
+.ELSE   #"$(GUI)"=="WNT"
+
+LIBLIST=        \
+        libembed_base_s.a \
+        libmozreg_s.a \
+        liblber50.a \
+    libxpcom_core$(DLLPOST)	\
+        libxpcom$(DLLPOST)      \
+        libmsgbaseutil$(DLLPOST)        \
+        libldap50$(DLLPOST) \
+
+.ENDIF
+
+.ELSE # .IF"$(ENABLE_NSS_MODULE)"=="YES"
+
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
+
 LIBLIST=	\
     libembed_base_s.a	\
     libmozreg_s.a	\
@@ -138,7 +224,9 @@ LIBLIST=	\
     libxpcom.dll.a	\
     libnss3.a	\
     libsmime3.a
+
 .ELSE
+
 LIBLIST=	\
     embed_base_s.lib	\
     mozreg_s.lib	\
@@ -152,8 +240,11 @@ LIBLIST=	\
     nss3.lib	\
     ssl3.lib	\
     smime3.lib
+
 .ENDIF
-.ELSE	#"$(GUI)"=="WNT"
+
+.ELSE   #"$(GUI)"=="WNT"
+
 LIBLIST=	\
     libembed_base_s.a	\
     libmozreg_s.a	\
@@ -169,7 +260,9 @@ LIBLIST=	\
     libnss3$(DLLPOST)	\
     libssl3$(DLLPOST)	\
     libsmime3$(DLLPOST)
+
 .ENDIF
+.ENDIF # .IF "$(ENABLE_NSS_MODULE)"=="YES"
 
 INCLUDE_PATH=$(MOZ_DIST_DIR)$/include$/
 PUBLIC_PATH=$(MOZ_DIST_DIR)$/public$/
@@ -188,7 +281,7 @@ extract_mozab_files:	$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) \
     $(MISC)$/build$/so_moz_runtime_files	\
     $(MISC)$/build$/so_moz_include_files	\
     $(MISC)$/build$/so_moz_lib_files
-    
+
 make_temp_dir:
     @@-$(MKDIR)	$(RUNTIME_DIR)
     @@-$(MKDIR)	$(RUNTIME_DIR)$/components
@@ -212,7 +305,21 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
     $(foreach,file,$(BIN_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$(file)$(DLLPOST) \
     $(LIB_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
     echo >& $(NULLDEV)
+.IF "$(ENABLE_NSS_MODULE)" == "YES"
+# We add the libraries from the separate nss module
+    $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARLIBDIR)$/$(DLLPRE)$(file)$(DLLPOST) \
+    $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
+    echo >& $(NULLDEV)
 .ENDIF
+.ELSE # .IF "$(GUI)" == "UNX"
+.IF "$(ENABLE_NSS_MODULE)" == "YES"
+# We add the libraries from the separate nss module
+    $(foreach,file,$(NSS_MODULE_RUNTIME_LIST) $(COPY) $(SOLARBINDIR)$/$(DLLPRE)$(file)$(DLLPOST) \
+    $(RUNTIME_DIR)$/$(DLLPRE)$(file)$(DLLPOST) &&) \
+    echo >& $(NULLDEV)
+.ENDIF
+.ENDIF # .IF "$(GUI)" == "UNX"
+
 
 # copy files in RES_FILELIST
 .IF "$(OS)"=="SOLARIS"
@@ -275,12 +382,13 @@ $(MISC)$/build$/so_moz_runtime_files: 	$(OUT)$/bin$/mozruntime.zip
 
 # zip runtime files to mozruntime.zip
     cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip *
-    
+
     $(TOUCH) $@
 
 $(INCCOM)$/nsBuildID.h: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @-echo "You can delete $(INCCOM) to force it copy all include files again."
-    
+
+
 $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
 .IF "$(USE_SHELL)"=="4nt"
     $(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR)
@@ -299,6 +407,13 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
     chmod -R 775 $(INCCOM)
 .ENDIF
     $(TOUCH) $@
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+        +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCLUDE_DIR)$/$(dir) \
+    $(INCLUDE_DIR)$/$(dir)_remove_me &&) \
+        echo >& $(NULLDEV)
+        $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCLUDE_DIR)$/$(dir)_remove_me &&) \
+        echo >& $(NULLDEV)
+.ENDIF
 
 # On UNX the rules for so_moz_runtime_files copy files into the same directory
 # used here (LIB_DIR), and on MACOSX all those files together need to be
@@ -316,13 +431,13 @@ $(MISC)$/build$/so_moz_lib_files:		$(foreach,file,$(LIBLIST) $(LIB_DIR)$/$(file)
     chmod -R 775 $(LB)
 .ENDIF
     $(TOUCH) $@
-    
+
 $(BIN_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @$(COPY) $(MOZ_BIN_DIR)$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/$(DLLPRE)$@$(DLLPOST)
 
 $(COMPONENT_RUNTIMELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @$(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$@$(DLLPOST) $(RUNTIME_DIR)$/components$/$(DLLPRE)$@$(DLLPOST)
-    
+
 $(COMREGISTRY_FILELIST): $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) 
     @$(COPY) $(MOZ_BIN_DIR)$/components$/$@ $(RUNTIME_DIR)$/components$/$@
 
@@ -336,7 +451,6 @@ RES_FILELIST: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     @echo No Res Files to copy.
 .ENDIF
 
-    
 $(LIB_DIR)$/%: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
     noop
 
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index f5593fae6d42..717c309da96e 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz	moz : solenv SO:so_prereq NULL
+moz	moz : solenv SO:so_prereq NSS:nss NULL
 moz	moz				usr1	-	all	moz_mkout NULL
 moz	moz				nmake	-	all	moz_mozilla     NULL
 moz	moz\zipped			nmake	-	all	moz_zipped	moz_mozilla NULL
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 9015bed34d60..400b5767759c 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -55,7 +55,8 @@ ALLTAR:
 ALLTAR: \
     $(MISC)$/unpacked_$(TARGET)_inc \
     $(MISC)$/unpacked_$(TARGET)_lib \
-    $(BIN)$/mozruntime.zip
+    $(BIN)$/mozruntime.zip \
+    $(MISC)$/replace_old_nss_libs
 .ENDIF
 .IF "$(GUI)" == "UNX"
 
@@ -81,6 +82,120 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
 $(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip
     $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
 
+LIBLIST =
+BIN_RUNTIMELIST = 
+NSS_INCLUDE_LIST =
+NSS_MODULE_RUNTIME_LIST =
+
+.IF "$(ENABLE_NSS_MODULE)"=="YES"
+# The prebuilt moz files include all the old NSS stuff from moz and not the new
+# NSS libs, headers, etc, from the separate nss module. If we use the nss module
+# then we must take care not to deliver the old NSS stuff from the "prebuilts"
+.IF "$(GUI)" == "WNT"
+    FREEBL_LIB_OLD=freebl3
+.ELSE # "$(GUI)" == "WNT"
+    .IF "$(OS)$(CPUNAME)" == "SOLARISSPARC"
+        FREEBL_LIB_OLD=freebl_32fpu_3
+    .ELSE # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
+        FREEBL_LIB_OLD=freebl3
+    .ENDIF # "$(OS)$(CPUNAME)" == "SOLARISSPARC"
+.ENDIF # "$(GUI)" == "WNT"
+
+BIN_RUNTIMELIST= \
+    $(FREEBL_LIB_OLD) \
+    nspr4 \
+    plc4 \
+    plds4 \
+    nss3 \
+    ssl3 \
+    softokn3 \
+    smime3
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+LIBLIST= \
+    libnspr4.a \
+    libnss3.a \
+    libsmime3.a \
+    libplc4.a \
+    libplds4.a \
+    libssl3.a
 
-.ENDIF	 # unpack mozab zips
+.ELSE
+LIBLIST= \
+    nspr4.lib \
+    plc4.lib \
+    plds4.lib \
+    nss3.lib \
+    ssl3.lib\
+    smime3.lib
+.ENDIF
+.ELSE   #"$(GUI)"=="WNT"
+LIBLIST= \
+    lib$(FREEBL_LIB_OLD)$(DLLPOST) \
+    libnspr4$(DLLPOST) \
+    libsoftokn3$(DLLPOST) \
+    libplc4$(DLLPOST) \
+    libplds4$(DLLPOST) \
+    libnss3$(DLLPOST) \
+    libssl3$(DLLPOST) \
+    libsmime3$(DLLPOST)
+
+.ENDIF # .IF "$(GUI)"=="WNT"
+
+
+NSS_INCLUDE_LIST= nspr nss
+
+
+.IF "$(OS)" == "SOLARIS" 
+.IF "$(CPU)" == "S" #32bit
+FREEBL=freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+.ELIF "$(CPU)" == "U" #64bit unxsolu4
+FREEBL=freebl_64int_3 freebl_64fpu_3
+.ELSE
+FREEBL=freebl3
+.ENDIF #"$(CPU)" == "S"
+
+.ELSE # "$(OS)" == "SOLARIS" 
+FREEBL=freebl3
+.ENDIF # "$(OS)" == "SOLARIS" 
+
+
+NSS_MODULE_RUNTIME_LIST:= \
+    $(FREEBL) \
+    nspr4 \
+    nss3 \
+    nssckbi \
+    nssdbm3 \
+    nssutil3 \
+    plc4 \
+    plds4 \
+    smime3 \
+    softokn3 \
+    sqlite3 \
+    ssl3
+
+
+.ENDIF #.IF "$(ENABLE_NSS_MODULE)"=="YES"
+# Remove the nss libs build in moz and those build in the nss module
+$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
+$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
+    +$(foreach,dir,$(NSS_INCLUDE_LIST) $(RENAME:s/+//) $(INCCOM)$/$(dir) \
+    $(INCCOM)$/$(dir)_remove_me &&)  echo >& $(NULLDEV)
+    $(foreach,dir,$(NSS_INCLUDE_LIST) rm -r -f $(INCCOM)$/$(dir)_remove_me &&) \
+        echo >& $(NULLDEV)
+    $(foreach,lib,$(LIBLIST) rm -f $(LB)$/$(lib) &&) \
+    echo >& $(NULLDEV)
+    $(foreach,lib,$(BIN_RUNTIMELIST) zip -d $(BIN)$/mozruntime.zip $(DLLPRE)$(lib)$(DLLPOST) &&) \
+    echo >& $(NULLDEV)
+.IF "$(GUI)"=="WNT"
+    $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARBINDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \
+    echo >& $(NULLDEV)
+.ELSE
+    $(foreach,lib,$(NSS_MODULE_RUNTIME_LIST) zip -g -j $(BIN)$/mozruntime.zip $(SOLARLIBDIR)$/$(DLLPRE)$(lib)$(DLLPOST) &&) \
+    echo >& $(NULLDEV)
+.ENDIF
+    $(TOUCH) $@     
+
+.ENDIF   # unpack mozab zips