Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug 1316604 - Add variables for <(nss_dist_dir)/{public,private}. r=f…
…ranziskus

Mozilla's build system currently puts NSS public headers directly in
$(DIST)/include/nss, so we need a way to override the export directory.

--HG--
extra : rebase_source : 1e33328d37038df598103223045167c371823e1a
extra : source : 2d4a7d9e84f7defcb1bbdca7de25e93fccc2158f
  • Loading branch information
luser committed Nov 10, 2016
1 parent dd06817 commit f720662
Show file tree
Hide file tree
Showing 38 changed files with 55 additions and 53 deletions.
2 changes: 1 addition & 1 deletion cmd/lib/exports.gyp
Expand Up @@ -16,7 +16,7 @@
'pk11table.h',
'secutil.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/modutil/modutil.gyp
Expand Up @@ -29,8 +29,8 @@
],
'target_defaults': {
'include_dirs': [
'<(nss_dist_dir)/private/nss',
'<(nss_dist_dir)/private/dbm'
'<(nss_private_dist_dir)/nss',
'<(nss_private_dist_dir)/dbm'
],
'defines': [
'NSPR20',
Expand Down
2 changes: 2 additions & 0 deletions coreconf/config.gypi
Expand Up @@ -97,6 +97,8 @@
'test_build%': 0,
'fuzz%': 0,
'sign_libs%': 1,
'nss_public_dist_dir%': '<(nss_dist_dir)/public',
'nss_private_dist_dir%': '<(nss_dist_dir)/private',
},
'target_defaults': {
# Settings specific to targets should go here.
Expand Down
4 changes: 2 additions & 2 deletions exports.gyp
Expand Up @@ -11,7 +11,7 @@
'type': 'none',
'direct_dependent_settings': {
'include_dirs': [
'<(nss_dist_dir)/public/nss'
'<(nss_public_dist_dir)/nss'
]
},
'dependencies': [
Expand Down Expand Up @@ -64,7 +64,7 @@
['disable_dbm==0', {
'direct_dependent_settings': {
'include_dirs': [
'<(nss_dist_dir)/public/dbm'
'<(nss_public_dist_dir)/dbm'
]
},
'dependencies': [
Expand Down
4 changes: 2 additions & 2 deletions lib/base/exports.gyp
Expand Up @@ -15,14 +15,14 @@
'nssbase.h',
'nssbaset.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'base.h',
'baset.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/certdb/exports.gyp
Expand Up @@ -16,7 +16,7 @@
'certdb.h',
'certt.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
Expand All @@ -25,7 +25,7 @@
'genname.h',
'xconst.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/certhigh/exports.gyp
Expand Up @@ -15,14 +15,14 @@
'ocsp.h',
'ocspt.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'ocspi.h',
'ocspti.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ckfw/builtins/exports.gyp
Expand Up @@ -14,7 +14,7 @@
'files': [
'nssckbi.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/ckfw/exports.gyp
Expand Up @@ -22,7 +22,7 @@
'nssckmdt.h',
'nssckt.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
Expand All @@ -33,7 +33,7 @@
'ckmd.h',
'ckt.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/crmf/exports.gyp
Expand Up @@ -17,7 +17,7 @@
'crmf.h',
'crmft.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
Expand All @@ -26,7 +26,7 @@
'crmfi.h',
'crmfit.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/cryptohi/exports.gyp
Expand Up @@ -23,13 +23,13 @@
'keythi.h',
'sechash.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'keyi.h',
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/dbm/include/exports.gyp
Expand Up @@ -16,7 +16,7 @@
'ncompat.h',
'winfile.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
Expand All @@ -27,7 +27,7 @@
'queue.h',
'search.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/dev/exports.gyp
Expand Up @@ -20,7 +20,7 @@
'nssdev.h',
'nssdevt.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/freebl/exports.gyp
Expand Up @@ -23,7 +23,7 @@
],
}],
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
Expand All @@ -37,7 +37,7 @@
'secmpi.h',
'secrng.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/jar/exports.gyp
Expand Up @@ -16,7 +16,7 @@
'jar.h',
'jarfile.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/include/exports.gyp
Expand Up @@ -27,7 +27,7 @@
'pkix_util.h',
'pkixt.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/certsel/exports.gyp
Expand Up @@ -15,7 +15,7 @@
'pkix_certselector.h',
'pkix_comcertselparams.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/checker/exports.gyp
Expand Up @@ -26,7 +26,7 @@
'pkix_signaturechecker.h',
'pkix_targetcertchecker.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/crlsel/exports.gyp
Expand Up @@ -15,7 +15,7 @@
'pkix_comcrlselparams.h',
'pkix_crlselector.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/params/exports.gyp
Expand Up @@ -17,7 +17,7 @@
'pkix_trustanchor.h',
'pkix_valparams.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/results/exports.gyp
Expand Up @@ -17,7 +17,7 @@
'pkix_valresult.h',
'pkix_verifynode.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/store/exports.gyp
Expand Up @@ -14,7 +14,7 @@
'files': [
'pkix_store.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/top/exports.gyp
Expand Up @@ -16,7 +16,7 @@
'pkix_lifecycle.h',
'pkix_validate.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix/util/exports.gyp
Expand Up @@ -17,7 +17,7 @@
'pkix_logger.h',
'pkix_tools.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix_pl_nss/module/exports.gyp
Expand Up @@ -25,7 +25,7 @@
'pkix_pl_pk11certstore.h',
'pkix_pl_socket.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix_pl_nss/pki/exports.gyp
Expand Up @@ -30,7 +30,7 @@
'pkix_pl_publickey.h',
'pkix_pl_x500name.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libpkix/pkix_pl_nss/system/exports.gyp
Expand Up @@ -26,7 +26,7 @@
'pkix_pl_rwlock.h',
'pkix_pl_string.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/nss/exports.gyp
Expand Up @@ -14,14 +14,14 @@
'files': [
'nss.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'nssoptions.h',
'nssrenam.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/pk11wrap/exports.gyp
Expand Up @@ -21,14 +21,14 @@
'secmodt.h',
'secpkcs5.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'dev3hack.h',
'secmodi.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/pkcs12/exports.gyp
Expand Up @@ -18,7 +18,7 @@
'pkcs12.h',
'pkcs12t.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions lib/pkcs7/exports.gyp
Expand Up @@ -16,13 +16,13 @@
'secmime.h',
'secpkcs7.h'
],
'destination': '<(nss_dist_dir)/public/<(module)'
'destination': '<(nss_public_dist_dir)/<(module)'
},
{
'files': [
'p7local.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion lib/pki/exports.gyp
Expand Up @@ -21,7 +21,7 @@
'pkit.h',
'pkitm.h'
],
'destination': '<(nss_dist_dir)/private/<(module)'
'destination': '<(nss_private_dist_dir)/<(module)'
}
]
}
Expand Down

0 comments on commit f720662

Please sign in to comment.