Merge pull request #1155 from mjbvz/port-12-install-tools-fix-to-master

Bring Typings Tool Installer Fix to Master
microsoft · Jul 21, 2016 · 511039b · 511039b
2 parents 43c013e + 8b9e964
commit 511039b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Nodejs/Setup/NodejsTools/NodejsTools.wxs b/Nodejs/Setup/NodejsTools/NodejsTools.wxs
@@ -12,6 +12,9 @@
             <Directory Id="Dir_$(var.key)InstallLocationFileTemplates" Name="FileTemplates">
                 <Directory Id="Dir_$(var.key)FileTemplatesNewItem" Name="NewItem" />
             </Directory>
+            <Directory Id="Dir_$(var.key)TypingsAcquisitionTool" Name="TypingsAcquisitionTool">
+                <Directory Id="Dir_$(var.key)TypingsAcquisitionToolBin" Name="bin" />
+            </Directory>
             <Directory Id="Dir_$(var.key)TestFrameworks" Name="TestFrameworks">
                 <Directory Id="Dir_$(var.key)TestFrameworksExportRunner" Name="ExportRunner" />
                 <Directory Id="Dir_$(var.key)TestFrameworksMocha" Name="Mocha" />

diff --git a/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj b/Nodejs/Setup/NodejsTools/NodejsToolsFiles.proj
@@ -150,6 +150,15 @@
         <File Include="Snippets\1033\SnippetsIndex.xml">
             <InstallDirectory>Snippets_1033</InstallDirectory>
         </File>
+
+        <File Include="TypingsAcquisitionTool\index.js;
+                       TypingsAcquisitionTool\package.json">
+            <InstallDirectory>TypingsAcquisitionTool</InstallDirectory>
+        </File>
+
+        <File Include="TypingsAcquisitionTool\bin\install_typings">
+            <InstallDirectory>TypingsAcquisitionToolBin</InstallDirectory>
+        </File>
 
         <!--Unit test framework support files-->
         <File Include="TestFrameworks\find_tests.js;