Skip to content

Commit c0acf18

Browse files
committed
win,build: always generate .rc and .h files
We can assume the Windows SDK is installed, hence the intermediate files generated from manifest should not be part of the source tree. This also fixes incorrect detection of ctrpp.exe, that should be in the path.
1 parent a693557 commit c0acf18

File tree

9 files changed

+3
-173
lines changed

9 files changed

+3
-173
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ ipch/
5050
/dist-osx
5151
/npm.wxs
5252
/tools/msvs/npm.wixobj
53+
/tools/msvs/genfiles/
5354
/tools/osx-pkg.pmdoc/index.xml
5455
/test/addons/??_*/
5556
email.md

β€Žconfigureβ€Ž

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -838,21 +838,6 @@ def configure_static(o):
838838
o['libraries'] += ['-static-libasan']
839839

840840

841-
def configure_winsdk(o):
842-
if flavor != 'win':
843-
return
844-
845-
winsdk_dir = os.environ.get('WindowsSdkDir')
846-
847-
if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
848-
print('Found ctrpp in WinSDK--will build generated files '
849-
'into tools/msvs/genfiles.')
850-
o['variables']['node_has_winsdk'] = 'true'
851-
return
852-
853-
print('ctrpp not found in WinSDK path--using pre-gen files '
854-
'from tools/msvs/genfiles.')
855-
856841
def write(filename, data):
857842
filename = os.path.join(root_dir, filename)
858843
print 'creating ', filename
@@ -1131,7 +1116,6 @@ configure_library('http_parser', output)
11311116
configure_library('libuv', output)
11321117
configure_v8(output)
11331118
configure_openssl(output)
1134-
configure_winsdk(output)
11351119
configure_intl(output)
11361120
configure_static(output)
11371121

β€Žnode.gypβ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
'node_use_lttng%': 'false',
66
'node_use_etw%': 'false',
77
'node_use_perfctr%': 'false',
8-
'node_has_winsdk%': 'false',
98
'node_shared_zlib%': 'false',
109
'node_shared_http_parser%': 'false',
1110
'node_shared_libuv%': 'false',
@@ -462,7 +461,7 @@
462461
'target_name': 'node_etw',
463462
'type': 'none',
464463
'conditions': [
465-
[ 'node_use_etw=="true" and node_has_winsdk=="true"', {
464+
[ 'node_use_etw=="true"', {
466465
'actions': [
467466
{
468467
'action_name': 'node_etw',
@@ -483,7 +482,7 @@
483482
'target_name': 'node_perfctr',
484483
'type': 'none',
485484
'conditions': [
486-
[ 'node_use_perfctr=="true" and node_has_winsdk=="true"', {
485+
[ 'node_use_perfctr=="true"', {
487486
'actions': [
488487
{
489488
'action_name': 'node_perfctr_man',
-48 Bytes
Binary file not shown.

β€Žtools/msvs/genfiles/node_etw_provider.hβ€Ž

Lines changed: 0 additions & 59 deletions
This file was deleted.

β€Žtools/msvs/genfiles/node_etw_provider.rcβ€Ž

Lines changed: 0 additions & 3 deletions
This file was deleted.
-5.28 KB
Binary file not shown.

β€Žtools/msvs/genfiles/node_perfctr_provider.hβ€Ž

Lines changed: 0 additions & 92 deletions
This file was deleted.
-3.68 KB
Binary file not shown.

0 commit comments

Comments
Β (0)