summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh1
-rw-r--r--coreconf/config.gypi1
-rw-r--r--lib/ckfw/builtins/testlib/builtins-testlib.gyp2
-rw-r--r--lib/ckfw/builtins/testlib/nssckbi-testlib.def26
-rw-r--r--nss.gyp11
5 files changed, 40 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 51a6203fc..47e6904bc 100755
--- a/build.sh
+++ b/build.sh
@@ -131,6 +131,7 @@ while [ $# -gt 0 ]; do
--mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;
--disable-keylog) sslkeylogfile=0 ;;
--enable-legacy-db) gyp_params+=(-Ddisable_dbm=0) ;;
+ --mozilla-central) gyp_params+=(-Dmozilla_central=1) ;;
-D*) gyp_params+=("$1") ;;
*) show_help; exit 2 ;;
esac
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index cbcdf4c13..4c8931c6d 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -130,6 +130,7 @@
'only_dev_random%': 1,
'disable_fips%': 1,
'mozpkix_only%': 0,
+ 'mozilla_central%': 0,
'coverage%': 0,
'softfp_cflags%': '',
'enable_draft_hpke%': 0,
diff --git a/lib/ckfw/builtins/testlib/builtins-testlib.gyp b/lib/ckfw/builtins/testlib/builtins-testlib.gyp
index 543706324..db79b47ab 100644
--- a/lib/ckfw/builtins/testlib/builtins-testlib.gyp
+++ b/lib/ckfw/builtins/testlib/builtins-testlib.gyp
@@ -47,7 +47,7 @@
}
],
'variables': {
- 'mapfile': '../nssckbi.def',
+ 'mapfile': 'nssckbi-testlib.def',
'certdata-testlib_c': '<(INTERMEDIATE_DIR)/certdata-testlib.c',
}
}
diff --git a/lib/ckfw/builtins/testlib/nssckbi-testlib.def b/lib/ckfw/builtins/testlib/nssckbi-testlib.def
new file mode 100644
index 000000000..907e93581
--- /dev/null
+++ b/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:
+;+*;
+;+};
diff --git a/nss.gyp b/nss.gyp
index bf8b4d366..5d8d63658 100644
--- a/nss.gyp
+++ b/nss.gyp
@@ -314,5 +314,16 @@
},
],
}],
+ [ 'mozilla_central==1', {
+ 'targets': [
+ {
+ 'target_name': 'test_nssckbi',
+ 'type': 'none',
+ 'dependencies': [
+ 'lib/ckfw/builtins/testlib/builtins-testlib.gyp:nssckbi-testlib',
+ ],
+ },
+ ],
+ }],
],
}