Commit 0efb8fb

Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762 Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb

3 files changed

Lines changed: 90 additions & 8 deletions

File tree

‎lib/find-visualstudio.js‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]

‎test/test-find-visualstudio.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 0efb8fb
Browse files
joaocgreisjoaocgreis
committed
win: support running in VS Command Prompt
PR-URL: #1762
Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 360ddbd commit 0efb8fb
3 files changed
Lines changed: 90 additions & 8 deletions
File tree
‎lib/find-visualstudio.js‎
Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,15 @@ VisualStudioFinder.prototype = {
5454
this.addLog('msvs_version not set from command line or npm config')
5555
}
5656

57+
if(process.env.VCINSTALLDIR){
58+
this.envVcInstallDir=
59+
path.resolve(process.env.VCINSTALLDIR,'..')
60+
this.addLog('running in VS Command Prompt, installation path is:\n'+
61+
`"${this.envVcInstallDir}"\n- will only use this version`)
62+
}else{
63+
this.addLog('VCINSTALLDIR not set, not running in VS Command Prompt')
64+
}
65+
5766
this.findVisualStudio2017OrNewer((info)=>{
5867
if(info){
5968
returnthis.succeed(info)
@@ -80,9 +89,13 @@ VisualStudioFinder.prototype = {
8089
},
8190

8291
fail: functionfail(){
83-
// If msvs_version was specified but finding VS failed, print what would
84-
// have been accepted
85-
if(this.configMsvsVersion){
92+
if(this.configMsvsVersion&&this.envVcInstallDir){
93+
this.errorLog.push(
94+
'msvs_version does not match this VS Command Prompt or the',
95+
'installation cannot be used.')
96+
}elseif(this.configMsvsVersion){
97+
// If msvs_version was specified but finding VS failed, print what would
98+
// have been accepted
8699
this.errorLog.push('')
87100
if(this.validVersions){
88101
this.errorLog.push('valid versions for msvs_version:')
@@ -163,6 +176,7 @@ VisualStudioFinder.prototype = {
163176

164177
vsInfo=vsInfo.map((info)=>{
165178
this.log.silly(`processing installation: "${info.path}"`)
179+
info.path=path.resolve(info.path)
166180
varret=this.getVersionInfo(info)
167181
ret.path=info.path
168182
ret.msBuild=this.getMSBuild(info,ret.versionYear)
@@ -380,17 +394,21 @@ VisualStudioFinder.prototype = {
380394
// - add it to validVersions to be displayed at the end if a specific
381395
// version was requested and not found;
382396
// - check if this is the version that was requested.
397+
// - check if this matches the Visual Studio Command Prompt
383398
checkConfigVersion: functioncheckConfigVersion(versionYear,vsPath){
384399
this.validVersions.push(versionYear)
385400
this.validVersions.push(vsPath)
386401

387-
if(this.configVersionYear&&
388-
this.configVersionYear!==versionYear){
389-
this.addLog('- not looking for this version')
402+
if(this.configVersionYear&&this.configVersionYear!==versionYear){
403+
this.addLog('- msvs_version does not match this version')
390404
returnfalse
391405
}
392406
if(this.configPath&&this.configPath!==vsPath){
393-
this.addLog('- not looking for this installation')
407+
this.addLog('- msvs_version does not point to this installation')
408+
returnfalse
409+
}
410+
if(this.envVcInstallDir&&this.envVcInstallDir!==vsPath){
411+
this.addLog('- does not match this Visual Studio Command Prompt')
394412
returnfalse
395413
}
396414

‎test/fixtures/VS_2017_Unusable.txt‎
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
1+
[{"path":"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildToolsUnusable","version":"15.9.28307.665","packages":["Microsoft.VisualStudio.Product.BuildTools","Microsoft.VisualStudio.Component.Windows10SDK.17134","Win10SDK_10.0.17134","Microsoft.VisualStudio.Component.VC.Tools.x86.x64","Microsoft.VisualCpp.CodeAnalysis.Extensions","Microsoft.VisualCpp.CodeAnalysis.Extensions.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X86.Resources","Microsoft.VisualCpp.CodeAnalysis.Extensions.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64","Microsoft.VisualCpp.CodeAnalysis.ConcurrencyCheck.X64.Resources","Microsoft.VisualStudio.Component.Static.Analysis.Tools","Microsoft.VisualStudio.StaticAnalysis","Microsoft.VisualStudio.StaticAnalysis.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX86","Microsoft.VisualCpp.VCTip.HostX64.TargetX86","Microsoft.VisualCpp.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Tools.HostX64.TargetX64","Microsoft.VisualCpp.VCTip.HostX64.TargetX64","Microsoft.VisualCpp.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX64","Microsoft.VisualCpp.Premium.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX86.Resources","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64","Microsoft.VisualCpp.Premium.Tools.HostX64.TargetX64.Resources","Microsoft.VisualCpp.PGO.X86","Microsoft.VisualCpp.PGO.X64","Microsoft.VisualCpp.PGO.Headers","Microsoft.VisualCpp.CRT.x86.Store","Microsoft.VisualCpp.CRT.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.x64.Store","Microsoft.VisualCpp.CRT.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x86.OneCore.Desktop","Microsoft.VisualCpp.CRT.Redist.x64.OneCore.Desktop","Microsoft.VisualCpp.CRT.ClickOnce.Msi","Microsoft.VisualStudio.PackageGroup.VC.Tools.x86","Microsoft.VisualCpp.Tools.HostX86.TargetX64","Microsoft.VisualCpp.VCTip.hostX86.targetX64","Microsoft.VisualCpp.Tools.Hostx86.Targetx64.Resources","Microsoft.VisualCpp.Tools.HostX86.TargetX86","Microsoft.VisualCpp.VCTip.hostX86.targetX86","Microsoft.VisualCpp.Tools.HostX86.TargetX86.Resources","Microsoft.VisualCpp.Tools.Core.Resources","Microsoft.VisualCpp.Tools.Core.x86","Microsoft.VisualCpp.Tools.Common.Utils","Microsoft.VisualCpp.Tools.Common.Utils.Resources","Microsoft.VisualCpp.DIA.SDK","Microsoft.VisualCpp.CRT.x86.Desktop","Microsoft.VisualCpp.CRT.x64.Desktop","Microsoft.VisualCpp.CRT.Source","Microsoft.VisualCpp.CRT.Redist.X86","Microsoft.VisualCpp.CRT.Redist.X64","Microsoft.VisualCpp.CRT.Redist.Resources","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.RuntimeDebug.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.Redist.14","Microsoft.VisualCpp.CRT.Headers","Microsoft.VisualStudio.Workload.MSBuildTools","Microsoft.VisualStudio.Component.CoreBuildTools","Microsoft.VisualStudio.Setup.Configuration","Microsoft.VisualStudio.PackageGroup.VsDevCmd","Microsoft.VisualStudio.VsDevCmd.Ext.NetFxSdk","Microsoft.VisualStudio.VsDevCmd.Core.WinSdk","Microsoft.VisualStudio.VsDevCmd.Core.DotNet","Microsoft.VisualStudio.VC.DevCmd","Microsoft.VisualStudio.VC.DevCmd.Resources","Microsoft.VisualStudio.BuildTools.Resources","Microsoft.VisualStudio.Net.Eula.Resources","Microsoft.Build.Dependencies","Microsoft.Build.FileTracker.Msi","Microsoft.Component.MSBuild","Microsoft.PythonTools.BuildCore.Vsix","Microsoft.NuGet.Build.Tasks","Microsoft.VisualStudio.Component.Roslyn.Compiler","Microsoft.CodeAnalysis.Compilers.Resources","Microsoft.CodeAnalysis.Compilers","Microsoft.Net.PackageGroup.4.6.1.Redist","Microsoft.Net.4.6.1.FullRedist.NonThreshold","Microsoft.Windows.UniversalCRT.Msu.81","Microsoft.VisualStudio.NativeImageSupport","Microsoft.Build"]}]
‎test/test-find-visualstudio.js‎
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ const VisualStudioFinder = findVisualStudio.test.VisualStudioFinder
88

99
constsemverV1={major: 1,minor: 0,patch: 0}
1010

11+
deleteprocess.env.VCINSTALLDIR
12+
1113
functionpoison(object,property){
1214
functionfail(){
1315
console.error(Error(`Property ${property} should not have been accessed.`))
@@ -549,3 +551,65 @@ test('latest version should be found by default', function (t) {
549551
allVsVersions(t,finder)
550552
finder.findVisualStudio()
551553
})
554+
555+
test('run on a usable VS Command Prompt',function(t){
556+
t.plan(2)
557+
558+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
559+
// VSINSTALLDIR is not defined on Visual C++ Build Tools 2015
560+
deleteprocess.env.VSINSTALLDIR
561+
562+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
563+
t.strictEqual(err,null)
564+
t.deepEqual(info.path,'C:\\VS2015')
565+
})
566+
567+
allVsVersions(t,finder)
568+
finder.findVisualStudio()
569+
})
570+
571+
test('run on a unusable VS Command Prompt',function(t){
572+
t.plan(2)
573+
574+
process.env.VCINSTALLDIR=
575+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildToolsUnusable\\VC'
576+
577+
constfinder=newTestVisualStudioFinder(semverV1,null,(err,info)=>{
578+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
579+
t.false(info,'no data')
580+
})
581+
582+
allVsVersions(t,finder)
583+
finder.findVisualStudio()
584+
})
585+
586+
test('run on a VS Command Prompt with matching msvs_version',function(t){
587+
t.plan(2)
588+
589+
process.env.VCINSTALLDIR='C:\\VS2015\\VC'
590+
591+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
592+
(err,info)=>{
593+
t.strictEqual(err,null)
594+
t.deepEqual(info.path,'C:\\VS2015')
595+
})
596+
597+
allVsVersions(t,finder)
598+
finder.findVisualStudio()
599+
})
600+
601+
test('run on a VS Command Prompt with mismatched msvs_version',function(t){
602+
t.plan(2)
603+
604+
process.env.VCINSTALLDIR=
605+
'C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\VC'
606+
607+
constfinder=newTestVisualStudioFinder(semverV1,'C:\\VS2015',
608+
(err,info)=>{
609+
t.ok(/find.*VisualStudio/i.test(err),'expect error')
610+
t.false(info,'no data')
611+
})
612+
613+
allVsVersions(t,finder)
614+
finder.findVisualStudio()
615+
})
0 commit comments
Comments
 (0)