GeezerVison is showing github.com — etw,build: always generate .rc and .h files · nodejs/node@aac9ead
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: .gitignore +1Lines changed: 1 addition & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 50 | 50 | /dist-osx | 51 | 51 | /npm.wxs | 52 | 52 | /tools/msvs/npm.wixobj | | 53 | +/tools/msvs/genfiles/ | 53 | 54 | /tools/osx-pkg.pmdoc/index.xml | 54 | 55 | /test/addons/??_*/ | 55 | 56 | email.md | |
Collapse file Copy file name to clipboardExpand all lines: configure -16Lines changed: 0 additions & 16 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -849,21 +849,6 @@ def configure_static(o): | 849 | 849 | o['libraries'] += ['-static-libasan'] | 850 | 850 |
| 851 | 851 |
| 852 | | -def configure_winsdk(o): | 853 | | - if flavor != 'win': | 854 | | - return | 855 | | - | 856 | | - winsdk_dir = os.environ.get('WindowsSdkDir') | 857 | | - | 858 | | - if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'): | 859 | | - print('Found ctrpp in WinSDK--will build generated files ' | 860 | | - 'into tools/msvs/genfiles.') | 861 | | - o['variables']['node_has_winsdk'] = 'true' | 862 | | - return | 863 | | - | 864 | | - print('ctrpp not found in WinSDK path--using pre-gen files ' | 865 | | - 'from tools/msvs/genfiles.') | 866 | | - | 867 | 852 | def write(filename, data): | 868 | 853 | filename = os.path.join(root_dir, filename) | 869 | 854 | print 'creating ', filename | @@ -1142,7 +1127,6 @@ configure_library('http_parser', output) | 1142 | 1127 | configure_library('libuv', output) | 1143 | 1128 | configure_v8(output) | 1144 | 1129 | configure_openssl(output) | 1145 | | -configure_winsdk(output) | 1146 | 1130 | configure_intl(output) | 1147 | 1131 | configure_static(output) | 1148 | 1132 |
| |
Collapse file Copy file name to clipboardExpand all lines: node.gyp +2-3Lines changed: 2 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 6 | 6 | 'node_use_etw%': 'false', | 7 | 7 | 'node_use_perfctr%': 'false', | 8 | 8 | 'node_no_browser_globals%': 'false', | 9 | | - 'node_has_winsdk%': 'false', | 10 | 9 | 'node_shared_zlib%': 'false', | 11 | 10 | 'node_shared_http_parser%': 'false', | 12 | 11 | 'node_shared_libuv%': 'false', | | 470 | 469 | 'target_name': 'node_etw', | 471 | 470 | 'type': 'none', | 472 | 471 | 'conditions': [ | 473 | | - [ 'node_use_etw=="true" and node_has_winsdk=="true"', { | | 472 | + [ 'node_use_etw=="true"', { | 474 | 473 | 'actions': [ | 475 | 474 | { | 476 | 475 | 'action_name': 'node_etw', | | 491 | 490 | 'target_name': 'node_perfctr', | 492 | 491 | 'type': 'none', | 493 | 492 | 'conditions': [ | 494 | | - [ 'node_use_perfctr=="true" and node_has_winsdk=="true"', { | | 493 | + [ 'node_use_perfctr=="true"', { | 495 | 494 | 'actions': [ | 496 | 495 | { | 497 | 496 | 'action_name': 'node_perfctr_man', | |
Collapse file Copy file name to clipboard Collapse file Copy file name to clipboardExpand all lines: tools/msvs/genfiles/node_etw_provider.h -59Lines changed: 0 additions & 59 deletions Collapse file Copy file name to clipboardExpand all lines: tools/msvs/genfiles/node_etw_provider.rc -3Lines changed: 0 additions & 3 deletions Collapse file Copy file name to clipboard Collapse file Copy file name to clipboardExpand all lines: tools/msvs/genfiles/node_perfctr_provider.h -92Lines changed: 0 additions & 92 deletions Collapse file Copy file name to clipboard
|