From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 29 Mar 2019 09:54:49 +0000 (+0000)
Subject: JAL-3111 Disable the pubapplet target in build.xml so cruisecontrol build can complete
X-Git-Tag: Release_2_11_0~17^2~23^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=926e9f38ae70c3e01422190ede2d808ecc8d9d39;p=jalview.git

JAL-3111 Disable the pubapplet target in build.xml so cruisecontrol build can complete
---

diff --git a/build.xml b/build.xml
index 9cd966c..d8d4465 100755
--- a/build.xml
+++ b/build.xml
@@ -974,8 +974,9 @@
 </target>
 
 <target name="signApplet" description="internal target to sign applet" depends="-signappletnotsa,-signapplettsa" />
+<target name="pubapplet" description="Dummy target to keep legacy Jalview build system happy. We don't actually publish the applet anymore."/>
 
-<target name="pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
+<target name="_pubapplet" description="installs the jalviewLite applet and dependent jars into an applet examples directory built under ${outputDir}" depends="makeApplet, signApplet">
 
   <!-- bizarre bug causes JmolApplet to always get signed, even if excluded from above. so copy explicitly -->
   <copy file="appletlib/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}" overwrite="true" />
diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 8670917..c48ddef 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -2685,6 +2685,110 @@ and any path to a file to save to the file]]></string>
 						</object>
 					</method>
 					<method name="addElement">
+						<object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="1899e36efeefab93">
+							<property name="belongsToUninstallPhase">
+								<boolean>false</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+							<property name="unixPermissions">
+								<string><![CDATA[664]]></string>
+							</property>
+							<property name="sourceName">
+								<string><![CDATA[jetty-servlet-9.2.10.v20150310.jar]]></string>
+							</property>
+							<property name="overrideUnixPermissions">
+								<boolean>false</boolean>
+							</property>
+							<property name="sourcePath">
+								<string><![CDATA[/homes/cruisecontrol/jalview/lib/]]></string>
+							</property>
+							<property name="shouldUninstall">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="destinationName">
+								<string><![CDATA[jetty-servlet-9.2.10.v20150310.jar]]></string>
+							</property>
+							<property name="fileSize">
+								<long>356253</long>
+							</property>
+							<property name="macBinary">
+								<boolean>false</boolean>
+							</property>
+							<property name="targetCheckKind">
+								<int>0</int>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+						</object>
+					</method>
+					<method name="addElement">
+						<object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="1899d6efeefab93">
+							<property name="belongsToUninstallPhase">
+								<boolean>false</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+							<property name="unixPermissions">
+								<string><![CDATA[664]]></string>
+							</property>
+							<property name="sourceName">
+								<string><![CDATA[jetty-security-9.2.10.v20150310.jar]]></string>
+							</property>
+							<property name="overrideUnixPermissions">
+								<boolean>false</boolean>
+							</property>
+							<property name="sourcePath">
+								<string><![CDATA[/homes/cruisecontrol/jalview/lib/]]></string>
+							</property>
+							<property name="shouldUninstall">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="destinationName">
+								<string><![CDATA[jetty-security-9.2.10.v20150310.jar]]></string>
+							</property>
+							<property name="fileSize">
+								<long>356253</long>
+							</property>
+							<property name="macBinary">
+								<boolean>false</boolean>
+							</property>
+							<property name="targetCheckKind">
+								<int>0</int>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+						</object>
+					</method>
+					<method name="addElement">
 						<object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="1000ddddfab93">
 							<property name="belongsToUninstallPhase">
 								<boolean>false</boolean>
@@ -7426,6 +7530,9 @@ and any path to a file to read from that file]]></string>
 										<object refID="18936efeefab93"/>
 										<object refID="b10a3"/>
 										<object refID="b10a30"/>
+										<object refID="1899e36efeefab93"/>
+										<object refID="1899d6efeefab93"/>
+
 										<object class="com.zerog.ia.installer.actions.InstallFile" objectID="f44fc5b2aba1">
 											<property name="belongsToUninstallPhase">
 												<boolean>false</boolean>