Skip to content

Commit aac9ead

Browse files
joaocgreisevanlucas
authored andcommitted
etw,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. PR-URL: #5657 Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
1 parent 2fa959b commit aac9ead

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
@@ -849,21 +849,6 @@ def configure_static(o):
849849
o['libraries'] += ['-static-libasan']
850850

851851

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-
867852
def write(filename, data):
868853
filename = os.path.join(root_dir, filename)
869854
print 'creating ', filename
@@ -1142,7 +1127,6 @@ configure_library('http_parser', output)
11421127
configure_library('libuv', output)
11431128
configure_v8(output)
11441129
configure_openssl(output)
1145-
configure_winsdk(output)
11461130
configure_intl(output)
11471131
configure_static(output)
11481132

β€Žnode.gyp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
'node_use_etw%': 'false',
77
'node_use_perfctr%': 'false',
88
'node_no_browser_globals%': 'false',
9-
'node_has_winsdk%': 'false',
109
'node_shared_zlib%': 'false',
1110
'node_shared_http_parser%': 'false',
1211
'node_shared_libuv%': 'false',
@@ -470,7 +469,7 @@
470469
'target_name': 'node_etw',
471470
'type': 'none',
472471
'conditions': [
473-
[ 'node_use_etw=="true" and node_has_winsdk=="true"', {
472+
[ 'node_use_etw=="true"', {
474473
'actions': [
475474
{
476475
'action_name': 'node_etw',
@@ -491,7 +490,7 @@
491490
'target_name': 'node_perfctr',
492491
'type': 'none',
493492
'conditions': [
494-
[ 'node_use_perfctr=="true" and node_has_winsdk=="true"', {
493+
[ 'node_use_perfctr=="true"', {
495494
'actions': [
496495
{
497496
'action_name': 'node_perfctr_man',

β€Žtools/msvs/genfiles/MSG00001.bin

-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)