Skip to content

Commit ccd8188

Browse files
joaocgreisjoaocgreis
committed
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: nodejs#5657 Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
1 parent b6475b9 commit ccd8188

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

848848

849-
def configure_winsdk(o):
850-
if flavor != 'win':
851-
return
852-
853-
winsdk_dir = os.environ.get('WindowsSdkDir')
854-
855-
if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
856-
print('Found ctrpp in WinSDK--will build generated files '
857-
'into tools/msvs/genfiles.')
858-
o['variables']['node_has_winsdk'] = 'true'
859-
return
860-
861-
print('ctrpp not found in WinSDK path--using pre-gen files '
862-
'from tools/msvs/genfiles.')
863-
864849
def write(filename, data):
865850
filename = os.path.join(root_dir, filename)
866851
print 'creating ', filename
@@ -1139,7 +1124,6 @@ configure_library('http_parser', output)
11391124
configure_library('libuv', output)
11401125
configure_v8(output)
11411126
configure_openssl(output)
1142-
configure_winsdk(output)
11431127
configure_intl(output)
11441128
configure_static(output)
11451129

‎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',
@@ -471,7 +470,7 @@
471470
'target_name': 'node_etw',
472471
'type': 'none',
473472
'conditions': [
474-
[ 'node_use_etw=="true" and node_has_winsdk=="true"', {
473+
[ 'node_use_etw=="true"', {
475474
'actions': [
476475
{
477476
'action_name': 'node_etw',
@@ -492,7 +491,7 @@
492491
'target_name': 'node_perfctr',
493492
'type': 'none',
494493
'conditions': [
495-
[ 'node_use_perfctr=="true" and node_has_winsdk=="true"', {
494+
[ 'node_use_perfctr=="true"', {
496495
'actions': [
497496
{
498497
'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.

‎tools/msvs/genfiles/node_etw_providerTEMP.BIN‎

-5.28 KB
Binary file not shown.

‎tools/msvs/genfiles/node_perfctr_provider.h‎

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

‎tools/msvs/genfiles/node_perfctr_provider.rc‎

-3.68 KB
Binary file not shown.

0 commit comments

Comments
 (0)