Author: apadilla
Date: Tue Oct 5 09:51:18 2010
New Revision: 1004593
URL: http://svn.apache.org/viewvc?rev=1004593&view=rev
Log:
reverted some changes because it causes regression when running NPanday on VS
2008. (http://npanday.codeplex.com/workitem/13479)
Modified:
incubator/npanday/branches/npanday-vs2010-support/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
incubator/npanday/branches/npanday-vs2010-support/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
Modified:
incubator/npanday/branches/npanday-vs2010-support/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-vs2010-support/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java?rev=1004593&r1=1004592&r2=1004593&view=diff
==============================================================================
---
incubator/npanday/branches/npanday-vs2010-support/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
(original)
+++
incubator/npanday/branches/npanday-vs2010-support/components/dotnet-executable/src/main/java/npanday/executable/compiler/impl/DefaultCompiler.java
Tue Oct 5 09:51:18 2010
@@ -164,14 +164,6 @@ public final class DefaultCompiler
commands.add( wcfRef + "Microsoft.Data.Entity.Build.Tasks.dll" );
commands.add( wcfRef + "Microsoft.VisualC.STLCLR.dll" );
}
-
- //liit
- if ( compilerContext.getCompilerRequirement().getVendor().equals(
Vendor.MICROSOFT ) &&
-
compilerContext.getCompilerRequirement().getFrameworkVersion().equals( "4.0" ) )
- {
- String wcfRef = "/reference:" + System.getenv( "SystemRoot" ) +
- "\\Microsoft.NET\\Framework\\v4.0.30319\\";
- }
if ( compilerContext.getKeyInfo().getKeyFileUri() != null )
{
Modified:
incubator/npanday/branches/npanday-vs2010-support/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-vs2010-support/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs?rev=1004593&r1=1004592&r2=1004593&view=diff
==============================================================================
---
incubator/npanday/branches/npanday-vs2010-support/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
(original)
+++
incubator/npanday/branches/npanday-vs2010-support/plugins/netplugins/NPanday.Plugin.Settings/src/main/csharp/NPanday/Plugin/Settings/SettingsGeneratorMojo.cs
Tue Oct 5 09:51:18 2010
@@ -124,17 +124,12 @@ namespace NPanday.Plugin.Settings
bool dirInfo20 = new DirectoryInfo(Path.Combine(installRoot,
"v2.0.50727")).Exists;
bool dirInfo35 = new DirectoryInfo(Path.Combine(installRoot,
"v3.5")).Exists;
- //liit
- bool dirInfo40 = new DirectoryInfo(Path.Combine(installRoot,
"v4.0.30319")).Exists;
-
if(installRoot != null)
{
- //if(!dirInfo11 && !dirInfo20 && !dirInfo35)
- if(!dirInfo11 && !dirInfo20 && !dirInfo35 && !dirInfo40)
+ if(!dirInfo11 && !dirInfo20 && !dirInfo35)
return null;
defaultSetup.vendorName = "MICROSOFT";
- //defaultSetup.vendorVersion = (dirInfo20) ? "2.0.50727" :
((dirInfo35) ? "3.5" : "1.1.4322");
- defaultSetup.vendorVersion = (dirInfo20) ? "2.0.50727" :
(dirInfo35) ? "3.5" : ((dirInfo40) ? "4.0" : "1.1.4322");
+ defaultSetup.vendorVersion = (dirInfo20) ? "2.0.50727" :
((dirInfo35) ? "3.5" : "1.1.4322");
defaultSetup.frameworkVersion = defaultSetup.vendorVersion;
return defaultSetup;
}
@@ -196,9 +191,6 @@ namespace NPanday.Plugin.Settings
DirectoryInfo dirInfo30 = new
DirectoryInfo(Path.Combine(installRoot, "v3.0"));
DirectoryInfo dirInfo35 = new
DirectoryInfo(Path.Combine(installRoot, "v3.5"));
- //liit
- DirectoryInfo dirInfo40 = new
DirectoryInfo(Path.Combine(installRoot, "v4.0.30319"));
-
int vendorCounter = 0;
if (dirInfo11.Exists)
{
@@ -248,22 +240,6 @@ namespace NPanday.Plugin.Settings
vendors[vendorCounter++] = vendor;
}
- //liit
- if (dirInfo40.Exists)
- {
- npandaySettingsVendorsVendor vendor = new
npandaySettingsVendorsVendor();
- vendor.vendorName = "MICROSOFT";
- vendor.vendorVersion = "4.0";
- npandaySettingsVendorsVendorFrameworksFramework[]
vendorFrameworks = new npandaySettingsVendorsVendorFrameworksFramework[1];
- npandaySettingsVendorsVendorFrameworksFramework vf11 = new
npandaySettingsVendorsVendorFrameworksFramework();
- vf11.installRoot = dirInfo40.FullName;
- vf11.frameworkVersion = "4.0";
- vendorFrameworks[0] = vf11;
- vf11.sdkInstallRoot = sdkInstallRoot20;
- vendor.frameworks = vendorFrameworks;
- vendors[vendorCounter++] = vendor;
- }
-
return vendors;
}
@@ -294,11 +270,6 @@ namespace NPanday.Plugin.Settings
vf35.installRoot = installRoot;
vf35.frameworkVersion = "3.5";
vendorFrameworks[2] = vf35;
-
- npandaySettingsVendorsVendorFrameworksFramework vf40 = new
npandaySettingsVendorsVendorFrameworksFramework();
- vf40.installRoot = installRoot;
- vf40.frameworkVersion = "4.0";
- vendorFrameworks[3] = vf40;
npandaySettingsVendorsVendor vendor = new
npandaySettingsVendorsVendor();
vendor.vendorName = "MONO";
