From 40f0175bcbc2662a9f9d1c284861b631e2345b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Reis?= <reis@janeasystems.com>
Date: Fri, 11 Mar 2016 10:26:20 +0000
Subject: [PATCH] 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: https://github.com/nodejs/node/pull/5657
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
---
 .gitignore                                    |   1 +
 configure                                     |  16 ---
 node.gyp                                      |   5 +-
 tools/msvs/genfiles/MSG00001.bin              | Bin 48 -> 0 bytes
 tools/msvs/genfiles/node_etw_provider.h       |  59 -----------
 tools/msvs/genfiles/node_etw_provider.rc      |   3 -
 tools/msvs/genfiles/node_etw_providerTEMP.BIN | Bin 5410 -> 0 bytes
 tools/msvs/genfiles/node_perfctr_provider.h   |  92 ------------------
 tools/msvs/genfiles/node_perfctr_provider.rc  | Bin 3772 -> 0 bytes
 9 files changed, 3 insertions(+), 173 deletions(-)
 delete mode 100644 tools/msvs/genfiles/MSG00001.bin
 delete mode 100644 tools/msvs/genfiles/node_etw_provider.h
 delete mode 100644 tools/msvs/genfiles/node_etw_provider.rc
 delete mode 100644 tools/msvs/genfiles/node_etw_providerTEMP.BIN
 delete mode 100644 tools/msvs/genfiles/node_perfctr_provider.h
 delete mode 100644 tools/msvs/genfiles/node_perfctr_provider.rc

diff --git a/.gitignore b/.gitignore
index f9a106d8f566e1..734d92d4d719af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ ipch/
 /dist-osx
 /npm.wxs
 /tools/msvs/npm.wixobj
+/tools/msvs/genfiles/
 /tools/osx-pkg.pmdoc/index.xml
 /test/addons/??_*/
 email.md
diff --git a/configure b/configure
index bd0f2a3db57c08..e30fce5e21598b 100755
--- a/configure
+++ b/configure
@@ -849,21 +849,6 @@ def configure_static(o):
         o['libraries'] += ['-static-libasan']
 
 
-def configure_winsdk(o):
-  if flavor != 'win':
-    return
-
-  winsdk_dir = os.environ.get('WindowsSdkDir')
-
-  if winsdk_dir and os.path.isfile(winsdk_dir + '\\bin\\ctrpp.exe'):
-    print('Found ctrpp in WinSDK--will build generated files '
-          'into tools/msvs/genfiles.')
-    o['variables']['node_has_winsdk'] = 'true'
-    return
-
-  print('ctrpp not found in WinSDK path--using pre-gen files '
-        'from tools/msvs/genfiles.')
-
 def write(filename, data):
   filename = os.path.join(root_dir, filename)
   print 'creating ', filename
@@ -1142,7 +1127,6 @@ configure_library('http_parser', output)
 configure_library('libuv', output)
 configure_v8(output)
 configure_openssl(output)
-configure_winsdk(output)
 configure_intl(output)
 configure_static(output)
 
diff --git a/node.gyp b/node.gyp
index 803cfef02d7bac..e689a71f70df4a 100644
--- a/node.gyp
+++ b/node.gyp
@@ -6,7 +6,6 @@
     'node_use_etw%': 'false',
     'node_use_perfctr%': 'false',
     'node_no_browser_globals%': 'false',
-    'node_has_winsdk%': 'false',
     'node_shared_zlib%': 'false',
     'node_shared_http_parser%': 'false',
     'node_shared_libuv%': 'false',
@@ -470,7 +469,7 @@
       'target_name': 'node_etw',
       'type': 'none',
       'conditions': [
-        [ 'node_use_etw=="true" and node_has_winsdk=="true"', {
+        [ 'node_use_etw=="true"', {
           'actions': [
             {
               'action_name': 'node_etw',
@@ -491,7 +490,7 @@
       'target_name': 'node_perfctr',
       'type': 'none',
       'conditions': [
-        [ 'node_use_perfctr=="true" and node_has_winsdk=="true"', {
+        [ 'node_use_perfctr=="true"', {
           'actions': [
             {
               'action_name': 'node_perfctr_man',
diff --git a/tools/msvs/genfiles/MSG00001.bin b/tools/msvs/genfiles/MSG00001.bin
deleted file mode 100644
index 051a5d8ca8b6d218be5842c9a439fca7c4d35b56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 48
xcmZQ%U|?WjU<d$V0U%p}fsw(JA&()AA)ld$A(tVMp@bn5$j)QnW#9tJ0|0Q+1$Y1e

diff --git a/tools/msvs/genfiles/node_etw_provider.h b/tools/msvs/genfiles/node_etw_provider.h
deleted file mode 100644
index f9f21ad352d086..00000000000000
--- a/tools/msvs/genfiles/node_etw_provider.h
+++ /dev/null
@@ -1,59 +0,0 @@
-//**********************************************************************`
-//* This is an include file generated by Message Compiler.             *`
-//*                                                                    *`
-//* Copyright (c) Microsoft Corporation. All Rights Reserved.          *`
-//**********************************************************************`
-#pragma once
-//+
-// Provider NodeJS-ETW-provider Event Count 12
-//+
-EXTERN_C __declspec(selectany) const GUID NODE_ETW_PROVIDER = {0x77754e9b, 0x264b, 0x4d8d, {0xb9, 0x81, 0xe4, 0x13, 0x5c, 0x1e, 0xcb, 0x0c}};
-
-//
-// Opcodes
-//
-#define NODE_ETW_PROVIDER_OPCODE_NODE_HTTP_SERVER_REQUEST 0xa
-#define NODE_ETW_PROVIDER_OPCODE_NODE_HTTP_SERVER_RESPONSE 0xb
-#define NODE_ETW_PROVIDER_OPCODE_NODE_HTTP_CLIENT_REQUEST 0xc
-#define NODE_ETW_PROVIDER_OPCODE_NODE_HTTP_CLIENT_RESPONSE 0xd
-#define NODE_ETW_PROVIDER_OPCODE_NODE_NET_SERVER_CONNECTION 0xe
-#define NODE_ETW_PROVIDER_OPCODE_NODE_NET_STREAM_END 0xf
-#define NODE_ETW_PROVIDER_OPCODE_NODE_GC_START 0x10
-#define NODE_ETW_PROVIDER_OPCODE_NODE_GC_DONE 0x11
-#define NODE_ETW_PROVIDER_OPCODE_NODE_V8SYMBOL_REMOVE 0x15
-#define NODE_ETW_PROVIDER_OPCODE_NODE_V8SYMBOL_MOVE 0x16
-#define NODE_ETW_PROVIDER_OPCODE_NODE_V8SYMBOL_RESET 0x17
-#define JSCRIPT_METHOD_METHODLOAD_OPCODE 0xa
-
-//
-// Tasks
-//
-#define JSCRIPT_METHOD_RUNTIME_TASK 0x1
-
-//
-// Event Descriptors
-//
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_HTTP_SERVER_REQUEST_EVENT = {0x1, 0x0, 0x0, 0x4, 0xa, 0x0, 0x0};
-#define NODE_HTTP_SERVER_REQUEST_EVENT_value 0x1
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_HTTP_SERVER_RESPONSE_EVENT = {0x2, 0x0, 0x0, 0x4, 0xb, 0x0, 0x0};
-#define NODE_HTTP_SERVER_RESPONSE_EVENT_value 0x2
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_HTTP_CLIENT_REQUEST_EVENT = {0x3, 0x0, 0x0, 0x4, 0xc, 0x0, 0x0};
-#define NODE_HTTP_CLIENT_REQUEST_EVENT_value 0x3
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_HTTP_CLIENT_RESPONSE_EVENT = {0x4, 0x0, 0x0, 0x4, 0xd, 0x0, 0x0};
-#define NODE_HTTP_CLIENT_RESPONSE_EVENT_value 0x4
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_NET_SERVER_CONNECTION_EVENT = {0x5, 0x0, 0x0, 0x4, 0xe, 0x0, 0x0};
-#define NODE_NET_SERVER_CONNECTION_EVENT_value 0x5
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_NET_STREAM_END_EVENT = {0x6, 0x0, 0x0, 0x4, 0xf, 0x0, 0x0};
-#define NODE_NET_STREAM_END_EVENT_value 0x6
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_GC_START_EVENT = {0x7, 0x0, 0x0, 0x4, 0x10, 0x0, 0x0};
-#define NODE_GC_START_EVENT_value 0x7
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_GC_DONE_EVENT = {0x8, 0x0, 0x0, 0x4, 0x11, 0x0, 0x0};
-#define NODE_GC_DONE_EVENT_value 0x8
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR MethodLoad = {0x9, 0x0, 0x0, 0x4, 0xa, 0x1, 0x0};
-#define MethodLoad_value 0x9
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_V8SYMBOL_REMOVE_EVENT = {0x15, 0x0, 0x0, 0x4, 0x15, 0x0, 0x0};
-#define NODE_V8SYMBOL_REMOVE_EVENT_value 0x15
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_V8SYMBOL_MOVE_EVENT = {0x16, 0x0, 0x0, 0x4, 0x16, 0x0, 0x0};
-#define NODE_V8SYMBOL_MOVE_EVENT_value 0x16
-EXTERN_C __declspec(selectany) const EVENT_DESCRIPTOR NODE_V8SYMBOL_RESET_EVENT = {0x17, 0x0, 0x0, 0x4, 0x17, 0x0, 0x0};
-#define NODE_V8SYMBOL_RESET_EVENT_value 0x17
diff --git a/tools/msvs/genfiles/node_etw_provider.rc b/tools/msvs/genfiles/node_etw_provider.rc
deleted file mode 100644
index 90b56169bc1a23..00000000000000
--- a/tools/msvs/genfiles/node_etw_provider.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-LANGUAGE 0x9,0x1
-1 11 "MSG00001.bin"
-1 WEVT_TEMPLATE "node_etw_providerTEMP.BIN"
diff --git a/tools/msvs/genfiles/node_etw_providerTEMP.BIN b/tools/msvs/genfiles/node_etw_providerTEMP.BIN
deleted file mode 100644
index 32bede33875c976ab37fe5766f73ecf6c8d0be1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5410
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
Kmof0dgUEj-MHR;Y

diff --git a/tools/msvs/genfiles/node_perfctr_provider.h b/tools/msvs/genfiles/node_perfctr_provider.h
deleted file mode 100644
index 19da3925e4a74c..00000000000000
--- a/tools/msvs/genfiles/node_perfctr_provider.h
+++ /dev/null
@@ -1,92 +0,0 @@
-//------------------------------------------------------------------
-//                   !!! WARNING !!! 
-//
-// This file is auto generated by ctrpp.exe utility from performance
-// counters manifest:
-//
-// src\res\node_perfctr_provider.man
-//
-// It should be regenerated every time the code is built.
-// Do not check it in.
-//-------------------------------------------------------------------
-
-#pragma once
-
-#include <winperf.h>
-#include <perflib.h>
-
-
-EXTERN_C DECLSPEC_SELECTANY GUID NodeCounterProviderGuid = { 0x1e2e15d7, 0x3760, 0x470e, 0x86, 0x99, 0xb9, 0xdb, 0x52, 0x48, 0xed, 0xd5 };
-
-EXTERN_C DECLSPEC_SELECTANY GUID NodeCounterSetGuid = { 0x3a22a8ec, 0x297c, 0x48ac, 0xab, 0x15, 0x33, 0xec, 0x93, 0x3, 0x3f, 0xd8 };
-
-
-EXTERN_C DECLSPEC_SELECTANY HANDLE NodeCounterProvider = NULL;
-
-EXTERN_C DECLSPEC_SELECTANY struct {
-    PERF_COUNTERSET_INFO CounterSet;
-    PERF_COUNTER_INFO Counter0;
-    PERF_COUNTER_INFO Counter1;
-    PERF_COUNTER_INFO Counter2;
-    PERF_COUNTER_INFO Counter3;
-    PERF_COUNTER_INFO Counter4;
-    PERF_COUNTER_INFO Counter5;
-    PERF_COUNTER_INFO Counter6;
-    PERF_COUNTER_INFO Counter7;
-    PERF_COUNTER_INFO Counter8;
-    PERF_COUNTER_INFO Counter9;
-} NodeCounterSetInfo = {
-    { { 0x3a22a8ec, 0x297c, 0x48ac, 0xab, 0x15, 0x33, 0xec, 0x93, 0x3, 0x3f, 0xd8 }, { 0x1e2e15d7, 0x3760, 0x470e, 0x86, 0x99, 0xb9, 0xdb, 0x52, 0x48, 0xed, 0xd5 }, 10, PERF_COUNTERSET_MULTI_AGGREGATE },
-    { 1, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 2, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 3, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 4, PERF_COUNTER_COUNTER, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 5, PERF_COUNTER_RAWCOUNT, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 6, PERF_COUNTER_BULK_COUNT, 0, sizeof(ULONGLONG), PERF_DETAIL_NOVICE, 4294967293, 0 },
-    { 7, PERF_COUNTER_BULK_COUNT, 0, sizeof(ULONGLONG), PERF_DETAIL_NOVICE, 4294967293, 0 },
-    { 8, PERF_COUNTER_RAWCOUNT, 0, sizeof(ULONG), PERF_DETAIL_NOVICE, 0, 0 },
-    { 9, PERF_COUNTER_BULK_COUNT, 0, sizeof(ULONGLONG), PERF_DETAIL_NOVICE, 4294967293, 0 },
-    { 10, PERF_COUNTER_BULK_COUNT, 0, sizeof(ULONGLONG), PERF_DETAIL_NOVICE, 4294967293, 0 },
-};
-
-EXTERN_C FORCEINLINE
-VOID
-CounterCleanup(
-    VOID
-    )
-{
-    if (NodeCounterProvider != NULL) {
-        PerfStopProvider(NodeCounterProvider);
-        NodeCounterProvider = NULL;
-    }
-}
-
-EXTERN_C FORCEINLINE
-ULONG
-CounterInitialize(
-    VOID
-    )
-{
-    ULONG Status;
-    PERF_PROVIDER_CONTEXT ProviderContext;
-
-    ZeroMemory(&ProviderContext, sizeof(PERF_PROVIDER_CONTEXT));
-    ProviderContext.ContextSize = sizeof(PERF_PROVIDER_CONTEXT);
-
-    Status = PerfStartProviderEx(&NodeCounterProviderGuid,
-                                 &ProviderContext,
-                                 &NodeCounterProvider);
-    if (Status != ERROR_SUCCESS) {
-        NodeCounterProvider = NULL;
-        return Status;
-    }
-
-    Status = PerfSetCounterSetInfo(NodeCounterProvider,
-                                   &NodeCounterSetInfo.CounterSet,
-                                   sizeof NodeCounterSetInfo);
-    if (Status != ERROR_SUCCESS) {
-        CounterCleanup();
-        return Status;
-    }
-    return ERROR_SUCCESS;
-}
diff --git a/tools/msvs/genfiles/node_perfctr_provider.rc b/tools/msvs/genfiles/node_perfctr_provider.rc
deleted file mode 100644
index 5b1b2daef10a06a58124782effd7b11857f8003b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3772
zcmd5;$!^;)5S?>@{(~Bz=qYi%biHLmTA&Dw)Icu*3R{*FH;(N}c31S*+rGykBZ<~x
z2Ra0TM3I~s&OAO2=ilF!v}FGQJdfoOJZVX=)$>I71oBA^<wDNoJ>E0)-MF*n+CT<!
zEmKJ#GeJ9(2!Gli%34;kK>rG(bG)$(F%robV<Y*AZ-{;@OFRb{|A99!TC_C99Azeu
zSja8@md3^ey%_x=Y=#&~eF-tM#wgc_jZZ2yg^dXPmAt)^PPG!qhH{B7WiFw=fQONM
zzFSYdWS^dVgJ+zN;j`Lzwp<$kw-x+NfDJvG*@zh(S1H0Hf?e8V#4D_Diyr^3P0Pr*
zro(mwtHfvpAJSD%AQc$@xq4`HL%A_p9GPM+m468A+&A7cf{$R*h2`4->^qVVa%yIe
z(4LtY$~hjl@wW$dDlP}|1!(UXc_+~+lnCr;_zn9DU~~gi$MOfVM4X%=m&cf!%QLf!
zGb1-NjQj<etQXyaHOhF(9m(@E@9zs^>m6_yNFV<R)`~4Fls8|o>&jz4)|Wf#HjBb5
zi^3Whj*Qm<BAsCLe$l+CjV8fa<PH%dAB(m;-&wy|Jlf*exf>$YQ7P9_L_@<!W>%hU
z=9O}Ow58`^Qm5TCBFgS_Fu0r}bv|WJUR#uPRd`h6`MMSnU%zQgl;^u*;(L`vrDK_Q
zh+M;4gm;RcNtlJ^cp@vK=O~|xI-=S0K6aW#sUt4OZZapIA-9Xm@h}2D-+@GI?nhQ5
ztQwg6X_aTnM?`b%IcDoMo5r9#!xnkY8Y(fj{T1RF$T98{KN`oq@@SY*SYIiN#-4?)
z&9YT^Y+7g*mu^L#&En$wQIAj8vhFF+bF~<&rvR16@dgr_Tgzmdj#(Mp$Ih^Bb@^ZK
z+q81jDmlO%F$5QQLlk+gyy_!H*4A2;SD%BfXx^;TX*z1h*Uc=D-D!7r^E<q>@#W7z
l&$6dD5}z}^uI9&Wb(=+_SCJF5X!tQyp>m2^`oz?>{{h*uFAo3!