From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 26 Feb 2018 10:13:30 +0000 (+0000)
Subject: Merge branch 'feature/JAL-984splitAdjuster' into releases/Release_2_10_4_Branch
X-Git-Tag: Release_2_10_4~56
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=783c351b9a8aed11ea41c9db193e8ae3be20b017;hp=-c;p=jalview.git

Merge branch 'feature/JAL-984splitAdjuster' into releases/Release_2_10_4_Branch
---

783c351b9a8aed11ea41c9db193e8ae3be20b017
diff --combined build.xml
index e9e6f6f,ef3d297..7303674
--- a/build.xml
+++ b/build.xml
@@@ -17,9 -17,7 +17,9 @@@
   * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
   * The Jalview Authors are detailed in the 'AUTHORS' file.
  -->
 -<project name="jalviewX" default="usage" basedir=".">
 +<project name="jalviewX" default="usage" basedir="."
 + xmlns:if="ant:if"
 +    xmlns:unless="ant:unless">
    <target name="help" depends="usage" />
    <target name="usage" depends="init">
      <echo message="~~~Jalview Ant build.xml Usage~~~~" />
@@@ -98,10 -96,6 +98,10 @@@
  
      <!-- default TestNG groups to run -->
      <property name="testng-groups" value="Functional" />
 +    <!-- Java 9 JVM args -->
 +    <condition property="java9">
 +      <equals arg1="${ant.java.version}" arg2="9"/>
 +    </condition>
  
      <!-- Don't change anything below here unless you know what you are doing! -->
      <!-- Url path for WebStart in JNLP file -->
@@@ -304,8 -298,6 +304,8 @@@
          <pathelement location="${testOutputDir}" />
          <path refid="test.classpath" />
        </classpath>
 +      <jvmarg value="--add-modules=java.se.ee" if:set="java9"/>
 +      <jvmarg value="--illegal-access=warn" if:set="java9"/>
        <classfileset dir="${testOutputDir}" includes="**/*.class" />
      </testng>
    </target>
@@@ -439,14 -431,13 +439,14 @@@
              <exclude name="jalview.jar" />
              <include name="*.jar" />
              <include name="*_*.jar" />
 -            <exclude name="*jnilib.jar" />
 +            <exclude name="*quaqua*.jar" />
            </fileset>
            <property name="jalview.version" value="${JALVIEW_VERSION}" />
          </resources>
          <resources os="Mac OS X">
            <fileset dir="${packageDir}">
 -            <include name="*quaqua*.jnilib.jar" />
 +          	 <include name="quaqua-filechooser-only-8.0.jar"/>
 +            <include name="*quaqua64*.jnilib.jar" />
            </fileset>
          </resources>
  
@@@ -590,7 -581,6 +590,6 @@@
  </target>
  
  <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
-   <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif" />
    <copy file="${resourceDir}/images/link.gif" toFile="${outputDir}/images/link.gif" />
    <copy todir="${outputDir}/lang">
      <fileset dir="${resourceDir}/lang">
@@@ -608,7 -598,6 +607,6 @@@
        <include name="MCview/**" />
        <include name="jalview/**" />
        <include name=".build_properties" />
-       <include name="images/idwidth.gif" />
        <include name="images/link.gif" />
        <include name="lang/**" />
      </fileset>