Rafactor: make version available as task variable

The refactoring allows to define the version variable in a platform specific task. There is now the choice to set the artifact version specific to a platform, for the whole SetupBuilder and therefore each platform or globally in the project.

The change allows a more fine grained setup where version numbers are in a special format (msi).

Author: gamma

src/com/inet/gradle/setup/abstracts/AbstractTask.java

@@ -67,7 +67,7 @@ public abstract class AbstractTask extends DefaultTask implements SetupSources {
 
     private AbstractSetupBuilder setupBuilder;
 
-    private String extension, classifier;
+    private String extension, classifier, version;
 
     /**
      * Constructor with indication to artifact result
@@ -305,4 +305,24 @@ public String getDescription() {
         }
         return setupBuilder.getDescription();
     }
+
+    /**
+     * Get the version of the task. If not set the version of the setup is returned
+     * @return the version
+     */
+    public String getVersion() {
+        if ( version != null ) {
+            return version;
+        }
+
+        return setupBuilder.getVersion();
+    }
+
+    /**
+     * Set the version of the task
+     * @param version the version to set
+     */
+    public void setVersion( String version ) {
+        this.version = version;
+    }
 }

src/com/inet/gradle/setup/dmg/AbstractOSXApplicationBuilder.java

@@ -80,7 +80,7 @@ protected void prepareApplication( Application application, boolean isJNLPBuild
         appBundler.setName( appName );
         appBundler.setDisplayName( appName );
 
-        String version = setup.getVersion();
+        String version = task.getVersion();
         appBundler.setVersion( version );
         int idx = version.indexOf( '.' );
         if( idx >= 0 ) {
@@ -121,6 +121,7 @@ protected void prepareApplication( Application application, boolean isJNLPBuild
             appBundler.setJarLauncherName( mainJar );
         }
 
+        appBundler.setIgnorePSN( true ); // Ignore this argument.
         appBundler.setCopyright( setup.getCopyright() );
         appBundler.setIcon( getApplicationIcon() );
         Architecture x86_64 = new Architecture();

src/com/inet/gradle/setup/dmg/DmgBuilder.java

@@ -276,7 +276,7 @@ private void extractApplicationInformation() throws IOException {
         command.add( "--identifier" );
         command.add( setup.getMainClass() != null ? setup.getMainClass() : setup.getAppIdentifier() );
         command.add( "--version" );
-        command.add( setup.getVersion() );
+        command.add( task.getVersion() );
         command.add( "--scripts" );
         command.add( TempPath.get( "scripts" ).toString() );
         command.add( "--install-location" );

src/com/inet/gradle/setup/dmg/OSXPrefPaneCreator.java

@@ -34,7 +34,7 @@ protected OSXPrefPaneCreator( Dmg task, SetupBuilder setup, FileResolver fileRes
 
     /**
      * Create a single Lauch4j launcher.
-     * 
+     *
      * @param launch the launch description
      * @param task the task
      * @param setup the SetupBuilder
@@ -98,7 +98,7 @@ void create( Service service ) throws Exception {
 
         // Program will be set during installation.
         setPlistProperty( servicePLIST, ":Description", service.getDescription() );
-        setPlistProperty( servicePLIST, ":Version", getSetupBuilder().getVersion() );
+        setPlistProperty( servicePLIST, ":Version", task.getVersion() );
         setPlistProperty( servicePLIST, ":KeepAlive", String.valueOf( service.isKeepAlive() ) );
         setPlistProperty( servicePLIST, ":RunAtBoot", String.valueOf( service.isStartOnBoot() ) );
         setPlistProperty( servicePLIST, ":RunAtLoad", "true" );
@@ -132,7 +132,7 @@ void create( Service service ) throws Exception {
 
     /**
      * Download and unpack the preferences pane setup files
-     * 
+     *
      * @param internalName to unpack it now
      * @return file to prefpane sources
      * @throws IOException if an error occurs

src/com/inet/gradle/setup/msi/Launch4jConfig.java

@@ -96,10 +96,10 @@ File build() throws Exception {
         getOrCreateChild( jre, "runtimeBits" ).setTextContent( task.is64Bit() ? "64" : "32" );
 
         Element versionInfo = getOrCreateChild( launch4jConfig, "versionInfo" );
-        getOrCreateChild( versionInfo, "fileVersion" ).setTextContent( normalizeVersionNumber( setup.getVersion() ) );
-        getOrCreateChild( versionInfo, "txtFileVersion" ).setTextContent( setup.getVersion() );
-        getOrCreateChild( versionInfo, "productVersion" ).setTextContent( normalizeVersionNumber( setup.getVersion() ) );
-        getOrCreateChild( versionInfo, "txtProductVersion" ).setTextContent( setup.getVersion() );
+        getOrCreateChild( versionInfo, "fileVersion" ).setTextContent( normalizeVersionNumber( task.getVersion() ) );
+        getOrCreateChild( versionInfo, "txtFileVersion" ).setTextContent( task.getVersion() );
+        getOrCreateChild( versionInfo, "productVersion" ).setTextContent( normalizeVersionNumber( task.getVersion() ) );
+        getOrCreateChild( versionInfo, "txtProductVersion" ).setTextContent( task.getVersion() );
         getOrCreateChild( versionInfo, "fileDescription" ).setTextContent( launch.getDescription() );
         getOrCreateChild( versionInfo, "productName" ).setTextContent( setup.getApplication() );
         getOrCreateChild( versionInfo, "companyName" ).setTextContent( setup.getVendor() );

src/com/inet/gradle/setup/msi/Launch4jManifest.java

@@ -21,12 +21,11 @@
 import org.w3c.dom.Element;
 
 import com.inet.gradle.setup.SetupBuilder;
-import com.inet.gradle.setup.abstracts.DesktopStarter;
 import com.inet.gradle.setup.util.XmlFileBuilder;
 
 /**
  * Create a XML configuration file for lauch4j.
- * 
+ *
  * @author Volker
  */
 class Launch4jManifest extends XmlFileBuilder<Msi> {
@@ -35,7 +34,7 @@ class Launch4jManifest extends XmlFileBuilder<Msi> {
 
     /**
      * Create a instance.
-     * 
+     *
      * @param launch the launch description
      * @param task current task
      * @param setup the SetupBuilder
@@ -48,7 +47,7 @@ class Launch4jManifest extends XmlFileBuilder<Msi> {
 
     /**
      * Create the XML file.
-     * 
+     *
      * @throws IOException if an error occurs on reading the image files
      */
     void build() throws IOException {
@@ -57,7 +56,7 @@ void build() throws IOException {
         addAttributeIfNotExists( assembly, "manifestVersion", "1.0" );
 
         Element identity = getOrCreateChild( assembly, "assemblyIdentity" );
-        addAttributeIfNotExists( identity, "version", Launch4jConfig.normalizeVersionNumber( setup.getVersion() ) );
+        addAttributeIfNotExists( identity, "version", Launch4jConfig.normalizeVersionNumber( task.getVersion() ) );
         addAttributeIfNotExists( identity, "processorArchitecture", "X86" );
         addAttributeIfNotExists( identity, "name", launch.getDisplayName() );
         addAttributeIfNotExists( identity, "type", "win32" );