- CHG: Updated the Ant build script so that the path to Install4j is …

…now a property.

- NEW: Added a build.properties template.
- BUG: Fixed a small typo in the new F1 generator. Refs #9.
- NEW: Updated the installer so that it will create the F1 generator .exe/.sh file.
- CHG: Removed files related to running Flapjack via Java Web Start.

build.properties.template

@@ -0,0 +1,13 @@
+# Path to the extra Ant tasks defined for Install4j
+# Windows paths need a double backspace
+install4j.ant.path = C:\\Program Files\\Install4j\\bin\\ant.jar
+
+# Password required for key signing with Install4j
+keystore.password =
+keystore.tokencfg =
+
+# Tomcat information if deploying Flapjack's web services
+tomcat.manager.url = 
+tomcat.manager.username =
+tomcat.manager.password =
+tomcat.manager.app =

build.xml

@@ -39,7 +39,8 @@
 		<javac srcdir="${src}" destdir="${cls}" source="8" target="8" debug="true" includeantruntime="false">
 			<classpath refid="project.classpath"/>
 			<!-- To use the bit below (for JDK9), replace MINUSMINUS with those two characters that aren't allowed in XML comments -->
-			<!-- <compilerarg line="MINUSMINUSadd-modules java.xml.bind -Xlint:deprecation" />-->
+			<!--<compilerarg line="MINUSMINUSadd-modules java.xml.bind -Xlint:deprecation" />-->
+			<!--<compilerarg line="-Xlint:deprecation" />-->
 		</javac>
 	</target>
 
@@ -74,9 +75,11 @@
 	</target>
 
 	<target name="install4j" depends="getversion, jar">
+	<echo message="${install4j.antpath}"/>
+
 		<taskdef name="install4j"
 			classname="com.install4j.Install4JTask"
-			classpath="/opt/install4j7/bin/ant.jar"/>
+			classpath="${install4j.antpath}"/>
 
 		<delete>
 			<fileset dir="installer" includes="**/*.rpm"/>
@@ -92,31 +95,6 @@
 			macKeystorePassword="${keystore.password}"/>
 	</target>
 
-    <target name="jnlp" depends="getversion, jar">
-		<mkdir dir="${tmp}"/>
-		<copy todir="${tmp}">
-			<fileset dir="${lib}">
-        		<exclude name="**/lib-devel/**"/>
-				<exclude name="**/lib-servlet/**"/>
-        	</fileset>
-		</copy>
-		<apply executable="jarsigner">
-			<arg line="-keystore NONE"/>
-			<arg line="-storepass ${keystore.password}"/>
-			<arg line="-tsa http://timestamp.globalsign.com/scripts/timstamp.dll"/>
-			<arg line="-storetype PKCS11"/>
-			<arg line="-providerClass sun.security.pkcs11.SunPKCS11"/>
-			<arg line="-providerArg ${keystore.tokencfg}"/>
-			<srcfile/>
-			<arg value="te-0af9da4e-0c7e-4806-9449-9ec946169587"/>
-			<fileset dir="${tmp}"/>
-		</apply>
-		<copy todir="\\ics\root\var\www\sites\bioinf.hutton.ac.uk\html\flapjack\webstart">
-			<fileset dir="${tmp}"/>
-		</copy>
-		<delete dir="${tmp}"/>
-	</target>
-
 	<target name="war" depends="jar">
 		<copy todir="${tmp}" flatten="true">
 			<fileset dir="${lib}">

installer/flapjack.install4j

@@ -313,6 +313,40 @@
         <file path="../res/icons/flapjack.png" />
       </iconImageFiles>
     </launcher>
+    <launcher name="createf1" id="2303" customizedId="" external="false" excludeFromMenu="true" unixMode="755" unixAutoStart="true" menuName="" icnsFile="../res/icons/flapjack.icns" customMacBundleIdentifier="false" macBundleIdentifier="" swtApp="false" fileset="" macBundleBinary="JavaApplicationStub" addMacEntitlements="false" macEntitlementsFile="" useCustomMacosExecutableName="false" customMacosExecutableName="" useJavaMinVersionOverride="false" javaMinVersionOverride="" useJavaMaxVersionOverride="false" javaMaxVersionOverride="" checkUpdater="false" updateExecutionMode="unattendedProgress" unattendedUpdateTitle="${i18n:updater.WindowTitle(&quot;${compiler:sys.fullName}&quot;)}">
+      <executable name="createf1" type="1" iconSet="false" iconFile="" executableDir="cmd" redirectStderr="false" stderrFile="output.log" stderrMode="overwrite" redirectStdout="false" stdoutFile="output.log" stdoutMode="overwrite" failOnStderrOutput="true" executableMode="2" changeWorkingDirectory="false" workingDirectory="." singleInstance="false" serviceStartType="2" serviceDependencies="" serviceDescription="" jreLocation="" executionLevel="asInvoker" checkConsoleParameter="false" globalSingleInstance="false" singleInstanceActivate="true" dpiAware="false">
+        <versionInfo include="false" fileVersion="" fileDescription="" legalCopyright="" internalName="" productName="" />
+      </executable>
+      <splashScreen show="false" width="0" height="0" bitmapFile="" textOverlay="false">
+        <text>
+          <statusLine x="20" y="20" text="" fontSize="8" fontColor="0,0,0" bold="false" />
+          <versionLine x="20" y="40" text="version ${compiler:sys.version}" fontSize="8" fontColor="0,0,0" bold="false" />
+        </text>
+      </splashScreen>
+      <java mainClass="jhi.flapjack.io.cmd.GenerateExpectedF1s" mainMode="1" vmParameters="-Xmx2048m" arguments="" allowVMPassthroughParameters="false" preferredVM="" bundleRuntime="true">
+        <classPath>
+          <archive location="lib/flapjack.jar" failOnError="false" />
+        </classPath>
+        <modulePath />
+        <nativeLibraryDirectories />
+        <vmOptions />
+      </java>
+      <includedFiles />
+      <unextractableFiles />
+      <vmOptionsFile mode="none" overwriteMode="0" fileMode="644">
+        <content />
+      </vmOptionsFile>
+      <customScript mode="1" file="">
+        <content />
+      </customScript>
+      <infoPlist mode="1" file="">
+        <content />
+      </infoPlist>
+      <iconImageFiles>
+        <file path="../res/icons/flapjack.png" />
+        <file path="../res/icons/flapjack.png" />
+      </iconImageFiles>
+    </launcher>
   </launchers>
   <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="" useAutoUpdateBaseUrl="false" autoUpdateBaseUrl="">
     <staticMembers script="" />

src/jhi/flapjack/io/cmd/GenerateExpectedF1s.java

@@ -56,7 +56,7 @@ public static void main(String[] args)
 		}
 		catch (Exception e)
 		{
-			options.printHelp("GenerateExpectdF1s");
+			options.printHelp("GenerateExpectedF1s");
 			System.exit(1);
 		}
 	}