diff options
42 files changed, 128 insertions, 131 deletions
@@ -50,12 +50,6 @@ else fi $NINJA -C "$TARGET_DIR" -# Copy files over to the right directory. -mkdir -p "$DIST_DIR/bin" "$DIST_DIR/lib" -find "$TARGET_DIR" -maxdepth 1 -type f -executable -exec ln -sft "$DIST_DIR/bin" {} \+ -find "$TARGET_DIR/lib" -maxdepth 1 -type f -exec ln -sft "$DIST_DIR/lib" {} \+ -find "$TARGET_DIR" -name '*.a' -exec ln -sft "$DIST_DIR/lib" {} \+ - # Sign libs. TODO: get ninja to do this echo >"$TARGET_DIR/shlibsign.log" for lib in freebl3 freeblpriv3 nssdbm3 softokn3; do diff --git a/cmd/lib/exports.gyp b/cmd/lib/exports.gyp index f259ce07d..dfb8c7449 100644 --- a/cmd/lib/exports.gyp +++ b/cmd/lib/exports.gyp @@ -16,7 +16,7 @@ 'pk11table.h', 'secutil.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -24,4 +24,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/cmd/modutil/modutil.gyp b/cmd/modutil/modutil.gyp index a70448b8e..e928f51c1 100644 --- a/cmd/modutil/modutil.gyp +++ b/cmd/modutil/modutil.gyp @@ -29,8 +29,8 @@ ], 'target_defaults': { 'include_dirs': [ - '<(PRODUCT_DIR)/dist/nss/private', - '<(PRODUCT_DIR)/dist/dbm/private' + '<(nss_dist_dir)/private/nss', + '<(nss_dist_dir)/private/dbm' ], 'defines': [ 'NSPR20', diff --git a/coreconf/config.gypi b/coreconf/config.gypi index 85eaa07ef..9d4510814 100644 --- a/coreconf/config.gypi +++ b/coreconf/config.gypi @@ -30,20 +30,23 @@ #XXX: gyp breaks if these are empty! 'nspr_lib_dir%': ' ', 'nspr_include_dir%': ' ', + 'nss_dist_obj_dir%': ' ', + 'nss_dist_dir%': ' ', 'zlib_libs%': [], #TODO 'moz_debug_flags%': '', 'dll_prefix': '', 'dll_suffix': 'dll', }, { - # On non-windows, default to a system NSPR. 'nspr_libs%': ['-lplds4', '-lplc4', '-lnspr4'], - 'nspr_lib_dir%': '<!(<(python) <(DEPTH)/coreconf/nspr_lib_dir.py)', - 'nspr_include_dir%': '<!(<(python) <(DEPTH)/coreconf/nspr_include_dir.py)', + 'nspr_lib_dir%': '<!(<(python) <(DEPTH)/coreconf/pkg_config.py . --libs nspr)', + 'nspr_include_dir%': '<!(<(python) <(DEPTH)/coreconf/pkg_config.py . --cflags nspr)', + 'nss_dist_obj_dir%': '<!(<(python) <(DEPTH)/coreconf/pkg_config.py ../.. --cflags nspr)', + 'nss_dist_dir%': '<!(<(python) <(DEPTH)/coreconf/pkg_config.py ../../.. --cflags nspr)', 'use_system_zlib%': 1, }], ['OS=="linux" or OS=="android"', { - 'zlib_libs%': ['<!@(<(python) <(DEPTH)/coreconf/pkg_config.py --libs zlib)'], + 'zlib_libs%': ['<!@(<(python) <(DEPTH)/coreconf/pkg_config.py raw --libs zlib)'], 'moz_debug_flags%': '-gdwarf-2', 'optimize_flags%': '-O2', 'dll_prefix': 'lib', @@ -76,6 +79,8 @@ 'nspr_libs%': ['<@(nspr_libs)'], 'nspr_lib_dir%': '<(nspr_lib_dir)', 'nspr_include_dir%': '<(nspr_include_dir)', + 'nss_dist_obj_dir%': '<(nss_dist_obj_dir)', + 'nss_dist_dir%': '<(nss_dist_dir)', 'use_system_sqlite%': '<(use_system_sqlite)', 'sqlite_libs%': ['-lsqlite3'], 'dll_prefix': '<(dll_prefix)', @@ -99,7 +104,7 @@ }, 'include_dirs': [ '<(nspr_include_dir)', - '<(PRODUCT_DIR)/dist/<(module)/private', + '<(nss_dist_dir)/private/<(module)', ], 'conditions': [ [ 'OS=="linux"', { @@ -111,6 +116,14 @@ }], ], 'target_conditions': [ + # If we ever want to properly export a static library, and copy it to lib, + # we will need to mark it as a 'standalone_static_library'. Otherwise, + # the relative paths in the thin archive will break linking. + [ '_type=="shared_library"', { + 'product_dir': '<(nss_dist_obj_dir)/lib' + }, '_type=="executable"', { + 'product_dir': '<(nss_dist_obj_dir)/bin' + }], # mapfile handling [ 'mapfile!=""', { # Work around a gyp bug. Fixed upstream but not in Ubuntu packages: diff --git a/coreconf/nspr_include_dir.py b/coreconf/nspr_include_dir.py deleted file mode 100644 index 214521853..000000000 --- a/coreconf/nspr_include_dir.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -import os -import subprocess - -def main(): - try: - for part in subprocess.Popen(['pkg-config', '--cflags', 'nspr'], stdout=subprocess.PIPE, stderr=open(os.devnull, 'wb')).communicate()[0].strip().split(): - if part.startswith('-I'): - print part[2:] - return - except OSError: - # pkg-config is probably not installed - pass - -if __name__ == '__main__': - main() diff --git a/coreconf/nspr_lib_dir.py b/coreconf/nspr_lib_dir.py deleted file mode 100644 index 8926547aa..000000000 --- a/coreconf/nspr_lib_dir.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -import os -import subprocess - -def main(): - try: - for part in subprocess.Popen(['pkg-config', '--libs', 'nspr'], stdout=subprocess.PIPE, stderr=open(os.devnull, 'wb')).communicate()[0].strip().split(): - if part.startswith('-L'): - print part[2:] - return - except OSError: - # pkg-config is probably not installed - pass - -if __name__ == '__main__': - main() diff --git a/coreconf/pkg_config.py b/coreconf/pkg_config.py index fef557298..d718de011 100644 --- a/coreconf/pkg_config.py +++ b/coreconf/pkg_config.py @@ -1,15 +1,39 @@ #!/usr/bin/env python +# +# 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/. import os import subprocess import sys def main(): + is_raw = sys.argv[1] == 'raw' + stdout = None if is_raw else subprocess.PIPE + + if sys.argv[2] == '--libs': + part_prefix = '-L' + elif sys.argv[2] == '--cflags': + part_prefix = '-I' + else: + raise 'Specify either --libs or --cflags as the second argument.' + try: - subprocess.Popen(['pkg-config'] + sys.argv[1:], stderr=open(os.devnull, 'wb')).wait() + process = subprocess.Popen(['pkg-config'] + sys.argv[2:], stdout=stdout, stderr=open(os.devnull, 'wb')) + except OSError: # pkg-config is probably not installed - pass + return + + if is_raw: + process.wait() + return + + for part in process.communicate()[0].strip().split(): + if part.startswith(part_prefix): + print os.path.realpath(os.path.join(part[2:], sys.argv[1])) + return if __name__ == '__main__': main() diff --git a/exports.gyp b/exports.gyp index bb990a40b..c4156f8ce 100644 --- a/exports.gyp +++ b/exports.gyp @@ -11,7 +11,7 @@ 'type': 'none', 'direct_dependent_settings': { 'include_dirs': [ - '<(PRODUCT_DIR)/dist/nss/public' + '<(nss_dist_dir)/public/nss' ] }, 'dependencies': [ @@ -64,7 +64,7 @@ ['disable_dbm==0', { 'direct_dependent_settings': { 'include_dirs': [ - '<(PRODUCT_DIR)/dist/dbm/public' + '<(nss_dist_dir)/public/dbm' ] }, 'dependencies': [ diff --git a/lib/base/exports.gyp b/lib/base/exports.gyp index 0ae38b9eb..1ab28106f 100644 --- a/lib/base/exports.gyp +++ b/lib/base/exports.gyp @@ -15,14 +15,14 @@ 'nssbase.h', 'nssbaset.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'base.h', 'baset.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -30,4 +30,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/certdb/exports.gyp b/lib/certdb/exports.gyp index cba5fabdb..348c62997 100644 --- a/lib/certdb/exports.gyp +++ b/lib/certdb/exports.gyp @@ -16,7 +16,7 @@ 'certdb.h', 'certt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -25,7 +25,7 @@ 'genname.h', 'xconst.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -33,4 +33,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/certhigh/exports.gyp b/lib/certhigh/exports.gyp index 6ed6c6e88..5c46f7176 100644 --- a/lib/certhigh/exports.gyp +++ b/lib/certhigh/exports.gyp @@ -15,14 +15,14 @@ 'ocsp.h', 'ocspt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'ocspi.h', 'ocspti.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -30,4 +30,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/ckfw/builtins/exports.gyp b/lib/ckfw/builtins/exports.gyp index d56e61fa9..8d84c09dc 100644 --- a/lib/ckfw/builtins/exports.gyp +++ b/lib/ckfw/builtins/exports.gyp @@ -14,7 +14,7 @@ 'files': [ 'nssckbi.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' } ] } @@ -22,4 +22,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/ckfw/exports.gyp b/lib/ckfw/exports.gyp index 93b4d18e0..6f2b7a4bc 100644 --- a/lib/ckfw/exports.gyp +++ b/lib/ckfw/exports.gyp @@ -22,7 +22,7 @@ 'nssckmdt.h', 'nssckt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -33,7 +33,7 @@ 'ckmd.h', 'ckt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -41,4 +41,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/crmf/exports.gyp b/lib/crmf/exports.gyp index c42845e1d..7ae9c0ea0 100644 --- a/lib/crmf/exports.gyp +++ b/lib/crmf/exports.gyp @@ -17,7 +17,7 @@ 'crmf.h', 'crmft.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -26,7 +26,7 @@ 'crmfi.h', 'crmfit.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -34,4 +34,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/cryptohi/exports.gyp b/lib/cryptohi/exports.gyp index 277a6284e..bc96eb2fd 100644 --- a/lib/cryptohi/exports.gyp +++ b/lib/cryptohi/exports.gyp @@ -23,13 +23,13 @@ 'keythi.h', 'sechash.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'keyi.h', ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } diff --git a/lib/dbm/include/exports.gyp b/lib/dbm/include/exports.gyp index 6bf58ac04..63859fbec 100644 --- a/lib/dbm/include/exports.gyp +++ b/lib/dbm/include/exports.gyp @@ -16,7 +16,7 @@ 'ncompat.h', 'winfile.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -27,7 +27,7 @@ 'queue.h', 'search.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -35,4 +35,4 @@ 'variables': { 'module': 'dbm' } -}
\ No newline at end of file +} diff --git a/lib/dev/exports.gyp b/lib/dev/exports.gyp index 9f9cb5c36..e3ca26783 100644 --- a/lib/dev/exports.gyp +++ b/lib/dev/exports.gyp @@ -20,7 +20,7 @@ 'nssdev.h', 'nssdevt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -28,4 +28,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/freebl/exports.gyp b/lib/freebl/exports.gyp index 1e09d7327..e397c0e3e 100644 --- a/lib/freebl/exports.gyp +++ b/lib/freebl/exports.gyp @@ -23,7 +23,7 @@ ], }], ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -37,7 +37,7 @@ 'secmpi.h', 'secrng.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } diff --git a/lib/jar/exports.gyp b/lib/jar/exports.gyp index 01f268b3e..329da46ea 100644 --- a/lib/jar/exports.gyp +++ b/lib/jar/exports.gyp @@ -16,7 +16,7 @@ 'jar.h', 'jarfile.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' } ] } @@ -24,4 +24,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/include/exports.gyp b/lib/libpkix/include/exports.gyp index 7262de41d..58f1544fc 100644 --- a/lib/libpkix/include/exports.gyp +++ b/lib/libpkix/include/exports.gyp @@ -27,7 +27,7 @@ 'pkix_util.h', 'pkixt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -35,4 +35,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/certsel/exports.gyp b/lib/libpkix/pkix/certsel/exports.gyp index 0fe0ff69c..8e0374aa3 100644 --- a/lib/libpkix/pkix/certsel/exports.gyp +++ b/lib/libpkix/pkix/certsel/exports.gyp @@ -15,7 +15,7 @@ 'pkix_certselector.h', 'pkix_comcertselparams.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -23,4 +23,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/checker/exports.gyp b/lib/libpkix/pkix/checker/exports.gyp index 15ed261fa..993eaef42 100644 --- a/lib/libpkix/pkix/checker/exports.gyp +++ b/lib/libpkix/pkix/checker/exports.gyp @@ -26,7 +26,7 @@ 'pkix_signaturechecker.h', 'pkix_targetcertchecker.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -34,4 +34,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/crlsel/exports.gyp b/lib/libpkix/pkix/crlsel/exports.gyp index 2c1deb826..b80dfc2e4 100644 --- a/lib/libpkix/pkix/crlsel/exports.gyp +++ b/lib/libpkix/pkix/crlsel/exports.gyp @@ -15,7 +15,7 @@ 'pkix_comcrlselparams.h', 'pkix_crlselector.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -23,4 +23,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/params/exports.gyp b/lib/libpkix/pkix/params/exports.gyp index e42d1431f..3131ed008 100644 --- a/lib/libpkix/pkix/params/exports.gyp +++ b/lib/libpkix/pkix/params/exports.gyp @@ -17,7 +17,7 @@ 'pkix_trustanchor.h', 'pkix_valparams.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -25,4 +25,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/results/exports.gyp b/lib/libpkix/pkix/results/exports.gyp index 3fb5228e8..7379a5d7f 100644 --- a/lib/libpkix/pkix/results/exports.gyp +++ b/lib/libpkix/pkix/results/exports.gyp @@ -17,7 +17,7 @@ 'pkix_valresult.h', 'pkix_verifynode.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -25,4 +25,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/store/exports.gyp b/lib/libpkix/pkix/store/exports.gyp index 38f4ab089..3f6cb4798 100644 --- a/lib/libpkix/pkix/store/exports.gyp +++ b/lib/libpkix/pkix/store/exports.gyp @@ -14,7 +14,7 @@ 'files': [ 'pkix_store.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -22,4 +22,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/top/exports.gyp b/lib/libpkix/pkix/top/exports.gyp index 114afcbf9..bc66ccc68 100644 --- a/lib/libpkix/pkix/top/exports.gyp +++ b/lib/libpkix/pkix/top/exports.gyp @@ -16,7 +16,7 @@ 'pkix_lifecycle.h', 'pkix_validate.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -24,4 +24,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix/util/exports.gyp b/lib/libpkix/pkix/util/exports.gyp index 23db76575..d0bf573aa 100644 --- a/lib/libpkix/pkix/util/exports.gyp +++ b/lib/libpkix/pkix/util/exports.gyp @@ -17,7 +17,7 @@ 'pkix_logger.h', 'pkix_tools.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -25,4 +25,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix_pl_nss/module/exports.gyp b/lib/libpkix/pkix_pl_nss/module/exports.gyp index a91701a8a..41fe3e297 100644 --- a/lib/libpkix/pkix_pl_nss/module/exports.gyp +++ b/lib/libpkix/pkix_pl_nss/module/exports.gyp @@ -25,7 +25,7 @@ 'pkix_pl_pk11certstore.h', 'pkix_pl_socket.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -33,4 +33,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix_pl_nss/pki/exports.gyp b/lib/libpkix/pkix_pl_nss/pki/exports.gyp index bfbeea241..89d4e012e 100644 --- a/lib/libpkix/pkix_pl_nss/pki/exports.gyp +++ b/lib/libpkix/pkix_pl_nss/pki/exports.gyp @@ -30,7 +30,7 @@ 'pkix_pl_publickey.h', 'pkix_pl_x500name.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -38,4 +38,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/libpkix/pkix_pl_nss/system/exports.gyp b/lib/libpkix/pkix_pl_nss/system/exports.gyp index d17383621..d90e27609 100644 --- a/lib/libpkix/pkix_pl_nss/system/exports.gyp +++ b/lib/libpkix/pkix_pl_nss/system/exports.gyp @@ -26,7 +26,7 @@ 'pkix_pl_rwlock.h', 'pkix_pl_string.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -34,4 +34,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/nss/exports.gyp b/lib/nss/exports.gyp index 49e0368e6..a3638cc24 100644 --- a/lib/nss/exports.gyp +++ b/lib/nss/exports.gyp @@ -14,14 +14,14 @@ 'files': [ 'nss.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'nssoptions.h', 'nssrenam.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -29,4 +29,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/pk11wrap/exports.gyp b/lib/pk11wrap/exports.gyp index 3b72a6bb0..37b572df9 100644 --- a/lib/pk11wrap/exports.gyp +++ b/lib/pk11wrap/exports.gyp @@ -21,14 +21,14 @@ 'secmodt.h', 'secpkcs5.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'dev3hack.h', 'secmodi.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -36,4 +36,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/pkcs12/exports.gyp b/lib/pkcs12/exports.gyp index 69193b0f7..b60caf2c1 100644 --- a/lib/pkcs12/exports.gyp +++ b/lib/pkcs12/exports.gyp @@ -18,7 +18,7 @@ 'pkcs12.h', 'pkcs12t.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' } ] } @@ -26,4 +26,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/pkcs7/exports.gyp b/lib/pkcs7/exports.gyp index 3f8e602ed..26c4e92c1 100644 --- a/lib/pkcs7/exports.gyp +++ b/lib/pkcs7/exports.gyp @@ -16,13 +16,13 @@ 'secmime.h', 'secpkcs7.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'p7local.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -30,4 +30,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/pki/exports.gyp b/lib/pki/exports.gyp index eae6e03df..6382c2063 100644 --- a/lib/pki/exports.gyp +++ b/lib/pki/exports.gyp @@ -21,7 +21,7 @@ 'pkit.h', 'pkitm.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -29,4 +29,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/smime/exports.gyp b/lib/smime/exports.gyp index 7bda22a9e..27ee989a8 100644 --- a/lib/smime/exports.gyp +++ b/lib/smime/exports.gyp @@ -17,13 +17,13 @@ 'cmst.h', 'smime.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'cmslocal.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -31,4 +31,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/softoken/exports.gyp b/lib/softoken/exports.gyp index 909a713ac..547f84b07 100644 --- a/lib/softoken/exports.gyp +++ b/lib/softoken/exports.gyp @@ -15,7 +15,7 @@ 'lowkeyi.h', 'lowkeyti.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ @@ -27,7 +27,7 @@ 'softoken.h', 'softoknt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -35,4 +35,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/sqlite/exports.gyp b/lib/sqlite/exports.gyp index 4b4e32ac2..cea226db9 100644 --- a/lib/sqlite/exports.gyp +++ b/lib/sqlite/exports.gyp @@ -14,7 +14,7 @@ 'files': [ 'sqlite3.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } @@ -22,4 +22,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/ssl/exports.gyp b/lib/ssl/exports.gyp index b4854f155..17986ada9 100644 --- a/lib/ssl/exports.gyp +++ b/lib/ssl/exports.gyp @@ -18,7 +18,7 @@ 'sslproto.h', 'sslt.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' } ] } @@ -26,4 +26,4 @@ 'variables': { 'module': 'nss' } -}
\ No newline at end of file +} diff --git a/lib/util/exports.gyp b/lib/util/exports.gyp index 68ecdaffe..05cf2ae1f 100644 --- a/lib/util/exports.gyp +++ b/lib/util/exports.gyp @@ -49,14 +49,14 @@ 'utilparst.h', 'utilrename.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/public' + 'destination': '<(nss_dist_dir)/public/<(module)' }, { 'files': [ 'templates.c', 'verref.h' ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] } diff --git a/lib/zlib/exports.gyp b/lib/zlib/exports.gyp index b574597a6..c3c020686 100644 --- a/lib/zlib/exports.gyp +++ b/lib/zlib/exports.gyp @@ -24,7 +24,7 @@ 'zlib.h', 'zconf.h', ], - 'destination': '<(PRODUCT_DIR)/dist/<(module)/private' + 'destination': '<(nss_dist_dir)/private/<(module)' } ] }], |