Replace NSS with Pale Moon's

security/nss/lib/ckfw/builtins/testlib/Makefile

@@ -4,8 +4,26 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+# Needed for compilation of $(OBJDIR)/certdata.c
+INCLUDES += -I.
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
+
+ifdef USE_GCOV
+DSO_LDOPTS += --coverage
+endif
 
 EXTRA_LIBS =                                       \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
@@ -38,6 +56,11 @@ EXTRA_SHARED_LIBS +=  \
 	$(NULL)
 endif # OS_TARGET
 
+SIMPLE_OBJS   = $(notdir $(CSRCS:.c=$(OBJ_SUFFIX)))
+OBJS          = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS))
+vpath %c $(dir $(CSRCS)) # $(OBJDIR)
+
+
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 CFLAGS += -I$(CORE_DEPTH)/lib/ckfw/builtins
@@ -47,6 +70,6 @@ ifndef NSS_CERTDATA-TESTLIB_TXT
 NSS_CERTDATA-TESTLIB_TXT = certdata-testlib.txt
 endif
 
-$(OBJDIR)/certdata-testlib.c: $(NSS_CERTDATA-TESTLIB_TXT)
-	@$(MAKE_OBJDIR)
+$(OBJDIR)/certdata-testlib.c: $(NSS_CERTDATA-TESTLIB_TXT) | $$(@D)/d
 	$(PERL) ../certdata.perl $(NSS_CERTDATA-TESTLIB_TXT) $@
+

security/nss/lib/ckfw/builtins/testlib/builtins-testlib.gyp

@@ -30,7 +30,7 @@
         {
           'msvs_cygwin_shell': 0,
           'action': [
-            'python',
+            '<(python)',
             '../certdata.py',
             'certdata-testlib.txt',
             '<@(_outputs)',
@@ -47,7 +47,7 @@
         }
       ],
       'variables': {
-        'mapfile': '../nssckbi.def',
+        'mapfile': 'nssckbi-testlib.def',
         'certdata-testlib_c': '<(INTERMEDIATE_DIR)/certdata-testlib.c',
       }
     }

security/nss/lib/ckfw/builtins/testlib/config.mk

@@ -1,38 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-	SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
-	RES = $(OBJDIR)/$(LIBRARY_NAME).res
-	RESNAME = $(LIBRARY_NAME).rc
-endif
-
-ifdef BUILD_IDG
-	DEFINES += -DNSSDEBUG
-endif
-
-# Needed for compilation of $(OBJDIR)/certdata.c
-INCLUDES += -I.
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-ifdef USE_GCOV
-DSO_LDOPTS += --coverage
-endif

security/nss/lib/ckfw/builtins/testlib/manifest.mn

@@ -23,3 +23,4 @@ CSRCS =			\
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi-testlib
+LIBRARY = $(NULL)

security/nss/lib/ckfw/builtins/testlib/nssckbi-testlib.def

@@ -0,0 +1,26 @@
+;+#
+;+# This Source Code Form is subject to the terms of the Mozilla Public
+;+# License, v. 2.0. If a copy of the MPL was not distributed with this
+;+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;+#
+;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS
+;+#   1. For all unix platforms, the string ";-"  means "remove this line"
+;+#   2. For all unix platforms, the string " DATA " will be removed from any 
+;+#     line on which it occurs.
+;+#   3. Lines containing ";+" will have ";+" removed on SUN and LINUX.
+;+#      On AIX, lines containing ";+" will be removed.
+;+#   4. For all unix platforms, the string ";;" will thave the ";;" removed.
+;+#   5. For all unix platforms, after the above processing has taken place,
+;+#    all characters after the first ";" on the line will be removed.
+;+#    And for AIX, the first ";" will also be removed.
+;+#  This file is passed directly to windows. Since ';' is a comment, all UNIX
+;+#   directives are hidden behind ";", ";+", and ";-"
+;+
+;+NSS_3.1 {       # NSS 3.1 release
+;+    global:
+LIBRARY nssckbi-testlib ;-
+EXPORTS ;-
+C_GetFunctionList;
+;+    local:
+;+*;
+;+};