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 2012/01/18 02:17:59 UTC
svn commit: r1232719 - in
/incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix:
AbstractWixMojo.java CandleMojo.java LightMojo.java
Author: brett
Date: Wed Jan 18 02:17:59 2012
New Revision: 1232719
URL: http://svn.apache.org/viewvc?rev=1232719&view=rev
Log:
reformat only
Modified:
incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/AbstractWixMojo.java
incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java
incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/AbstractWixMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/AbstractWixMojo.java?rev=1232719&r1=1232718&r2=1232719&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/AbstractWixMojo.java (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/AbstractWixMojo.java Wed Jan 18 02:17:59 2012
@@ -33,13 +33,15 @@ public abstract class AbstractWixMojo
extends AbstractMojo
{
/**
- * WiX extensions to use
- * @parameter
- */
+ * WiX extensions to use
+ *
+ * @parameter
+ */
protected String[] extensions;
/**
* Arguments to pass to WiX executable as is
+ *
* @parameter expression="${arguments}"
*/
@@ -105,12 +107,12 @@ public abstract class AbstractWixMojo
private String getWixPath( String name )
{
- if ( wixHome != null )
- {
- return new File( new File( wixHome, "bin" ), name ).getAbsolutePath();
- }
- return name;
- }
+ if ( wixHome != null )
+ {
+ return new File( new File( wixHome, "bin" ), name ).getAbsolutePath();
+ }
+ return name;
+ }
public abstract String getCommand();
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java?rev=1232719&r1=1232718&r2=1232719&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/CandleMojo.java Wed Jan 18 02:17:59 2012
@@ -29,7 +29,6 @@ import java.util.List;
* Goal which executes WiX candle to create a .wixobj file.
*
* @goal candle
- *
* @phase package
*/
public class CandleMojo
@@ -37,6 +36,7 @@ public class CandleMojo
{
/**
* Location of the WiX source files.
+ *
* @parameter expression="${sourceFiles}"
* @required
*/
@@ -44,18 +44,21 @@ public class CandleMojo
/**
* Definitions to be passed on before pre Compilation
+ *
* @parameter expression="${definitions}"
*/
private String[] definitions;
/**
* x86, intel, x64, intel64, or ia64 (default: x86)
+ *
* @parameter expression="${arch}"
*/
private String arch;
/**
* Output file
+ *
* @parameter expression="${outputDirectory}"
*/
private File outputDirectory;
@@ -75,7 +78,7 @@ public class CandleMojo
arguments.add( "-nologo" );
arguments.add( "-sw" );
- if(definitions.length>0)
+ if ( definitions.length > 0 )
{
for ( String definition : definitions )
{
@@ -83,17 +86,18 @@ public class CandleMojo
}
}
- if(outputDirectory != null)
+ if ( outputDirectory != null )
{
- if (!outputDirectory.exists())
+ if ( !outputDirectory.exists() )
{
- outputDirectory.mkdir();
+ outputDirectory.mkdir();
}
arguments.add( "-out" );
arguments.add( outputDirectory.getAbsolutePath() + "\\" );
}
- if ( arch != null ) {
+ if ( arch != null )
+ {
arguments.add( "-arch " + arch );
}
Modified: incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java?rev=1232719&r1=1232718&r2=1232719&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java (original)
+++ incubator/npanday/trunk/plugins/wix-maven-plugin/src/main/java/npanday/plugin/wix/LightMojo.java Wed Jan 18 02:17:59 2012
@@ -30,7 +30,6 @@ import java.util.List;
* Goal which executes WiX light to create a .msi file.
*
* @goal light
- *
* @phase package
*/
public class LightMojo
@@ -38,6 +37,7 @@ public class LightMojo
{
/**
* Location of the WiX object files.
+ *
* @parameter expression="${objectFiles}"
* @required
*/
@@ -45,18 +45,21 @@ public class LightMojo
/**
* Output file
+ *
* @parameter expression="${outputFile}"
*/
private File outputFile;
/**
* Location of the WiX localization files.
+ *
* @parameter expression="${localizationFiles}"
*/
private File[] localizationFiles;
- /**
+ /**
* Output file
+ *
* @parameter expression="${outputDirectory}"
*/
private File outputDirectory;
@@ -90,7 +93,7 @@ public class LightMojo
arguments.add( objectFile.getAbsolutePath() );
}
- if(localizationFiles.length > 0)
+ if ( localizationFiles.length > 0 )
{
arguments.add( "-loc" );
for ( File localizationFile : localizationFiles )
@@ -103,11 +106,13 @@ public class LightMojo
}
}
- if (outputFile != null) {
+ if ( outputFile != null )
+ {
arguments.add( "-o" );
arguments.add( outputFile.getAbsolutePath() );
}
- else if (outputDirectory != null) {
+ else if ( outputDirectory != null )
+ {
arguments.add( "-out" );
arguments.add( outputDirectory.getAbsolutePath() + "\\" );
}