Minor changes

Author: i-net /// software

.settings/org.eclipse.buildship.core.prefs

@@ -1,3 +1,4 @@
+auto.sync=false
 build.commands=org.eclipse.jdt.core.javabuilder
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(4.3.1))

src/com/inet/gradle/appbundler/AppBundler.java

@@ -23,12 +23,12 @@
 
 /**
  * The Gradle extension for appBundler task.
- * 
+ *
  * @author Gerry Weißbach
  */
 public class AppBundler extends AbstractSetupBuilder implements SetupSources {
 
-    private String jnlpLauncherName;    
+    private String jnlpLauncherName;
 
     /**
      * Create a new instance.

src/com/inet/gradle/appbundler/AppBundlerApplicationBuilder.java

@@ -54,9 +54,10 @@ void buildApplication(DesktopStarter application) throws Exception {
             application.setExecutable( getSetupBuilder().getAppIdentifier() );
         }
 
-        prepareApplication( application );
+        String jnlpLauncherName = getSetupBuilder().getJnlpLauncherName();
+        prepareApplication( application, jnlpLauncherName != null );
+        getAppBundler().setJnlpLauncherName( jnlpLauncherName );
         setDocumentTypes( application.getDocumentType() );
-        getAppBundler().setJnlpLauncherName( ((AppBundler)getSetupBuilder()).getJnlpLauncherName() );
 
         finishApplication();
         copyBundleFiles( application );

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

@@ -42,11 +42,15 @@
 import org.gradle.api.internal.file.copy.DefaultCopySpec;
 import org.gradle.api.internal.file.copy.FileCopyDetailsInternal;
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.WorkResult;
+/*// if gradleVersion < 3.4
+import org.gradle.api.internal.tasks.SimpleWorkResult;
+*/// else
+import org.gradle.api.tasks.WorkResults;
+//// endif
 import org.gradle.internal.nativeplatform.filesystem.FileSystem;
 import org.gradle.internal.reflect.Instantiator;
 
@@ -71,7 +75,6 @@ public abstract class AbstractTask extends DefaultTask implements SetupSources {
      * @param extension of the setup
      * @param setupType the class of the SetupBuilder
      */
-    @SuppressWarnings("unchecked")
     public AbstractTask( String extension, Class<? extends AbstractSetupBuilder> setupType ) {
         this.extension = extension;
         this.rootSpec = (CopySpecInternal)getProject().copySpec( (Closure<CopySpec>)null );
@@ -169,7 +172,11 @@ private void processFiles( CopyActionProcessingStreamAction action, CopySpecInte
             @Override
             public WorkResult execute( CopyActionProcessingStream stream ) {
                 stream.process( action );
+                /*// if gradleVersion < 3.4
                 return new SimpleWorkResult( true );
+                */// else
+                return WorkResults.didWork( true );
+                //// endif
             }
         };
         copyActionExecuter.execute( copySpec, copyAction );
@@ -201,10 +208,9 @@ protected FileLookup getFileLookup() {
     public abstract void build();
 
     /**
-     * Return the setupBuilder using the specified type 
+     * Return the setupBuilder using the specified type
      * @return setupBuilder
      */
-    @SuppressWarnings("unchecked")
     protected AbstractSetupBuilder getAbstractSetupBuilder() {
         return setupBuilder;
     }
@@ -232,7 +238,7 @@ public FileTree getSetupSource() {
         try {
             return setupBuilder.getSource();
         } catch ( Throwable e ) {
-            throw new IllegalArgumentException( "You have to specify input sources for your application", e ); 
+            throw new IllegalArgumentException( "You have to specify input sources for your application", e );
         }
     }
 
@@ -254,7 +260,7 @@ public File getSetupFile() {
 
     /**
      * Get the file extension.
-     * 
+     *
      * @return the extension
      */
     public String getExtension() {
@@ -263,7 +269,7 @@ public String getExtension() {
 
     /**
      * Set the file extension of the installer. The default is equals the task name.
-     * 
+     *
      * @param extension the file extension
      */
     public void setExtension( String extension ) {

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

@@ -39,7 +39,7 @@
 
 /**
  * Abstract implementation for creating the resulting app bundler image
- * 
+ *
  * @author gamma
  *
  * @param <T> the Task
@@ -53,7 +53,7 @@ public abstract class AbstractOSXApplicationBuilder<T extends AbstractTask, S ex
 
     /**
      * Setup this builder.
-     * 
+     *
      * @param task - original task
      * @param setup - original setup
      * @param fileResolver - original fileResolver
@@ -66,11 +66,11 @@ protected AbstractOSXApplicationBuilder( T task, S setup, FileResolver fileResol
 
     /**
      * Prepare the basic settings of the application
-     * 
+     *
      * @param application to use
      * @throws Exception on errors
      */
-    protected void prepareApplication( Application application ) throws Exception {
+    protected void prepareApplication( Application application, boolean isJNLPBuild ) throws Exception {
 
         String appName = application.getDisplayName();
 
@@ -106,17 +106,19 @@ protected void prepareApplication( Application application ) throws Exception {
 
         appBundler.setIdentifier( identifier );
 
-        
-        if ( application.getMainClass() == null ) {
-            throw new ConfigurationException( "A main class is required for the application. You have to configure at least the following:\n\n\tsetupBuilder {\n\t\t[..]\n\t\tmainClass = 'your.org.main.class'\n\t}\n\n" );
-        }
-        appBundler.setMainClassName( application.getMainClass() );
+        if ( !isJNLPBuild ) {
+            // Main Class and Jar File are required.
+            if ( application.getMainClass() == null ) {
+                throw new ConfigurationException( "A main class is required for the application. You have to configure at least the following:\n\n\tsetupBuilder {\n\t\t[..]\n\t\tmainClass = 'your.org.main.class'\n\t}\n\n" );
+            }
+            appBundler.setMainClassName( application.getMainClass() );
 
-        // Check for mainJar to not be null
-        if ( mainJar == null ) {
-            throw new ConfigurationException( "A main jar file is required for the application. You have to configure at least the following:\n\n\tsetupBuilder {\n\t\t[..]\n\t\tmainJar = '/path/to/yourMain.jar'\n\t}\n\n" );
+            // Check for mainJar to not be null
+            if ( mainJar == null ) {
+                throw new ConfigurationException( "A main jar file is required for the application. You have to configure at least the following:\n\n\tsetupBuilder {\n\t\t[..]\n\t\tmainJar = '/path/to/yourMain.jar'\n\t}\n\n" );
+            }
+            appBundler.setJarLauncherName( mainJar );
         }
-        appBundler.setJarLauncherName( mainJar );
 
         appBundler.setCopyright( setup.getCopyright() );
         appBundler.setIcon( getApplicationIcon() );
@@ -138,7 +140,7 @@ protected void finishApplication() {
 
     /**
      * Set the document types from the list
-     * 
+     *
      * @param list of document types
      * @throws IOException on complications with the icon
      */
@@ -193,7 +195,7 @@ protected void bundleJre() {
 
     /**
      * Returns the icns application icon file
-     * 
+     *
      * @return Icon file
      * @throws IOException when there are errors while getting the file
      */
@@ -207,7 +209,7 @@ protected File getApplicationIcon() throws IOException {
 
     /**
      * Modify a plist file
-     * 
+     *
      * @param plist file to modify
      * @param property property to set
      * @param value of property
@@ -226,7 +228,7 @@ protected void setPlistProperty( File plist, String property, String value ) {
 
     /**
      * Add an entry to a plist file
-     * 
+     *
      * @param plist file to modify
      * @param property property to set
      * @param type of property
@@ -246,7 +248,7 @@ protected void addPlistProperty( File plist, String property, String type, Strin
 
     /**
      * Add an entry to a plist file
-     * 
+     *
      * @param plist file to modify
      * @param property property to set
      */
@@ -264,7 +266,7 @@ protected void deletePlistProperty( File plist, String property ) {
 
     /**
      * Copy the files defined in the gradle script into their final destination
-     * 
+     *
      * @param application the application
      * @throws IOException on errors
      */
@@ -277,7 +279,7 @@ protected void copyBundleFiles( Application application ) throws IOException {
 
     /**
      * Set File permissions to the resulting application
-     * 
+     *
      * @param destination of the files to manipulate
      * @throws IOException on errors
      */
@@ -311,7 +313,7 @@ protected void setApplicationFilePermissions( File destination ) throws IOExcept
 
     /**
      * Return the current AppBundler.
-     * 
+     *
      * @return appBundler
      */
     protected AppBundlerTask getAppBundler() {

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

@@ -10,15 +10,15 @@
 
 /**
  * Build an OSX Application - service
- * 
+ *
  * @author gamma
  *
  */
 public class OSXApplicationBuilder extends AbstractOSXApplicationBuilder<Dmg, SetupBuilder> {
 
     /**
      * Setup this builder.
-     * 
+     *
      * @param task - original task
      * @param setup - original setup
      * @param fileResolver - original fileResolver
@@ -30,7 +30,7 @@ protected OSXApplicationBuilder( Dmg task, SetupBuilder setup, FileResolver file
     /**
      * Create Application from service provided. Also create the preference panel
      * and put it into the application. Will also create the installer wrapper package of this application
-     * 
+     *
      * @param service the service
      * @throws Throwable error.
      */
@@ -42,7 +42,7 @@ void buildService( Service service ) throws Throwable {
         }
 
         System.err.println( "Having executable of: '" + service.getExecutable() + "'" );
-        prepareApplication( service );
+        prepareApplication( service, false );
         finishApplication();
         copyBundleFiles( service );
         new OSXPrefPaneCreator( task, getSetupBuilder(), fileResolver ).create( service );
@@ -53,7 +53,7 @@ void buildService( Service service ) throws Throwable {
 
     /**
      * Create Application from the desktop starter provided
-     * 
+     *
      * @param application - the application
      * @throws Exception on errors
      */
@@ -64,7 +64,7 @@ void buildApplication( DesktopStarter application ) throws Exception {
             application.setExecutable( getSetupBuilder().getAppIdentifier() );
         }
 
-        prepareApplication( application );
+        prepareApplication( application, false );
         setDocumentTypes( application.getDocumentType() );
         finishApplication();
         copyBundleFiles( application );

src/com/inet/gradle/setup/dmg/template/applescript.txt

@@ -1,15 +1,15 @@
 try
     tell application "Finder"
-        
+
         #Prepare centering on screen
         set screenSize to bounds of window of desktop
         set screenWidth to item 3 of screenSize
         set screenHeight to item 4 of screenSize
-        
+
         set windowWidth to {{windowWidth}}
         set windowHeight to {{windowHeight}}
         set iconSize to {{iconSize}}
-        
+
         tell disk "{{displayName}}"
             open
             set current view of container window to icon view
@@ -30,22 +30,22 @@ try
             set ourXPos to (windowWidth - 2.0 * iconSize) / 3.0 + iconSize / 3.0
             set appXPos to windowWidth - ourXPos
             set yPos to (windowHeight - iconSize) / 3.0 * 2.0
-            
-			try
-            	set position of item "{{executable}}.app" of container window to {ourXPos, yPos}
-            	make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
-            	set position of item "Applications" of container window to {appXPos, yPos}
+
+            try
+                set position of item "{{executable}}.app" of container window to {ourXPos, yPos}
+                make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
+                set position of item "Applications" of container window to {appXPos, yPos}
             end try
-            
+
             try
-				set ourXPos to windowWidth / 2.0
-				set position of item "{{executable}}.pkg" of container window to {ourXPos, yPos}
-			end try
-            
+                set ourXPos to windowWidth / 2.0
+                set position of item "{{executable}}.pkg" of container window to {ourXPos, yPos}
+            end try
+
             try
-				set background picture of theViewOptions to file ".resources:background{{backgroundExt}}"
-			end try
-			
+                set background picture of theViewOptions to file ".resources:background{{backgroundExt}}"
+            end try
+
             update without registering applications
             close
             open