3adaa3f
<project name="Jmol" default="main" basedir=".">
3adaa3f
  
3adaa3f
      DocumentId  $Id$
3adaa3f
  -->
3adaa3f
	
3adaa3f
  
3adaa3f
	
3adaa3f
  
3adaa3f
  
3adaa3f
  <taskdef resource="net/sf/antcontrib/antlib.xml">
3adaa3f
    <classpath>
3adaa3f
      <pathelement location="tools/ant-contrib.jar" />
3adaa3f
    </classpath>
3adaa3f
  </taskdef>
3adaa3f
3adaa3f
	
3adaa3f
  
3adaa3f
  <property file="${user.home}/.jmol.build.properties" />
3adaa3f
  
3adaa3f
  <property name="build.sysclasspath" value="ignore" />
3adaa3f
  <property name="build.compiler" value="javac1.7" />
3adaa3f
  
3adaa3f
       property as the value of the source parameter -->
3adaa3f
  <property name="java.version" value="1.7" />
3adaa3f
  <property name="debug" value="on" />
3adaa3f
  <property name="deprecation" value="off" />
3adaa3f
  <property name="optimization" value="off" />
3adaa3f
	<copy todir="" >
3adaa3f
	  <fileset dir="src/org/jmol/viewer/">
3adaa3f
	    <include name="Jmol.properties" />
3adaa3f
	  </fileset>
3adaa3f
	  <filterchain>
3adaa3f
	    <striplinecomments>
3adaa3f
	      <comment value="#" />
3adaa3f
	    </striplinecomments>
3adaa3f
	    <linecontains>
3adaa3f
	      <contains value="Jmol.___" />
3adaa3f
	    </linecontains>
3adaa3f
	  </filterchain>
3adaa3f
	</copy>
3adaa3f
  <property file="Jmol.properties" prefix="Jmol.properties" />
3adaa3f
  <property name="version" value="${Jmol.properties.Jmol.___JmolVersion}" />
3adaa3f
  
3adaa3f
  			  override = "true"
3adaa3f
	          input="${version}"
3adaa3f
  			  regexp='(")([^"]+)(")'
3adaa3f
	          select="\2"
3adaa3f
  		      global="true"
3adaa3f
	          />
3adaa3f
  <echo message="version=${version}" />
3adaa3f
  <property name="jvxl_version" value="0.1" />
3adaa3f
3adaa3f
  <input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />
3adaa3f
  <if><available file="${Private.propertyFile}" /><then>
3adaa3f
  	<property file="${Private.propertyFile}" />
3adaa3f
	<echo>using ${Private.keystore} ${Private.storetype}</echo>
3adaa3f
  </then></if>
3adaa3f
  <property name="tests.source.dir" value="source-tests" />
3adaa3f
  <property name="lib.dir" value="jars" />
3adaa3f
  <property name="plugin.dir" value="plugin-jars" />
3adaa3f
  <property name="appjars.dir" value="build/appjars" />
3adaa3f
  <property name="classes.dir" value="build/classes" />
3adaa3f
  <property name="test-classes.dir" value="build/test-classes" />
3adaa3f
  
3adaa3f
  <property name="apisio.classes.dir" value="build/apisio-classes" />
3adaa3f
  <property name="tests.dir" value="build/unit.tests" />
3adaa3f
  <property name="javadoc.dir" value="build/javadoc" />
3adaa3f
  
3adaa3f
  <property name="docbook-xsl" value="docbook-xsl-1.76.1" />
3adaa3f
  <property name="docbook-xml" value="docbook-xml-4.4" />
3adaa3f
  <property name="naga.jar" value="naga-3_0.jar" />
3adaa3f
  <property name="commons-cli.jar" value="commons-cli-1.2.jar" />
3adaa3f
  <property name="inchi.jar" value="jni-inchi-0.7-jar-with-dependencies.jar" />
3adaa3f
  <property name="saxon.jar" value="saxon.jar" />
3adaa3f
  <property name="saxon.main" value="com.icl.saxon.StyleSheet" />
3adaa3f
  <property name="selfsign.store" value="ca-cert/selfSignedCertificate/selfSignedCertificate.store" />
3adaa3f
  <property name="selfsign.storetype" value="jks" />
3adaa3f
  <property name="selfsign.storepass" value="selfSignedCertificate" />
3adaa3f
  <property name="selfsign.alias" value="selfSignedCertificate" />
3adaa3f
  <property name="tsa.url" value="http://timestamp.globalsign.com/scripts/timestamp.dll" />
3adaa3f
	  
3adaa3f
	
3adaa3f
	
3adaa3f
3adaa3f
3adaa3f
	
3adaa3f
  <property name="keystore.name" value="Must be set by user." />
3adaa3f
3adaa3f
  
3adaa3f
  <property name="ikvm.home" value="Must be set by user." />
3adaa3f
	
3adaa3f
  <property file="proxy.properties" />
3adaa3f
3adaa3f
  <import file="tools/build-i18n.xml"/>
3adaa3f
3adaa3f
  <path id="project.class.path">
3adaa3f
    <fileset dir="${lib.dir}">
3adaa3f
      <include name="*.jar" />
3adaa3f
    </fileset>
3adaa3f
  </path>
3adaa3f
  
3adaa3f
  
3adaa3f
    <fileset dir="${lib.dir}">
3adaa3f
      <include name="*.jar" />
3adaa3f
    </fileset>
3adaa3f
  </path> -->
3adaa3f
  
3adaa3f
  <path id="apisio-project.class.path">
3adaa3f
    <fileset dir="${lib.dir}">
3adaa3f
      
3adaa3f
      
3adaa3f
      <include name="gnujaxp.jar" />
3adaa3f
    </fileset>
3adaa3f
  </path>
3adaa3f
3adaa3f
	
3adaa3f
	
3adaa3f
  <property name="sendAll"         value="true" />
3adaa3f
  <property name="sendZip"         value="true" />
3adaa3f
  <property name="dist.dir"        value="build/dist" />
3adaa3f
  <property name="src.dir"         value="src" />
3adaa3f
  <property name="temp.dir"        value="build/release" />
3adaa3f
  <property name="web.dir"         value="/home/frs/project/j/jm/jmol" />
3adaa3f
  <property name="web.host"        value="frs.sourceforge.net" /> 
3adaa3f
  <property name="prefix.release"  value="Jmol " />
3adaa3f
3adaa3f
  <echo message="${dist.dir}" />
3adaa3f
		
3adaa3f
  <property file="${dist.dir}/Jmol.properties" prefix="Jmol.properties" />
3adaa3f
  <property name="version" value="${Jmol.properties.Jmol.___JmolVersion}" />
3adaa3f
  
3adaa3f
	  override = "true"
3adaa3f
	  input="${version}"
3adaa3f
	  regexp='(")([^"]+)(")'
3adaa3f
  	  select="\2"
3adaa3f
      global="true"
3adaa3f
  />
3adaa3f
  <echo message="version=${version}" />
3adaa3f
3adaa3f
	<loadresource property="versionMajorMinor">
3adaa3f
	  <string value="${version}"/>
3adaa3f
	  <filterchain>
3adaa3f
	    <tokenfilter>
3adaa3f
		      <replaceregex pattern="([0-9]+[.][0-9]+)(.*)" replace="\1"/>
3adaa3f
	    </tokenfilter>
3adaa3f
	  </filterchain>
3adaa3f
	</loadresource>
3adaa3f
	<echo message="versionMajorMinor: ${versionMajorMinor}"/>
3adaa3f
	
3adaa3f
	<loadresource property="versionMajorMinorPatch">
3adaa3f
	  <string value="${version}"/>
3adaa3f
	  <filterchain>
3adaa3f
	    <tokenfilter>
3adaa3f
		      <replaceregex pattern="([^-]*)(-beta)(.*)" replace="\1"/>
3adaa3f
	    </tokenfilter>
3adaa3f
	  </filterchain>
3adaa3f
	</loadresource>
3adaa3f
	<echo message="versionMajorMinorPatch: ${versionMajorMinorPatch}"/>
3adaa3f
3adaa3f
		<loadresource property="betaFlag">
3adaa3f
	  <string value="${version}"/>
3adaa3f
	  <filterchain>
3adaa3f
	    <tokenfilter>
3adaa3f
	      <replaceregex pattern="([^-]*)(-beta)(.*)" replace="\2"/>
3adaa3f
	    </tokenfilter>
3adaa3f
	  </filterchain>
3adaa3f
	</loadresource>
3adaa3f
	<property name="pathdir-full" value="Jmol/Version" />
3adaa3f
  	<if>
3adaa3f
     <equals arg1="${betaFlag}" arg2="${version}" />
3adaa3f
  	 <then>
3adaa3f
  		<property name="pathdir"    value="${pathdir-full}" />
3adaa3f
    </then>
3adaa3f
  	<else>
3adaa3f
  		<property name="pathdir"    value="Jmol-beta/Jmol" />
3adaa3f
  	</else>
3adaa3f
  	</if>
3adaa3f
	<echo message="betaFlag: ${betaFlag}"/>
3adaa3f
3adaa3f
	<property name="path.release"    value="${pathdir} ${versionMajorMinor}" />
3adaa3f
	<echo message="path.release: ${path.release}"/>
3adaa3f
3adaa3f
3adaa3f
	
3adaa3f
  <target name="deploy" >
3adaa3f
3adaa3f
  	
3adaa3f
    
3adaa3f
    
3adaa3f
      message="Destination Path for ${version} (clear to exit)"
3adaa3f
      defaultvalue="${path.release}/${prefix.release}${versionMajorMinorPatch}"
3adaa3f
      addproperty="uploadPath"
3adaa3f
    />
3adaa3f
 -->
3adaa3f
3adaa3f
  	
3adaa3f
  	
3adaa3f
      message="Filepath  ${uploadPath0} ?"
3adaa3f
      validargs="y,n"
3adaa3f
      defaultvalue="y"
3adaa3f
      addproperty="do.scp"
3adaa3f
    />
3adaa3f
    <condition property="do.abort">
3adaa3f
      <equals arg1="n" arg2="${do.scp}"/>
3adaa3f
    </condition>
3adaa3f
    <fail if="do.abort">Build aborted by user.</fail>
3adaa3f
-->
3adaa3f
    
3adaa3f
    
3adaa3f
      message="Please enter your username."
3adaa3f
      addproperty="ssh.user"
3adaa3f
    />
3adaa3f
3adaa3f
	
3adaa3f
    
3adaa3f
      message="Please enter your password."
3adaa3f
      addproperty="ssh.password"
3adaa3f
    />
3adaa3f
3adaa3f
-->
3adaa3f
3adaa3f
    
3adaa3f
    
3adaa3f
    this is the part that changed at SourceForge and no longer works. 
3adaa3f
    BH 2023.11.16
3adaa3f
  	
3adaa3f
  	<if>
3adaa3f
     <equals arg1="${sendAll}" arg2="true" />
3adaa3f
  	 <then>
3adaa3f
    <echo message="Copying binary.zip to ${web.dir}" level="info"/>
3adaa3f
    
3adaa3f
         trust="yes" failonerror="true" verbose="true">
3adaa3f
      <fileset dir="${temp.dir}">
3adaa3f
        <include name="**/*.zip"/>
3adaa3f
        <include name="**/*.properties"/>
3adaa3f
      </fileset>
3adaa3f
    </scp>
3adaa3f
    <echo message="Copying binary.tar.gz to ${web.dir}" level="info"/>
3adaa3f
    
3adaa3f
         trust="yes" failonerror="true" verbose="true">
3adaa3f
      <fileset dir="${temp.dir}">
3adaa3f
        <include name="**/*-binary.tar.gz"/>
3adaa3f
      </fileset>
3adaa3f
    </scp>
3adaa3f
  	    </then>
3adaa3f
  	  	</if>
3adaa3f
3adaa3f
3adaa3f
  	  	
3adaa3f
    <echo message="Copying full.tar.gz to ${web.dir}" level="info"/>
3adaa3f
    
3adaa3f
         trust="yes" failonerror="true" verbose="true">
3adaa3f
      <fileset dir="${temp.dir}">
3adaa3f
        <include name="**/*-full.tar.gz"/>
3adaa3f
      </fileset>
3adaa3f
    </scp>
3adaa3f
3adaa3f
    	-->
3adaa3f
  	
3adaa3f
    <delete dir="${temp.dir}"/>
3adaa3f
  </target>
3adaa3f
3adaa3f
	
3adaa3f
	
3adaa3f
	
3adaa3f
  <target name="main" id="main" depends="init,jar" /> 
3adaa3f
  
3adaa3f
  <target name="all" id="all" depends="main"/> 
3adaa3f
3adaa3f
  <target name="init" id="init">
3adaa3f
    <tstamp/>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="initFailure" id="initFailure">
3adaa3f
    <fail message="Init failed. See messages above." />
3adaa3f
  </target>
3adaa3f
3adaa3f
 
3adaa3f
  	
3adaa3f
  <target name="setup" id="setup">
3adaa3f
    <condition property="docbook-xsl.uptodate">
3adaa3f
      <and>
3adaa3f
        
3adaa3f
                  srcfile="doc/${docbook-xsl}.tar.gz" />
3adaa3f
        
3adaa3f
                  srcfile="build/${docbook-xsl}" />
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
3adaa3f
    <condition property="docbook-xml.uptodate">
3adaa3f
      <and>
3adaa3f
        
3adaa3f
                  srcfile="doc/${docbook-xml}.zip" />
3adaa3f
        
3adaa3f
                  srcfile="build/docbook-xml" />
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
3adaa3f
    <condition property="jmolGuide.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="build/doc/JmolUserGuide/index.html">
3adaa3f
          
3adaa3f
                    includes="JmolGuide.docbook.xml, guide/*.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolUserGuide_fr/index.html">
3adaa3f
          
3adaa3f
                    includes="JmolGuide_fr.docbook.xml, guide/*_fr.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
3adaa3f
    <condition property="jmolHistory.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="build/doc/JmolHistory/ChangeLog.html">
3adaa3f
          
3adaa3f
                    includes="JmolHistory.xml,JmolHistoryToHtml.xsl,history/changes.xml" />
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_fr.html">
3adaa3f
          
3adaa3f
                    includes="JmolHistory_fr.xml,JmolHistoryToHtml.xsl,history/changes_fr.xml" />
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_nl.html">
3adaa3f
          
3adaa3f
                    includes="JmolHistory_nl.xml,JmolHistoryToHtml.xsl,history/changes_nl.xml" />
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolHistory/ChangeLog_ro.html">
3adaa3f
          
3adaa3f
                    includes="JmolHistory_ro.xml,JmolHistoryToHtml.xsl,history/changes_ro.xml" />
3adaa3f
        </uptodate>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
    
3adaa3f
    <condition property="jmolDevelopersGuide.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="build/doc/JmolDevelopersGuide.html">
3adaa3f
          
3adaa3f
                    includes="JmolDevelopersGuide.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolDevelopersGuide_fr.html">
3adaa3f
          
3adaa3f
                    includes="JmolDevelopersGuide_fr.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolDevelopersGuide_de.html">
3adaa3f
          
3adaa3f
                    includes="JmolDevelopersGuide_de.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
3adaa3f
    <condition property="jmolAppletGuide.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="build/doc/JmolAppletGuide.html">
3adaa3f
          
3adaa3f
                    includes="JmolAppletGuide.docbook.xml, applet/*.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolAppletGuide_fr.html">
3adaa3f
          
3adaa3f
                    includes="JmolAppletGuide_fr.docbook.xml, applet/*_fr.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
        <uptodate targetfile="build/doc/JmolAppletGuide_de.html">
3adaa3f
          
3adaa3f
                    includes="JmolAppletGuide_de.docbook.xml"/>
3adaa3f
        </uptodate>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
3adaa3f
    
3adaa3f
               classpath="${lib.dir}/${saxon.jar}"
3adaa3f
               property="xsl.available"/>
3adaa3f
    <uptodate property="javadoc.uptodate" targetfile="${javadoc.dir}/index.html">
3adaa3f
      <srcfiles dir="src" includes="**/*.java, **/*.html" />
3adaa3f
    </uptodate>
3adaa3f
    <available file="${keystore.name}" property="keystore.present" />
3adaa3f
    < !  - - Optional proxy settings (if defined) - -  >
3adaa3f
    
3adaa3f
               value="-Dhttp.proxyHost=${http.proxyHost}" >
3adaa3f
      <not>
3adaa3f
        <equals arg1="http.proxyHost" arg2="" />
3adaa3f
      </not>
3adaa3f
    </condition>
3adaa3f
    
3adaa3f
               value="-Dhttp.proxyPort=${http.proxyPort}" >
3adaa3f
      <not>
3adaa3f
        <equals arg1="http.proxyPort" arg2="" />
3adaa3f
      </not>
3adaa3f
    </condition>
3adaa3f
  </target>
3adaa3f
  
3adaa3f
  -->
3adaa3f
3adaa3f
  <target id="classes" name="classes" depends="init">
3adaa3f
    <mkdir dir="${classes.dir}"/>
3adaa3f
    
3adaa3f
           debug="${debug}" deprecation="${deprecation}"
3adaa3f
           optimize="${optimization}" source="1.7" target="1.7">
3adaa3f
      <classpath refid="project.class.path" />
3adaa3f
      <exclude name="astex/**/*.java"/>
3adaa3f
      <exclude name="java_cup/**/*.java"/>
3adaa3f
    </javac>
3adaa3f
    <copy todir="${classes.dir}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="**/license.txt" />
3adaa3f
        <include name="**/*.jpg" />
3adaa3f
        <include name="**/*.gif" />
3adaa3f
        <include name="**/*.po" />
3adaa3f
      	<include name="**/*.png" />
3adaa3f
        <include name="**/*.html" />
3adaa3f
        <include name="**/*.js" />
3adaa3f
        <include name="**/*.dtd" />
3adaa3f
        <include name="**/*.properties" />
3adaa3f
        <include name="**/Properties/*" />
3adaa3f
        
3adaa3f
             comment out the 2 lines above and uncomment the following 3 lines -->
3adaa3f
        
3adaa3f
        <include name="**/JmolPop*.properties" />
3adaa3f
        <include name="**/Properties/Jmol.properties" />
3adaa3f
        <include name="**/Properties/Jmol-resources.properties" />
3adaa3f
        -->
3adaa3f
        <include name="**/Data/*" />
3adaa3f
        <include name="**/*.txt" />
3adaa3f
        <include name="**/*.json" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy file="Jmol.properties" tofile="${classes.dir}/org/jmol/viewer/Jmol.properties" />
3adaa3f
  </target>
3adaa3f
  
3adaa3f
    
3adaa3f
3adaa3f
  <target name="applet-classes" id="applet-classes" depends="init">
3adaa3f
    <mkdir dir="${applet.classes.dir}"/>
3adaa3f
    <copy todir="${applet.classes.dir}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="org/jmol/modelkit/images/*" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
  	
3adaa3f
3adaa3f
bh 20220215  changed to 1.7, 1.7
3adaa3f
bh 20131124  changed to 1.6, 1.6
3adaa3f
  	
3adaa3f
mth 20040713 ... with the Sun Java 1.5 compiler the default
3adaa3f
         source code version is 1.5. And one cannot generate code for
3adaa3f
         a 1.1 virtual machine from 1.5 source. Therefore, in order to
3adaa3f
         compile for the 1.1 jvm, we need to specify that the source
3adaa3f
         version is 1.3. (Note that we cannot use source=1.4 because
3adaa3f
         of assertions)
3adaa3f
3adaa3f
miguel 20041121
3adaa3f
I do not know recall exactly what I meant by the statement
3adaa3f
in (parentheses) above. I *think* that what I was saying
3adaa3f
is that if you say 'source=1.4' then one also cannot
3adaa3f
generate code for a 1.1 jvm, because of the special
3adaa3f
support for assertions (which were introduced in 1.4). 
3adaa3f
3adaa3f
bob 2010.02.01
3adaa3f
3adaa3f
changed    source="1.3" target="1.1"
3adaa3f
     to    source="1.4" target="1.4"
3adaa3f
           
3adaa3f
bob 2010.04.29
3adaa3f
3adaa3f
in order to allow for faster BitSet methods
3adaa3f
3adaa3f
changed    source="1.4" target="1.4"
3adaa3f
     to    source="1.5" target="1.5"
3adaa3f
     
3adaa3f
bob 2010.05.19
3adaa3f
3adaa3f
changed just the applet classes back to:
3adaa3f
3adaa3f
           source="1.4" target="1.4"
3adaa3f
           
3adaa3f
all support for previous versions removed
3adaa3f
3adaa3f
    <property name="build.compiler" value="javac1.7" />
3adaa3f
    
3adaa3f
           debug="${debug}" deprecation="${deprecation}"
3adaa3f
           optimize="${optimization}"
3adaa3f
           source="1.7" target="1.7" encoding="UTF8"
3adaa3f
           includesfile="applet.classes"
3adaa3f
           classpathref="applet-project.class.path" />
3adaa3f
3adaa3f
    <copy todir="${applet.classes.dir}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="org/jmol/minimize/forcefield/data/*.txt" />
3adaa3f
        <include name="jmol75x29x8.gif" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy todir="${applet.classes.dir}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="org/jmol/quantum/*.txt" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy file="Jmol.properties" tofile="${applet.classes.dir}/org/jmol/viewer/Jmol.properties" />
3adaa3f
    <copy todir="${applet.classes.dir}" >
3adaa3f
      <fileset dir="${classes.dir}">
3adaa3f
        <include name="**/JmolApplet/*/*.class" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="**/license.txt" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="apisio-classes" id="apisio-classes" depends="init">
3adaa3f
    <mkdir dir="${apisio.classes.dir}"/>
3adaa3f
    
3adaa3f
           debug="${debug}" deprecation="${deprecation}"
3adaa3f
           optimize="${optimization}" source="1.7" encoding="UTF8"
3adaa3f
           includesfile="apisio.classes"
3adaa3f
           classpathref="apisio-project.class.path" />
3adaa3f
    <copy todir="${apisio.classes.dir}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="**/g3d/*.html" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="check.cdkjars" id="check.cdkjars">
3adaa3f
    <condition property="cdkjars.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="${appjars.dir}/org/openscience/cdk">
3adaa3f
          <srcfiles dir="${lib.dir}" includes="jmol2cdk.jar"/>
3adaa3f
        </uptodate>
3adaa3f
        
3adaa3f
                  srcfile="${appjars.dir}/org/openscience/cdk"/>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="check.pluginjars" id="check.pluginjars">
3adaa3f
    <condition property="pluginjars.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="${appjars.dir}/org/openscience/cdkplugin">
3adaa3f
          <srcfiles dir="${plugin.dir}" includes="dirbrowser.jar"/>
3adaa3f
          <srcfiles dir="${plugin.dir}" includes="dadmlbrowser.jar"/>
3adaa3f
        </uptodate>
3adaa3f
        
3adaa3f
                  srcfile="${appjars.dir}/org/openscience/cdkplugin"/>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
  </target>
3adaa3f
3adaa3f
    -->
3adaa3f
3adaa3f
  	<target name="check.libjars" id="check.libjars">
3adaa3f
    <condition property="libjars.uptodate">
3adaa3f
      <and>
3adaa3f
        <uptodate targetfile="${appjars.dir}">
3adaa3f
          <srcfiles dir="${lib.dir}" includes="${naga.jar}"/>
3adaa3f
          <srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/>
3adaa3f
          <srcfiles dir="${lib.dir}" includes="${inchi.jar}"/>
3adaa3f
        </uptodate>
3adaa3f
        
3adaa3f
                  srcfile="${appjars.dir}"/>
3adaa3f
      </and>
3adaa3f
    </condition>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
3adaa3f
  <target name="cdkjars" id="cdkjars" depends="check.cdkjars" unless="cdkjars.uptodate">
3adaa3f
    <delete file="build/cdkjars.timestamp"/>
3adaa3f
    <mkdir dir="${appjars.dir}"/>
3adaa3f
    <unjar dest="${appjars.dir}" src="${lib.dir}/jmol2cdk.jar"/>
3adaa3f
    <touch file="build/cdkjars.timestamp"/>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="pluginjars" id="pluginjars" depends="check.pluginjars" unless="pluginjars.uptodate">
3adaa3f
    <delete file="build/pluginjars.timestamp"/>
3adaa3f
    <mkdir dir="${appjars.dir}"/>
3adaa3f
    <unjar dest="${appjars.dir}" src="${plugin.dir}/dirbrowser.jar"/>
3adaa3f
    <unjar dest="${appjars.dir}" src="${plugin.dir}/dadmlbrowser.jar"/>
3adaa3f
    <touch file="build/pluginjars.timestamp"/>
3adaa3f
  </target -->
3adaa3f
3adaa3f
  <target name="libjars" id="libjars" depends="check.libjars" unless="libjars.uptodate">
3adaa3f
    <delete file="build/libjars.timestamp"/>
3adaa3f
    <mkdir dir="${appjars.dir}"/>
3adaa3f
    
3adaa3f
    
3adaa3f
    
3adaa3f
    <unjar dest="${appjars.dir}" src="${lib.dir}/${naga.jar}"/>
3adaa3f
    <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
3adaa3f
  	<delete dir="${appjars.dir}/javajs" />
3adaa3f
  	<delete dir="${appjars.dir}/org/jmol" />
3adaa3f
  	<delete dir="${appjars.dir}/org/apache/tools" />
3adaa3f
  	<delete dir="${appjars.dir}/META-INF" />
3adaa3f
    <unjar dest="${appjars.dir}" src="${lib.dir}/${inchi.jar}"/>
3adaa3f
  	<move file="${appjars.dir}/META-INF/LICENSE" tofile="${appjars.dir}/META-INF/LICENSE-JNI-INCHI"/>
3adaa3f
  	<delete file="${appjars.dir}/META-INF/MANIFEST.MF" />
3adaa3f
  	
3adaa3f
  	     despite the fact that the org/apache/logging package is not included in Jmol.
3adaa3f
  	     It is added here in case JNI-InChI is ever upgraded to Log4J2 (which requires Java 7+) -->  
3adaa3f
  	<delete file="${appjars.dir}/org/apache/logging/log4j/core/lookup/JndiLookup.class" />
3adaa3f
    <touch file="build/libjars.timestamp"/>
3adaa3f
  </target>
3adaa3f
3adaa3f
    	  
3adaa3f
    	          depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars,main-i18n" -->
3adaa3f
3adaa3f
    	
3adaa3f
    	
3adaa3f
          depends="init,classes,libjars">
3adaa3f
    <if><equals arg1="${Private.propertyFile}" arg2="nojar" />
3adaa3f
    	<then><echo>Skipping jar creation</echo></then><else>
3adaa3f
3adaa3f
  	
3adaa3f
  	<copy todir="${classes.dir}/org/openscience/jmol/Data/guide" >
3adaa3f
      <fileset dir="build/doc/JmolUserGuide">
3adaa3f
        <include name="**/*.html" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy todir="${classes.dir}/org/openscience/jmol/Data/guide_fr" >
3adaa3f
      <fileset dir="build/doc/JmolUserGuide_fr">
3adaa3f
        <include name="**/*.html" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy todir="${classes.dir}/org/openscience/jmol/Data" >
3adaa3f
      <fileset dir="build/doc/JmolHistory">
3adaa3f
        <include name="**/*.html" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    	    <echo message="Creating Jmol.jar -- if this fails, check to see that build/Jmol.jar is not open." />
3adaa3f
    
3adaa3f
         manifest="manifest/application.txt">
3adaa3f
      <fileset dir="${classes.dir}" >
3adaa3f
        <exclude name="**/.*" />
3adaa3f
        <exclude name="**/*.dx" />
3adaa3f
        <exclude name="ant/**" />
3adaa3f
        <include name="com/**" />
3adaa3f
        <include name="net/sf/**" />
3adaa3f
        <include name="javajs/api/**" />
3adaa3f
        <include name="javajs/awt/**" />
3adaa3f
        <include name="javajs/export/**" />
3adaa3f
        <include name="javajs/img/**" />
3adaa3f
        <include name="javajs/util/**" />
3adaa3f
        <include name="jme/**" />
3adaa3f
        <include name="**/jspecview/**" />
3adaa3f
        <include name="**/org/gennbo/**" />
3adaa3f
        <include name="**/org/apache/**" />
3adaa3f
        <include name="**/org/qcschema/**" />
3adaa3f
        <include name="**/jmol/**" />
3adaa3f
        <exclude name="**/Test*.class" />
3adaa3f
        <exclude name="**/jmol/jcamp/**" />
3adaa3f
        <exclude name="**/jmol/applet/*" />
3adaa3f
        <exclude name="**/app/JmolData.class" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="${appjars.dir}" includes="**/*"/>
3adaa3f
    </jar>
3adaa3f
3adaa3f
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name"  value="Jmol.jar" />
3adaa3f
    </antcall>
3adaa3f
  	
3adaa3f
    	    <echo message="Creating JmolData.jar -- if this fails, check to see that build/Jmol.jar is not open." />
3adaa3f
    
3adaa3f
         manifest="manifest/applicationData.txt">
3adaa3f
      <fileset dir="${classes.dir}" >
3adaa3f
        <exclude name="**/Test*.class" />
3adaa3f
        <exclude name="**/jmol/jcamp/**" />
3adaa3f
        <exclude name="**/jmol/applet/*" /> 
3adaa3f
        <exclude name="**/.*" />
3adaa3f
        <exclude name="**/*.dx" />
3adaa3f
        <exclude name="**/Test*.class" />
3adaa3f
        <exclude name="ant/**" />
3adaa3f
        <exclude name="com/**" />
3adaa3f
        <include name="net/sf/**" />
3adaa3f
        <include name="javajs/api/**" />
3adaa3f
        <include name="javajs/awt/**" />
3adaa3f
        <include name="javajs/export/**" />
3adaa3f
        <include name="javajs/img/**" />
3adaa3f
        <include name="javajs/util/**" />
3adaa3f
        <include name="**/jspecview/**" />
3adaa3f
        <include name="**/org/gennbo/**" />
3adaa3f
        <include name="**/org/apache/**" />
3adaa3f
        <include name="**/org/qcschema/**" />
3adaa3f
        <include name="**/jmol/**" />
3adaa3f
        <exclude name="**/jmol/_documents/**" />
3adaa3f
        <exclude name="**/jmol/applet/**" />
3adaa3f
        <exclude name="**/jmol/*js/**" />
3adaa3f
        <exclude name="**/jmol/console/**" />
3adaa3f
        <exclude name="**/jmol/popup/**" />
3adaa3f
        <exclude name="org/jmol/util/BitSet32.class" />
3adaa3f
        <exclude name="**/openscience/jmol/Data/**" />
3adaa3f
        <exclude name="**/openscience/jmol/app/Jmol.class" />
3adaa3f
        <exclude name="**/openscience/jmol/app/images/**" />
3adaa3f
        <exclude name="**/openscience/jmol/app/jmolpanel/**" />
3adaa3f
        <exclude name="**/openscience/jmol/app/webexport/**" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="${appjars.dir}" includes="**/*"/>
3adaa3f
    </jar>
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name"  value="JmolData.jar" />
3adaa3f
    </antcall>
3adaa3f
3adaa3f
    <copy todir="build">
3adaa3f
      <fileset dir=".">
3adaa3f
        <include name="jmol" />
3adaa3f
        <include name="jmol.bat" />
3adaa3f
        <include name="jmol.sh" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    
3adaa3f
         manifest="manifest/jvxl.txt">
3adaa3f
      <fileset dir="${classes.dir}" >
3adaa3f
        <exclude name="**/.*" />
3adaa3f
        <exclude name="**/*.dx" />
3adaa3f
        <exclude name="**/Test*.class" />
3adaa3f
        <include name="org/openscience/jvxl/*" />
3adaa3f
        <include name="org/jmol/api/**" />
3adaa3f
        <include name="org/jmol/atomdata/**" />
3adaa3f
        <include name="org/jmol/c/**" />
3adaa3f
        <include name="org/jmol/g3d/**" />
3adaa3f
        <include name="org/jmol/jvxl/**" />
3adaa3f
        <include name="org/jmol/io/**" />
3adaa3f
        <include name="org/jmol/util/**" />
3adaa3f
        <include name="org/jmol/viewer/JmolConstants.class" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="${appjars.dir}" includes="**/*"/>
3adaa3f
    </jar>
3adaa3f
      	
3adaa3f
      	
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name"  value="Jvxl.jar" />
3adaa3f
    </antcall>
3adaa3f
    
3adaa3f
         manifest="manifest/chimetojmol.txt">
3adaa3f
      <fileset dir="${classes.dir}" >
3adaa3f
        <include name="org/openscience/chimetojmol/*" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name" value="ChimeToJmol.jar" />
3adaa3f
    </antcall>
3adaa3f
    -->
3adaa3f
  </else></if>
3adaa3f
  </target>
3adaa3f
3adaa3f
 
3adaa3f
  <target name="apis-jar" id="apis-jar" depends="init,apisio-classes">
3adaa3f
    <jar destfile="jmolApis.jar">
3adaa3f
      <fileset dir="${apisio.classes.dir}" >
3adaa3f
        <include name="org/jmol/api/**" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="." >
3adaa3f
        <include name="LICENSE.txt"/>
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="io-jar" id="io-jar" depends="init,apisio-classes">
3adaa3f
    <jar destfile="jmolIO.jar">
3adaa3f
      <fileset dir="${apisio.classes.dir}" >
3adaa3f
        <include name="org/jmol/adapter/smarter/**" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="." >
3adaa3f
        <include name="LICENSE.txt"/>
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
  
3adaa3f
          depends="applet-classes">
3adaa3f
  <if><equals arg1="${Private.propertyFile}" arg2="none" />
3adaa3f
    	<then><echo>Skipping applet-jar</echo></then><else>
3adaa3f
	
3adaa3f
    <delete dir="build">
3adaa3f
      <include name="JmolApplet*"/>
3adaa3f
    </delete>
3adaa3f
3adaa3f
    <echo message="Creating JmolApplet.jar" />
3adaa3f
    
3adaa3f
         manifest="manifest/appletMonolithic.txt" index="true" >
3adaa3f
      <fileset dir="${applet.classes.dir}" >
3adaa3f
        <include name="**/*" />
3adaa3f
        <exclude name="JmolSmiles*" />
3adaa3f
        <exclude name="org/jmol/dialog/**/*" />
3adaa3f
        <exclude name="org/jmol/export/**/*" />
3adaa3f
        <exclude name="org/jmol/multitouch/**/*" />
3adaa3f
        <exclude name="org/openscience/**/*" />
3adaa3f
        <exclude name="com/sparshui/**/*" />
3adaa3f
        <exclude name="com/json/**/*" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	
3adaa3f
    <echo message="Creating JmolApplet0*.jar" />
3adaa3f
  	
3adaa3f
    <jar destfile="build/JmolApplet0_Image.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/dialog/**" />
3adaa3f
        <include name="org/jmol/image/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/minimize/**/**" />
3adaa3f
        <include name="org/jmol/modelkit/images/**" />
3adaa3f
        <include name="org/jmol/modelkit/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_Navigate.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/navigate/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_Console.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
    	<include name="org/jmol/console/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_JSV.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/jsv/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_Popup.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/popup/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersMolXyz.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/spartan/**" />
3adaa3f
        <include name="org/jmol/adapter/readers/molxyz/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersCif.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/cif/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersPdb.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/pdb/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersQuantum.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/quantum/**" />
3adaa3f
        <include name="org/jmol/quantum/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersPyMOL.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/pymol/**" />
3adaa3f
        <include name="org/jmol/rendercgo/**" />
3adaa3f
        <include name="org/jmol/shapecgo/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersMore.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/more/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersSimple.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/simple/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersXtal.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/xtal/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ReadersXml.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/xml/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolApplet0_ScriptExt.jar" manifest="manifest/applet.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/scriptext/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_ShapeBio.jar" manifest="manifest/applet.txt" >
3adaa3f
	  <fileset dir="${applet.classes.dir}">
3adaa3f
	    <include name="org/jmol/modelsetbio/**" />
3adaa3f
	    <include name="org/jmol/dssx/**" />
3adaa3f
	    <include name="org/jmol/renderbio/**" />
3adaa3f
	    <include name="org/jmol/shapebio/**" />
3adaa3f
	  </fileset>
3adaa3f
	</jar>
3adaa3f
	  	
3adaa3f
  	<jar destfile="build/JmolApplet0_ShapeSpecial.jar" manifest="manifest/applet.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/renderspecial/**" />
3adaa3f
        <include name="org/jmol/shapespecial/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolApplet0_ShapeSurface.jar" manifest="manifest/applet.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/jvxl/**" />
3adaa3f
        <include name="org/jmol/shapesurface/**" />
3adaa3f
        <include name="org/jmol/rendersurface/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolApplet0_Smiles.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/smiles/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
3adaa3f
    <jar destfile="build/JmolApplet0_Spectrum.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/spectrum/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
- ->
3adaa3f
  	<jar destfile="build/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/symmetry/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
3adaa3f
    
3adaa3f
    
3adaa3f
    
3adaa3f
         index="true" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="JmolApplet*.class" />
3adaa3f
        <include name="jmol75x29x8.gif" />
3adaa3f
        <include name="javajs/api/**" />
3adaa3f
        <include name="javajs/awt/**" />
3adaa3f
        <include name="javajs/img/**" />
3adaa3f
        <include name="javajs/export/**" />
3adaa3f
        <include name="javajs/util/**" />
3adaa3f
        <include name="org/jmol/adapter/smarter/**" />
3adaa3f
        <include name="org/jmol/api/**" />
3adaa3f
        <include name="org/jmol/applet/**" />
3adaa3f
        <include name="org/jmol/atomdata/**" />
3adaa3f
        <include name="org/jmol/awt/**" />   
3adaa3f
        <include name="org/jmol/bspt/**" />
3adaa3f
        <include name="org/jmol/c/**" />
3adaa3f
        <include name="org/jmol/g3d/**" />
3adaa3f
        <include name="org/jmol/geodesic/**" />
3adaa3f
        <include name="org/jmol/i18n/**" />
3adaa3f
        <include name="org/jmol/java/**" />
3adaa3f
        <include name="org/jmol/modelset/**" />
3adaa3f
        <include name="org/jmol/script/**" />
3adaa3f
        <include name="org/jmol/shape/**" />
3adaa3f
        <include name="org/jmol/render/**" />
3adaa3f
        <include name="org/jmol/thread/**" />
3adaa3f
        <include name="org/jmol/util/**" />
3adaa3f
        <include name="org/jmol/io/**" />
3adaa3f
        <exclude name="org/jmol/util/BitSet32.class" />
3adaa3f
        <include name="org/jmol/viewer/**" />
3adaa3f
      </fileset>
3adaa3f
3adaa3f
      
3adaa3f
      <indexjars>
3adaa3f
      	
3adaa3f
        <pathelement path="build/JmolApplet0_Console.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Image.jar" />
3adaa3f
      	<pathelement path="build/JmolApplet0_JSV.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Minimize.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Navigate.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Popup.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersCif.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersPdb.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersMolXyz.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersMore.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersQuantum.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersPyMOL.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersSimple.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersXml.jar" /> 
3adaa3f
        <pathelement path="build/JmolApplet0_ReadersXtal.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ScriptExt.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ShapeBio.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ShapeSpecial.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_ShapeSurface.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Smiles.jar" />
3adaa3f
        <pathelement path="build/JmolApplet0_Symmetry.jar" />
3adaa3f
< ! - - <pathelement path="build/JmolApplet0_Spectrum.jar" />
3adaa3f
        <fileset dir="build" includes="JmolApplet0_i18n_*.jar" />   - - >
3adaa3f
      </indexjars>
3adaa3f
    </jar>
3adaa3f
	<echo message="creating JmolLib.jar" level="info" />
3adaa3f
    
3adaa3f
         manifest="manifest/jmolLib.txt" index="true" >
3adaa3f
      <fileset dir="${applet.classes.dir}" >
3adaa3f
	        <include name="**/*" />
3adaa3f
        <exclude name="JmolSmiles*" />
3adaa3f
        <exclude name="org/jmol/applet/**/*" />
3adaa3f
        <exclude name="org/jmol/appletjs/**/*" />
3adaa3f
        <exclude name="org/jmol/awt/**/*" />
3adaa3f
        <exclude name="org/jmol/awtjs/**/*" />
3adaa3f
        <exclude name="org/jmol/awtjs2d/**/*" />
3adaa3f
        <exclude name="org/jmol/console/**/*" />
3adaa3f
        <exclude name="org/jmol/consolejs/**/*" />
3adaa3f
        <exclude name="org/jmol/dialog/**/*" />
3adaa3f
        <exclude name="org/jmol/export/**/*" />
3adaa3f
        <exclude name="org/jmol/exportjs/**/*" />
3adaa3f
        <exclude name="org/jmol/modelkit/**/*" />
3adaa3f
        <exclude name="org/jmol/multitouch/jni/*" />
3adaa3f
        <exclude name="org/jmol/multitouch/sparshui/*" />
3adaa3f
        <exclude name="org/jmol/popup/**/*" />
3adaa3f
        <exclude name="org/openscience/**/*" />
3adaa3f
      	< ! - -  just need sparshUI gestureType.class - - >
3adaa3f
        <exclude name="com/sparshui/client/*" />
3adaa3f
        <exclude name="com/sparshui/common/**/**/*" />
3adaa3f
        <exclude name="com/sparshui/cpp/*" />
3adaa3f
        <exclude name="com/sparshui/gestures/*" />
3adaa3f
        <exclude name="com/sparshui/inputdevice/*" />
3adaa3f
        <exclude name="com/sparshui/server/*" />
3adaa3f
        <exclude name="com/json/**/*" />
3adaa3f
        <exclude name="JmolApplet*" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  </else></if>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="signed-applet" id="signed-applet" depends="applet-jar">
3adaa3f
  <if><equals arg1="${Private.propertyFile}" arg2="none" />
3adaa3f
    	<then><echo>Skipping applet jar signing</echo></then><else>
3adaa3f
3adaa3f
  	<delete dir="build">
3adaa3f
      <include name="JmolAppletSigned*"/>
3adaa3f
    </delete>
3adaa3f
    <echo message="Creating JmolAppletSigned.jar" />
3adaa3f
    
3adaa3f
         manifest="manifest/appletMonolithicSigned.txt" index="true" >
3adaa3f
      <fileset dir="${applet.classes.dir}" >
3adaa3f
        <include name="**/*" />
3adaa3f
        <exclude name="JmolSmiles*" />
3adaa3f
        <exclude name="javajs/swing/**" />
3adaa3f
        <exclude name="org/openscience/**/*" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<echo message="Creating JmolAppletsigned0*.jar" />
3adaa3f
      <jar destfile="build/JmolAppletSigned0_Console.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/console/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_Image.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/dialog/**" />
3adaa3f
        <include name="org/jmol/image/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_JSV.jar" manifest="manifest/applet.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/jsv/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolAppletSigned0_Minimize.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/minimize/**/**" />
3adaa3f
        <include name="org/jmol/modelkit/**" />
3adaa3f
        <include name="org/jmol/modelkit/images/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	
3adaa3f
    	manifest="manifest/appletSigned.txt" index="true" >
3adaa3f
      <fileset dir="${applet.classes.dir}" >
3adaa3f
        <include name="org/jmol/multitouch/**" />
3adaa3f
        <include name="com/sparshui/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolAppletSigned0_Navigate.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/navigate/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_Popup.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/popup/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersMolXyz.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/spartan/**" />
3adaa3f
        <include name="org/jmol/adapter/readers/molxyz/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersCif.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/cif/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersPdb.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/pdb/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersMore.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/more/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersQuantum.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/quantum/**" />
3adaa3f
        <include name="org/jmol/quantum/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
  	
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersPyMOL.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/pymol/**" />
3adaa3f
        <include name="org/jmol/rendercgo/**" />
3adaa3f
        <include name="org/jmol/shapecgo/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersSimple.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/simple/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersXtal.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/xtal/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ReadersXml.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/adapter/readers/xml/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolAppletSigned0_ScriptExt.jar" manifest="manifest/appletSigned.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/scriptext/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ShapeBio.jar" manifest="manifest/appletSigned.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/modelsetbio/**" />
3adaa3f
	    <include name="org/jmol/dssx/**" />
3adaa3f
        <include name="org/jmol/shapebio/**" />
3adaa3f
        <include name="org/jmol/renderbio/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_ShapeSpecial.jar" manifest="manifest/appletSigned.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/shapespecial/**" />
3adaa3f
        <include name="org/jmol/renderspecial/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
  	<jar destfile="build/JmolAppletSigned0_ShapeSurface.jar" manifest="manifest/appletSigned.txt" >
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/jvxl/**" />
3adaa3f
        <include name="org/jmol/shapesurface/**" />
3adaa3f
        <include name="org/jmol/rendersurface/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    <jar destfile="build/JmolAppletSigned0_Smiles.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/smiles/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
  	
3adaa3f
< ! - -      	
3adaa3f
    <jar destfile="build/JmolAppletSigned0_Spectrum.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/spectrum/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
- - >
3adaa3f
  	
3adaa3f
    <jar destfile="build/JmolAppletSigned0_Symmetry.jar" manifest="manifest/appletSigned.txt">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="org/jmol/symmetry/**" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
3adaa3f
    
3adaa3f
         manifest="manifest/appletSigned0.txt"
3adaa3f
         index="true">
3adaa3f
      <fileset dir="${applet.classes.dir}">
3adaa3f
        <include name="JmolApplet*.class" />
3adaa3f
        <include name="jmol75x29x8.gif" />
3adaa3f
        <include name="javajs/api/**" />
3adaa3f
        <include name="javajs/awt/**" />
3adaa3f
        <include name="javajs/export/**" />
3adaa3f
        <include name="javajs/img/**" />
3adaa3f
        <include name="javajs/util/**" />
3adaa3f
		<include name="org/apache/tools/**" />
3adaa3f
		<include name="org/jmol/adapter/smarter/**" />
3adaa3f
  		<include name="org/jmol/api/**" />
3adaa3f
  		<include name="org/jmol/applet/**" />
3adaa3f
		<include name="org/jmol/atomdata/**" />
3adaa3f
        <include name="org/jmol/awt/**" />		
3adaa3f
		<include name="org/jmol/bspt/**" />
3adaa3f
        <include name="org/jmol/c/**" />
3adaa3f
   		<include name="org/jmol/export/**" />
3adaa3f
		<include name="org/jmol/g3d/**" />
3adaa3f
		<include name="org/jmol/geodesic/**" />
3adaa3f
		<include name="org/jmol/i18n/**" />
3adaa3f
        <include name="org/jmol/java/**" />
3adaa3f
		<include name="org/jmol/modelset/**" />
3adaa3f
        <include name="org/jmol/render/**" />
3adaa3f
        <include name="org/jmol/script/**" />
3adaa3f
		<include name="org/jmol/shape/**" />
3adaa3f
        <include name="org/jmol/thread/**" />
3adaa3f
		<include name="org/jmol/util/**" />
3adaa3f
        <include name="org/jmol/io/**" />
3adaa3f
 		<include name="org/jmol/viewer/**" />
3adaa3f
      </fileset>    	
3adaa3f
      <indexjars>
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Console.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Image.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_JSV.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Minimize.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_MultiTouch.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Navigate.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Popup.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersCif.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersPdb.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersMolXyz.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersMore.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersQuantum.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersPyMOL.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersSimple.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersXml.jar" /> 
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ReadersXtal.jar" /> 
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ScriptExt.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ShapeBio.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ShapeSpecial.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_ShapeSurface.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Smiles.jar" />
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Symmetry.jar" />
3adaa3f
      	< ! - -      	
3adaa3f
        <pathelement path="build/JmolAppletSigned0_Spectrum.jar" />
3adaa3f
        <fileset dir="build" includes="JmolAppletSigned0_i18n_*.jar" />
3adaa3f
        - - >
3adaa3f
      	
3adaa3f
      </indexjars>
3adaa3f
    </jar>
3adaa3f
  	<echo> signing JmolApplet*.jar</echo>
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name"  value="JmolApplet*.jar" />
3adaa3f
    </antcall>
3adaa3f
  </else></if>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          depends="applet-classes">
3adaa3f
  <if><equals arg1="${Private.propertyFile}" arg2="none" />
3adaa3f
    	<then><echo>Skipping smiles-applet-jar</echo></then><else>
3adaa3f
  	
3adaa3f
 
3adaa3f
  	
3adaa3f
    <echo message="Creating JmolSmilesApplet.jar" />
3adaa3f
    
3adaa3f
         manifest="manifest/appletSmiles.txt" index="true" >
3adaa3f
      <fileset dir="${classes.dir}" >
3adaa3f
        <include name="JmolSmiles.class"/>
3adaa3f
      </fileset>
3adaa3f
      <fileset dir="${applet.classes.dir}" >
3adaa3f
        <include name="JmolSmiles*" />
3adaa3f
        <include name="javajs/util/ArrayUtil.class" />
3adaa3f
        <include name="javajs/util/List.class" />
3adaa3f
        <include name="javajs/util/T3.class" />
3adaa3f
        <include name="javajs/util/P3.class" />
3adaa3f
        <include name="javajs/util/V3.class" />
3adaa3f
        <include name="javajs/util/SB.class" />
3adaa3f
        <include name="javajs/util/ParserJS.class" />
3adaa3f
        <include name="org/jmol/api/SmilesMatcherInterface.class" />
3adaa3f
        <include name="org/jmol/c/**" />
3adaa3f
        <include name="org/jmol/java/BS.class" />
3adaa3f
        <include name="org/jmol/smiles/**" />
3adaa3f
        <include name="org/jmol/util/BSUtil.class" />
3adaa3f
        <include name="org/jmol/util/JmolEdge.class" />
3adaa3f
        <include name="org/jmol/util/JmolNode.class" />
3adaa3f
        <include name="org/jmol/util/JmolMolecule.class" />
3adaa3f
        <include name="org/jmol/util/DefaultLogger.class" />
3adaa3f
        <include name="org/jmol/util/Elements.class" />
3adaa3f
        <include name="org/jmol/util/Logger.class" />
3adaa3f
        <include name="org/jmol/util/LoggerInterface.class" />
3adaa3f
        <include name="org/jmol/util/Txt.class" />
3adaa3f
      </fileset>
3adaa3f
    </jar>
3adaa3f
    <antcall target="sign-jar-file">
3adaa3f
      <param name="sign-jar-file-dir" value="build" />
3adaa3f
      <param name="sign-jar-file-name"  value="JmolSmilesApplet.jar" />
3adaa3f
    </antcall>
3adaa3f
    
3adaa3f
    - - >
3adaa3f
  </else></if>
3adaa3f
  </target>   -->
3adaa3f
  	
3adaa3f
3adaa3f
	  
3adaa3f
	          depends="main-i18n,main,signed-applet" 
3adaa3f
	          Bob's computer chokes on doc -->
3adaa3f
	  		  
3adaa3f
3adaa3f
	<target name="dist" id="dist" depends="main-i18n,doc">
3adaa3f
	-->
3adaa3f
3adaa3f
   	<target name="dist" id="dist">
3adaa3f
	        		
3adaa3f
	          	
3adaa3f
		  
3adaa3f
		  
3adaa3f
		  Bob had problems with Eclipse Juno repeating the entire
3adaa3f
		  signing process twice here and crashing (io error in jarsigner) 
3adaa3f
		  close to the end of the second round. 	 -->
3adaa3f
		
3adaa3f
    
3adaa3f
    <delete dir="build/dist/jmol-${version}"/>
3adaa3f
    <mkdir dir="build/dist/jmol-${version}"/>
3adaa3f
    <copy todir="build/dist/jmol-${version}" >
3adaa3f
      <fileset dir="build">
3adaa3f
        <include name="Jmol.jar" />
3adaa3f
        <include name="JmolData.jar" />
3adaa3f
        <include name="JmolLib.jar" />
3adaa3f
        <include name="JSpecView.jar" />
3adaa3f
        <include name="jspecview.properties" />
3adaa3f
      </fileset>
3adaa3f
      <fileset dir=".">
3adaa3f
        <include name="jmol" />
3adaa3f
        <include name="jmol.sh" />
3adaa3f
        <include name="jmol.mac" />
3adaa3f
        <include name="jmol.bat" />
3adaa3f
        <include name="*.txt" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <copy file="src/org/jmol/viewer/Jmol.properties" tofile="build/dist/jmol-${version}/CHANGES.txt" />
3adaa3f
    <chmod perm="ugo+rx">
3adaa3f
      <fileset dir="build/dist/jmol-${version}">
3adaa3f
        <include name="jmol"/>
3adaa3f
        <include name="jmol.sh"/>
3adaa3f
        <include name="jmol.bat"/>
3adaa3f
      </fileset>
3adaa3f
    </chmod>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}" >
3adaa3f
      <fileset dir="./appletweb">
3adaa3f
        <include name="README*.txt" />
3adaa3f
        <include name="jsmol.zip" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
   
3adaa3f
    zip distributions to not retain file permissions ...
3adaa3f
    miguel 2 feb 2006 but there have been requests for them anyway -->
3adaa3f
3adaa3f
    
3adaa3f
         includes="jmol-${version}/**" />
3adaa3f
3adaa3f
    
3adaa3f
         compression="gzip" >
3adaa3f
      
3adaa3f
                  excludes="*/jmol,*/jmol.sh"
3adaa3f
                  includes="jmol-${version}/**" />
3adaa3f
      
3adaa3f
                  mode="755"
3adaa3f
    	    includes="jmol-${version}/jmol,jmol-${version}/jmol.sh" />
3adaa3f
    </tar>
3adaa3f
3adaa3f
    
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}" >
3adaa3f
      <fileset dir=".">
3adaa3f
        <include name="applet.classes" />
3adaa3f
        <include name="build.xml" />
3adaa3f
        <include name="build-i18n.xml" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}/src" >
3adaa3f
      <fileset dir="src" />
3adaa3f
3adaa3f
    </copy>
3adaa3f
3adaa3f
		
3adaa3f
    <copy todir="build/dist/jmol-${version}/ca-cert" >
3adaa3f
      <fileset dir="ca-cert">
3adaa3f
        <exclude name="**/*.p12" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    
3adaa3f
        <copy todir="build/dist/jmol-${version}/${plugin.dir}" >
3adaa3f
      <fileset dir="${plugin.dir}" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    
3adaa3f
-->
3adaa3f
    <copy todir="build/dist/jmol-${version}/${lib.dir}" >
3adaa3f
      <fileset dir="${lib.dir}" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}/appletweb" >
3adaa3f
      <fileset dir="appletweb" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}/manifest" >
3adaa3f
      <fileset dir="manifest" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}/doc" >
3adaa3f
      <fileset dir="doc" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmol-${version}/tools" >
3adaa3f
      <fileset dir="tools" />
3adaa3f
    </copy>
3adaa3f
3adaa3f
    
3adaa3f
    <copy file="build/Jvxl.jar" tofile="build/dist/Jvxl-${jvxl_version}.jar" failonerror="false" />
3adaa3f
3adaa3f
    
3adaa3f
            tofile="build/dist/jmol-${version}/doc/JmolDevelopersGuide.html" />
3adaa3f
    
3adaa3f
            tofile="build/dist/jmol-${version}/ChangeLog.html" />
3adaa3f
    <copy todir="build/dist/jmol-${version}/doc/JmolUserGuide">
3adaa3f
      <fileset dir="build/doc/JmolUserGuide">
3adaa3f
        <include name="**/*.html" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    
3adaa3f
            tofile="build/dist/jmol-${version}/doc/JmolAppletGuide.html" />
3adaa3f
3adaa3f
3adaa3f
    zip distributions to not retain file permissions
3adaa3f
    
3adaa3f
         includes="jmol-${version}/**" />
3adaa3f
    -->
3adaa3f
3adaa3f
    
3adaa3f
         compression="gzip" >
3adaa3f
      
3adaa3f
                  excludes="*/jmol,*/jmol.sh"
3adaa3f
                  includes="jmol-${version}/**" />
3adaa3f
      
3adaa3f
                  mode="755"
3adaa3f
                  includes="jmol,jmol.sh" />
3adaa3f
    </tar>
3adaa3f
3adaa3f
    
3adaa3f
  	<copy file="build/Jmol.jar" tofile="build/dist/Jmol.jar" />
3adaa3f
    <copy file="tools/pom.xml.template" tofile="build/dist/pom.xml.template" />
3adaa3f
		
3adaa3f
	
3adaa3f
    <jar jarfile="build/dist/jmol-${version}-javadoc.jar">
3adaa3f
      <fileset dir="build/javadoc" />
3adaa3f
    </jar>
3adaa3f
    
3adaa3f
    -->
3adaa3f
    <jar jarfile="build/dist/jmol-${version}-sources.jar">
3adaa3f
      <fileset dir="src" />
3adaa3f
    </jar>
3adaa3f
	<copy file="src/org/jmol/viewer/Jmol.properties" tofile="build/dist/Jmol.properties" />
3adaa3f
3adaa3f
	    
3adaa3f
	      message="Destination Path for ${version} (clear to exit)"
3adaa3f
	      defaultvalue="${path.release}/${prefix.release}${versionMajorMinorPatch}"
3adaa3f
	      addproperty="uploadPath"
3adaa3f
	    />
3adaa3f
3adaa3f
	
3adaa3f
	    
3adaa3f
	    <delete dir="${temp.dir}" />
3adaa3f
	    <mkdir dir="${temp.dir}" />
3adaa3f
	    <mkdir dir="${temp.dir}/${uploadPath}" />
3adaa3f
	  	
3adaa3f
	  	<echo>sendzip is ${sendZip}</echo>
3adaa3f
	  	
3adaa3f
	  	<if>
3adaa3f
	     <equals arg1="${sendZip}" arg2="true" />
3adaa3f
	  	 <then>
3adaa3f
	  	  	<echo>creating  ${temp.dir}/${uploadPath}/README-${version}.properties</echo>
3adaa3f
	    
3adaa3f
	          file="${dist.dir}/Jmol-${version}-binary.zip" />
3adaa3f
	    
3adaa3f
	          file="${dist.dir}/Jmol.properties" />
3adaa3f
	    </then>
3adaa3f
	  	</if>
3adaa3f
	  	<if>
3adaa3f
	     <equals arg1="${pathdir}" arg2="${pathdir-full}" />
3adaa3f
	  	 <then>
3adaa3f
		    
3adaa3f
		          file="${dist.dir}/Jmol-${version}-binary.tar.gz" />
3adaa3f
		    
3adaa3f
		          file="${dist.dir}/Jmol-${version}-full.tar.gz" />
3adaa3f
	  	 </then>
3adaa3f
	  	</if>
3adaa3f
3adaa3f
	</target>
3adaa3f
3adaa3f
  <target name="clean-after-dist" id="clean-after-dist">
3adaa3f
    <delete dir="build" includeemptydirs="true">
3adaa3f
      <exclude name="dist/**/*"/>
3adaa3f
      <exclude name="doc/**/*"/>
3adaa3f
    </delete>
3adaa3f
    <delete dir="build/dist/jmol-${version}"/>
3adaa3f
  </target>
3adaa3f
3adaa3f
    	
3adaa3f
 
3adaa3f
          depends="apis-jar,io-jar">
3adaa3f
    
3adaa3f
    <delete dir="build/dist/jmolapisio-${version}"/>
3adaa3f
    <mkdir dir="build/dist/jmolapisio-${version}"/>
3adaa3f
    <copy todir="build/dist/jmolapisio-${version}" >
3adaa3f
      <fileset dir=".">
3adaa3f
        <include name="jmolApis.jar" />
3adaa3f
        <include name="jmolIO.jar" />
3adaa3f
        <include name="*.txt" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    
3adaa3f
3adaa3f
    <copy todir="build/dist/jmolapisio-${version}" >
3adaa3f
      <fileset dir=".">
3adaa3f
        <include name="apisio.classes" />
3adaa3f
        <include name="build.xml" />
3adaa3f
        <include name="build-i18n.xml" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmolapisio-${version}/src" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <includesfile name="apisio.classes"/>
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    <copy todir="build/dist/jmolapisio-${version}/${lib.dir}" >
3adaa3f
      <fileset dir="${lib.dir}">
3adaa3f
        
3adaa3f
        
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
3adaa3f
    
3adaa3f
         compression="gzip" >
3adaa3f
      
3adaa3f
                  excludes="*/jmol,*/jmol.sh"
3adaa3f
                  includes="jmolapisio-${version}/**" />
3adaa3f
    </tar>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="check.jws" id="check.jws" depends="setup" unless="keystore.present" >
3adaa3f
    <echo message="Keystore '${keystore.name}' not found." />
3adaa3f
    <echo message="Please set with the argument '-Dkeystore.name=file'." />
3adaa3f
    <antcall target="initFailure" />
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="dist-jws" id="dist-jws" depends="check.jws,dist" >
3adaa3f
    <copy todir="build/dist/jmol-jws-${version}" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="jmol.jnlp" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <mkdir dir="build/dist/jmol-jws-${version}/${lib.dir}" />
3adaa3f
    <copy todir="build/dist/jmol-jws-${version}/${lib.dir}" >
3adaa3f
      <fileset dir="${lib.dir}">
3adaa3f
        <include name="*.jar" />
3adaa3f
        <exclude name="junit.jar" />
3adaa3f
        <exclude name="${saxon.jar}" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    <mkdir dir="build/dist/jmol-jws-${version}/images" />
3adaa3f
    <copy todir="build/dist/jmol-jws-${version}/images" flatten="yes" >
3adaa3f
      <fileset dir="src">
3adaa3f
        <include name="**/icon.jpg" />
3adaa3f
      </fileset>
3adaa3f
    </copy>
3adaa3f
    
3adaa3f
         target="internal-dist-jws-sign" />
3adaa3f
  </target>
3adaa3f
  
3adaa3f
  
3adaa3f
      This target should be only used internally within the build.xml. It is a
3adaa3f
      workaround for a bugs in the fileset feature of the signjar task. See bugs
3adaa3f
      5230 and 6988.
3adaa3f
  - - >
3adaa3f
  <target name="internal-dist-jws-sign" id="internal-dist-jws-sign">
3adaa3f
    
3adaa3f
             storepass="${keystore.password}" 
3adaa3f
             keystore="${keystore.name}" >
3adaa3f
      <fileset dir="../jmol-jws-${version}">
3adaa3f
        <include name="**/*.jar" />
3adaa3f
        <exclude name="**/.AppleDouble/**" />
3adaa3f
      </fileset>
3adaa3f
    </signjar>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="clean" id="clean">
3adaa3f
    <delete dir="${classes.dir}"/>
3adaa3f
    <delete dir="${applet.classes.dir}"/>
3adaa3f
    <delete dir="${apisio.classes.dir}"/>
3adaa3f
    <delete dir="${test-classes.dir}"/>
3adaa3f
    <delete dir="${appjars.dir}"/>
3adaa3f
    <delete dir="build/dist"/>
3adaa3f
    <delete>
3adaa3f
      <fileset dir="build">
3adaa3f
        <include name="*.jar" />
3adaa3f
      </fileset>
3adaa3f
    </delete>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="spotless" id="spotless" depends="clean,spotless-i18n">
3adaa3f
    <delete dir="build"/>
3adaa3f
    <delete dir="${javadoc.dir}"/>
3adaa3f
    <delete dir="packaging/rpm/dist"/>
3adaa3f
  </target>
3adaa3f
  
3adaa3f
  <target name="run" id="run" depends="main">
3adaa3f
    <java fork="true" jar="build/Jmol.jar" />
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
       Documentation Targets
3adaa3f
       ******************************** - - >
3adaa3f
  
3adaa3f
          depends="jmolGuide,jmolDevelopersGuide,jmolAppletGuide,jmolHistory,javadoc"/>
3adaa3f
3adaa3f
  <target name="initdoc" depends="init,check.docbook-xml,check.docbook-xsl,check.xsl" />
3adaa3f
3adaa3f
  <target name="check.docbook-xsl" depends="setup" unless="docbook-xsl.uptodate" >
3adaa3f
    <delete file="build/${docbook-xsl}.timestamp" />
3adaa3f
    <delete dir="build/${docbook-xsl}" />
3adaa3f
    <mkdir dir="build/${docbook-xsl}" />
3adaa3f
    
3adaa3f
           compression="gzip" />
3adaa3f
    <touch file="build/${docbook-xsl}.timestamp" />
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="check.docbook-xml" depends="setup" unless="docbook-xml.uptodate" >
3adaa3f
    <delete file="build/docbook-xml.timestamp" />
3adaa3f
    <delete dir="build/docbook-xml" />
3adaa3f
    <mkdir dir="build/docbook-xml" />
3adaa3f
    <unzip src="doc/${docbook-xml}.zip" dest="build/docbook-xml" />
3adaa3f
    <touch file="build/docbook-xml.timestamp" />
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="check.xsl" depends="setup" unless="xsl.available" >
3adaa3f
    <echo message="XSLT class '${saxon.main}' not found." />
3adaa3f
    <echo message="Note that the documentation is NOT generated now." />
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          description="Generation of Javadoc">
3adaa3f
  	
3adaa3f
    <mkdir dir="${javadoc.dir}"/>
3adaa3f
    
3adaa3f
             private="true" encoding="UTF8"
3adaa3f
             packagenames="org.openscience.*,org.jmol.*"
3adaa3f
             excludepackagenames="org.jmol.jcamp.*">
3adaa3f
      <classpath refid="project.class.path" />
3adaa3f
      <link href="http://download.oracle.com/javase/7/docs/api/" />
3adaa3f
      <tag name="j2sIgnore" enabled="false" />
3adaa3f
      <tag name="j2sIgnoreSuperConstructor" enabled="false" />
3adaa3f
      <tag name="j2sOverride" enabled="false" />
3adaa3f
    </javadoc>
3adaa3f
    
3adaa3f
    - - >
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          unless="jmolGuide.uptodate"
3adaa3f
          description="Generation of User's guide">
3adaa3f
    <echo message="Generating user's guide" level="info"/>
3adaa3f
    <mkdir dir="build/doc/JmolUserGuide" />
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <jvmarg value="${proxyHost}" />
3adaa3f
      <jvmarg value="${proxyPort}" />
3adaa3f
      <arg value="../../../doc/source/JmolGuide.docbook.xml" />
3adaa3f
      <arg value="../../${docbook-xsl}/html/chunk.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating user's guide (fr)" level="info"/>
3adaa3f
    <mkdir dir="build/doc/JmolUserGuide_fr" />
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <jvmarg value="${proxyHost}" />
3adaa3f
      <jvmarg value="${proxyPort}" />
3adaa3f
      <arg value="../../../doc/source/JmolGuide_fr.docbook.xml" />
3adaa3f
      <arg value="../../${docbook-xsl}/html/chunk.xsl" />
3adaa3f
    </java>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          depends="initdoc" unless="jmolHistory.uptodate"
3adaa3f
          description="Generation of history of changes">
3adaa3f
    <echo message="Generating history of changes" level="info"/>
3adaa3f
    <mkdir dir="build/doc/JmolHistory" />
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="ChangeLog.html" />
3adaa3f
      <arg value="../../../doc/source/JmolHistory.xml" />
3adaa3f
      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating history of changes (fr)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="ChangeLog_fr.html" />
3adaa3f
      <arg value="../../../doc/source/JmolHistory_fr.xml" />
3adaa3f
      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
3adaa3f
      <arg value="lang=fr" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating history of changes (nl)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="ChangeLog_nl.html" />
3adaa3f
      <arg value="../../../doc/source/JmolHistory_nl.xml" />
3adaa3f
      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
3adaa3f
      <arg value="lang=nl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating history of changes (ro)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="ChangeLog_ro.html" />
3adaa3f
      <arg value="../../../doc/source/JmolHistory_ro.xml" />
3adaa3f
      <arg value="../../../doc/source/JmolHistoryToHtml.xsl" />
3adaa3f
      <arg value="lang=ro" />
3adaa3f
    </java>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          depends="initdoc" unless="jmolDevelopersGuide.uptodate"
3adaa3f
          description="Generation of Developer's guide">
3adaa3f
    <echo message="Generating developer's guide" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolDevelopersGuide.html" />
3adaa3f
      <arg value="../../doc/source/JmolDevelopersGuide.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating developer's guide (fr)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolDevelopersGuide_fr.html" />
3adaa3f
      <arg value="../../doc/source/JmolDevelopersGuide_fr.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating developer's guide (de)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolDevelopersGuide_de.html" />
3adaa3f
      <arg value="../../doc/source/JmolDevelopersGuide_de.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
          unless="jmolAppletGuide.uptodate"
3adaa3f
          description="Generation of Applet guide">
3adaa3f
    <echo message="Generating applet guide" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolAppletGuide.html" />
3adaa3f
      <arg value="../../doc/source/JmolAppletGuide.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating applet guide (fr)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolAppletGuide_fr.html" />
3adaa3f
      <arg value="../../doc/source/JmolAppletGuide_fr.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
    <echo message="Generating applet guide (de)" level="info"/>
3adaa3f
    
3adaa3f
          classname="${saxon.main}"
3adaa3f
          classpath="${lib.dir}/${saxon.jar}" >
3adaa3f
      <arg value="-o" />
3adaa3f
      <arg value="JmolAppletGuide_de.html" />
3adaa3f
      <arg value="../../doc/source/JmolAppletGuide_de.docbook.xml" />
3adaa3f
      <arg value="../${docbook-xsl}/html/docbook.xsl" />
3adaa3f
    </java>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="test" id="test" depends="main,compile-tests">
3adaa3f
    <junit printsummary="yes" haltonfailure="yes">
3adaa3f
      <classpath>
3adaa3f
        <pathelement location="build/Jmol.jar" />
3adaa3f
        <pathelement location="${tests.dir}/Tests.jar" />
3adaa3f
        <pathelement location="./jars/junit.jar" />
3adaa3f
      </classpath>
3adaa3f
      <formatter type="plain" usefile="false" />
3adaa3f
      
3adaa3f
        <fileset dir="test" />
3adaa3f
      </batchtest> - - >
3adaa3f
      <test name="org.jmol.AllTests" />
3adaa3f
    </junit>
3adaa3f
  </target>
3adaa3f
3adaa3f
  <target name="compile-tests" id="compile-tests" depends="main">
3adaa3f
    <mkdir dir="${test-classes.dir}"/>
3adaa3f
    
3adaa3f
           debug="off" deprecation="on"
3adaa3f
           optimize="off" source="1.7" encoding="UTF8">
3adaa3f
      <classpath>
3adaa3f
        <pathelement location="build/Jmol.jar" />
3adaa3f
        <pathelement location="./jars/junit.jar" />
3adaa3f
      </classpath>
3adaa3f
    </javac>
3adaa3f
    <mkdir dir="${tests.dir}"/>
3adaa3f
    <jar destfile="${tests.dir}/Tests.jar" basedir="${test-classes.dir}" />
3adaa3f
  </target>
3adaa3f
3adaa3f
3adaa3f
	
3adaa3f
	
3adaa3f
  
3adaa3f
  <target name="sign-jar-file" >
3adaa3f
  <if><equals arg1="${Private.propertyFile}" arg2="none" />
3adaa3f
  	<then><echo>Skipping jar signing</echo></then><else>
3adaa3f
    <if><available file="${Private.propertyFile}" /><then>
3adaa3f
      	<echo>using keystore="${Private.keystore}" alias="${Private.alias} tsa=${tsa.url}"</echo> 
3adaa3f
        
3adaa3f
                 storetype="${Private.storetype}"
3adaa3f
                 storepass="${Private.storepass}"
3adaa3f
                 keypass="${Private.keypass}"
3adaa3f
                 alias="${Private.alias}"
3adaa3f
		       	 tsaurl="${tsa.url}"
3adaa3f
        	>
3adaa3f
          <fileset dir="${sign-jar-file-dir}" >
3adaa3f
            <include name="${sign-jar-file-name}" />
3adaa3f
          </fileset>
3adaa3f
        </signjar>
3adaa3f
    </then><elseif><available file="ca-cert/certificate/Jmol.p12" /><then>
3adaa3f
      	<echo>using ca-cert/certificate/Jmol.12</echo> 
3adaa3f
        
3adaa3f
                 storetype="pkcs12"
3adaa3f
                 storepass="${Jmol.p12.password}"
3adaa3f
	             keypass="${Jmol.p12key.password}"
3adaa3f
                 alias="${Jmol.p12.alias}"
3adaa3f
		       	 tsaurl="${tsa.url}"
3adaa3f
        	>
3adaa3f
            <fileset dir="${sign-jar-file-dir}" >
3adaa3f
              <include name="${sign-jar-file-name}" />
3adaa3f
            </fileset>
3adaa3f
        </signjar>
3adaa3f
    </then></elseif><else>
3adaa3f
      	<echo>using self-signed certificate</echo> 
3adaa3f
	        
3adaa3f
       		         storetype="${selfsign.storetype}"
3adaa3f
	                 storepass="${selfsign.storepass}"
3adaa3f
	                 alias="${selfsign.alias}">
3adaa3f
	            <fileset dir="${sign-jar-file-dir}" >
3adaa3f
	              <include name="${sign-jar-file-name}" />
3adaa3f
	            </fileset>
3adaa3f
	        </signjar>    	
3adaa3f
	</else></if>
3adaa3f
    
3adaa3f
  </else></if>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
  <target name="main-i18n" depends="classes">
3adaa3f
    <ant antfile="tools/build-i18n.xml" target="main-i18n"/>
3adaa3f
  </target>
3adaa3f
  <target name="spotless-i18n">
3adaa3f
    <ant antfile="tools/build-i18n.xml" target="spotless-i18n"/>
3adaa3f
  </target>
3adaa3f
3adaa3f
  
3adaa3f
    <exec executable="${ikvm.home}/ikvmc.exe">
3adaa3f
      <arg value="-target:library"/>
3adaa3f
      <arg value="-out:build/JmolLib.dll"/>
3adaa3f
      <arg value="-debug"/>
3adaa3f
      <arg value="build/JmolLib.jar"/>
3adaa3f
      < ! - - arg value="${lib.dir}/${vecmath.jar}"/  - - >
3adaa3f
    </exec>
3adaa3f
  </target>    - - >
3adaa3f
	
3adaa3f
3adaa3f
	
3adaa3f
	
3adaa3f
	
3adaa3f
	  
3adaa3f
	    To use this script, the scp task must be available.
3adaa3f
	    The scp task requires the jsch jar in the class path.
3adaa3f
	  - - >
3adaa3f
-->
3adaa3f
	  
3adaa3f
	  <taskdef resource="net/sf/antcontrib/antlib.xml">
3adaa3f
	    <classpath>
3adaa3f
	      <pathelement location="tools/ant-contrib.jar" />
3adaa3f
	    </classpath>
3adaa3f
	  </taskdef>
3adaa3f
3adaa3f
		
3adaa3f
	  <property name="sendZip"         value="true" />
3adaa3f
	  <property name="dist.dir"        value="build/dist" />
3adaa3f
	  <property name="src.dir"         value="src" />
3adaa3f
	  <property name="temp.dir"        value="build/release" />
3adaa3f
	  <property name="web.dir"         value="/home/frs/project/j/jm/jmol" />
3adaa3f
	  <property name="web.host"        value="frs.sourceforge.net" /> 
3adaa3f
	  <property name="prefix.release"  value="Jmol " />
3adaa3f
3adaa3f
	  <echo message="${dist.dir}" />
3adaa3f
		
3adaa3f
	
3adaa3f
3adaa3f
	12/17/2016	
3adaa3f
	Release Note: switching to semantic versioning (http://semver.org/)
3adaa3f
	Release Note: When releasing stable version, remove "-beta"
3adaa3f
		
3adaa3f
	-->
3adaa3f
		
3adaa3f
		
3adaa3f
	  <property file="${dist.dir}/Jmol.properties" prefix="Jmol.properties" />
3adaa3f
	  <property name="version" value="${Jmol.properties.Jmol.___JmolVersion}" />
3adaa3f
	  
3adaa3f
		  override = "true"
3adaa3f
		  input="${version}"
3adaa3f
		  regexp='(")([^"]+)(")'
3adaa3f
	  	  select="\2"
3adaa3f
	      global="true"
3adaa3f
	  />
3adaa3f
	  <echo message="version=${version}" />
3adaa3f
3adaa3f
		<loadresource property="versionMajorMinor">
3adaa3f
		  <string value="${version}"/>
3adaa3f
		  <filterchain>
3adaa3f
		    <tokenfilter>
3adaa3f
			      <replaceregex pattern="([0-9]+[.][0-9]+)(.*)" replace="\1"/>
3adaa3f
		    </tokenfilter>
3adaa3f
		  </filterchain>
3adaa3f
		</loadresource>
3adaa3f
		<echo message="versionMajorMinor: ${versionMajorMinor}"/>
3adaa3f
		
3adaa3f
		<loadresource property="versionMajorMinorPatch">
3adaa3f
		  <string value="${version}"/>
3adaa3f
		  <filterchain>
3adaa3f
		    <tokenfilter>
3adaa3f
			      <replaceregex pattern="([^-]*)(-beta)(.*)" replace="\1"/>
3adaa3f
		    </tokenfilter>
3adaa3f
		  </filterchain>
3adaa3f
		</loadresource>
3adaa3f
		<echo message="versionMajorMinorPatch: ${versionMajorMinorPatch}"/>
3adaa3f
3adaa3f
			<loadresource property="betaFlag">
3adaa3f
		  <string value="${version}"/>
3adaa3f
		  <filterchain>
3adaa3f
		    <tokenfilter>
3adaa3f
		      <replaceregex pattern="([^-]*)(-beta)(.*)" replace="\2"/>
3adaa3f
		    </tokenfilter>
3adaa3f
		  </filterchain>
3adaa3f
		</loadresource>
3adaa3f
		<property name="pathdir-full" value="Jmol/Version" />
3adaa3f
	  	<if>
3adaa3f
	     <equals arg1="${betaFlag}" arg2="${version}" />
3adaa3f
	  	 <then>
3adaa3f
	  		<property name="pathdir"    value="${pathdir-full}" />
3adaa3f
	    </then>
3adaa3f
	  	<else>
3adaa3f
	  		<property name="pathdir"    value="Jmol-beta/Jmol" />
3adaa3f
	  	</else>
3adaa3f
	  	</if>
3adaa3f
		<echo message="betaFlag: ${betaFlag}"/>
3adaa3f
3adaa3f
		<property name="path.release"    value="${pathdir} ${versionMajorMinor}" />
3adaa3f
		<echo message="path.release: ${path.release}"/>
3adaa3f
3adaa3f
</project>