You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2014/07/08 03:23:59 UTC
svn commit: r1608647 - in /incubator/npanday/trunk:
components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Author: brett
Date: Tue Jul 8 03:23:59 2014
New Revision: 1608647
URL: http://svn.apache.org/r1608647
Log:
[NPANDAY-505] probe for resgen and gacutil
Modified:
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
Modified: incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1608647&r1=1608646&r2=1608647&view=diff
==============================================================================
--- incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Jul 8 03:23:59 2014
@@ -120,6 +120,14 @@
<operatingSystem>Windows</operatingSystem>
</platform>
</platforms>
+ <probingPaths>
+ <!-- TODO: this should be broken up as XSD is, just means for now you always get newest available tools version, but will target right framework -->
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows@CurrentInstallFolder}\bin</probingPath>
+ </probingPaths>
</executablePlugin>
<executablePlugin>
<identifier>MONO:GACUTIL</identifier>
Modified: incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1608647&r1=1608646&r2=1608647&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml (original)
+++ incubator/npanday/trunk/plugins/maven-resgen-plugin/src/main/resources/META-INF/npanday/executable-plugins.xml Tue Jul 8 03:23:59 2014
@@ -37,8 +37,16 @@ under the License.
<operatingSystem>Windows</operatingSystem>
</platform>
</platforms>
+ <probingPaths>
+ <!-- TODO: this should be broken up as XSD is, just means for now you always get newest available tools version, but will target right framework -->
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\12.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0\11.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0\11.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\4.0@SDK40ToolsPath}</probingPath>
+ <probingPath>${HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows@CurrentInstallFolder}\bin</probingPath>
+ </probingPaths>
</executablePlugin>
- <executablePlugin>
+ <executablePlugin>
<identifier>MONO:RESGEN</identifier>
<pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
<vendor>MONO</vendor>