directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r564332 - /directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
Date Thu, 09 Aug 2007 18:26:31 GMT
Author: ccustine
Date: Thu Aug  9 11:26:30 2007
New Revision: 564332

URL: http://svn.apache.org/viewvc?view=rev&rev=564332
Log:
Don't fail build if Windows tools aren't available to create Win32 installer.  Just warn and
move on.

Modified:
    directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java

Modified: directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java?view=diff&rev=564332&r1=564331&r2=564332
==============================================================================
--- directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
(original)
+++ directory/daemon/trunk/plugin/src/main/java/org/apache/directory/daemon/installers/nsis/NsisInstallerCommand.java
Thu Aug  9 11:26:30 2007
@@ -90,14 +90,19 @@
 
         if ( !target.getOsFamily().equals( "windows" ) )
         {
-            throw new MojoFailureException( "NSIS installer can only be targeted for windows
platforms!" );
+            log.warn( "NSIS installer can only be targeted for windows platforms!" );
+            log.warn( "The build will continue, but please check the the platform" );
+            log.warn( "of this installer target" );
+            return;
         }
 
         // @todo this should really be a parameter taken from the user's settings
         // because the compiler may be installed in different places and is specific
         if ( !target.getNsisCompiler().exists() )
         {
-            throw new MojoFailureException( "Cannot find NSIS compiler: " + target.getNsisCompiler()
);
+            log.warn( "Cannot find NSIS compiler at this location: " + target.getNsisCompiler()
);
+            log.warn( "The build will continue, but please check the location of your makensis
executable ");
+            return;
         }
         else
         {



Mime
View raw message