Browse Source

deps: refactor openssl.gyp

Updated gyp has "else if" syntax in condition. Use this for
target_arch and OS switches. Several sources, defines, rules and
libraries variables moved to gypi files.

PR-URL: https://github.com/iojs/io.js/pull/1325
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v1.8.0-commit
Shigeki Ohtsu 10 years ago
parent
commit
f782824d48
  1. 44
      deps/openssl/masm_compile.gypi
  2. 24
      deps/openssl/openssl-cli.gypi
  3. 1151
      deps/openssl/openssl.gyp
  4. 1028
      deps/openssl/openssl.gypi

44
deps/openssl/masm_compile.gypi

@ -0,0 +1,44 @@
{
'conditions': [
['target_arch=="ia32"', {
'rules': [
{
'rule_name': 'Assemble',
'extension': 'asm',
'inputs': [],
'outputs': [
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
],
'action': [
'ml.exe',
'/Zi',
'/safeseh',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
}
],
}, 'target_arch=="x64"', {
'rules': [
{
'rule_name': 'Assemble',
'extension': 'asm',
'inputs': [],
'outputs': [
'<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
],
'action': [
'ml64.exe',
'/Zi',
'/Fo', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
'/c', '<(RULE_INPUT_PATH)',
],
'process_outputs_as_sources': 0,
'message': 'Assembling <(RULE_INPUT_PATH) to <(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj.',
}
],
}],
],
}

24
deps/openssl/openssl-cli.gypi

@ -0,0 +1,24 @@
{
'target_name': 'openssl-cli',
'type': 'executable',
'dependencies': ['openssl'],
'defines': [
'MONOLITH'
],
'sources': ['<@(openssl_cli_sources)'],
'conditions': [
['OS=="solaris"', {
'libraries': ['<@(openssl_cli_libraries_solaris)']
}, 'OS=="win"', {
'link_settings': {
'libraries': ['<@(openssl_cli_libraries_win)'],
},
}, 'OS in "linux android"', {
'link_settings': {
'libraries': [
'-ldl',
],
},
}],
],
}

1151
deps/openssl/openssl.gyp

File diff suppressed because it is too large

1028
deps/openssl/openssl.gypi

File diff suppressed because it is too large
Loading…
Cancel
Save