incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r520959 - in /incubator/nmaven/branches/SI_IDE: components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/ plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/
Date Wed, 21 Mar 2007 17:44:33 GMT
Author: sisbell
Date: Wed Mar 21 10:44:32 2007
New Revision: 520959

URL: http://svn.apache.org/viewvc?view=rev&rev=520959
Log:
Can't use mono.exe on linux to execute repo executables. Have to use mono, without the extension.

Modified:
    incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
    incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
    incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java

Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java?view=diff&rev=520959&r1=520958&r2=520959
==============================================================================
--- incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
(original)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
Wed Mar 21 10:44:32 2007
@@ -100,7 +100,7 @@
         {
             throw new ExecutionException( "NMAVEN-063-002: Executable has not been initialized
with a context" );
         }
-        
+
         List<String> executablePaths = executableContext.getExecutableConfig().getExecutionPaths();
         if ( executablePaths != null )
         {
@@ -110,6 +110,10 @@
                 if ( exe.exists() )
                 {
                     return new File( executablePath ).getName();
+                }
+                else if(executablePath.equals( "mono"))
+                {
+                    return executablePath;    
                 }
             }
         }

Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=520959&r1=520958&r2=520959
==============================================================================
--- incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
(original)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
Wed Mar 21 10:44:32 2007
@@ -175,10 +175,9 @@
             {
                 for ( File executablePath : executablePaths )
                 {
-                    File monoExe = new File( executablePath.getAbsolutePath() + File.separator
+ "mono.exe" );
-                    if ( monoExe.exists() )
+                    if ( new File( executablePath.getAbsolutePath() + File.separator + "mono.exe"
).exists() )
                     {
-                        exe = monoExe.getAbsolutePath();
+                        exe = new File( executablePath.getAbsolutePath() + File.separator
+ "mono" ).getAbsolutePath();
                         break;
                     }
                 }
@@ -189,7 +188,7 @@
                 logger.info(
                     "NMAVEN-066-005: Executable path for mono does not exist. Will attempt
to execute MONO using" +
                         " the main PATH variable." );
-                exe = "mono.exe";
+                exe = "mono";
             }
             modifiedCommands.add( artifactPath.getAbsolutePath() );
             for ( String command : commands )

Modified: incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java?view=diff&rev=520959&r1=520958&r2=520959
==============================================================================
--- incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
(original)
+++ incubator/nmaven/branches/SI_IDE/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/AssemblyInfoGeneratorMojo.java
Wed Mar 21 10:44:32 2007
@@ -178,7 +178,6 @@
 
         if ( vendorInfo.getVendor().equals( Vendor.MICROSOFT ) && vendorInfo.getVendorVersion().equals(
"1.1.4322" ) )
         {
-            System.out.println(keyfile + ":" + keycontainer);
             assemblyInfo.setKeyFile( keyfile );
             assemblyInfo.setKeyName( keycontainer );
         }



Mime
View raw message