From: <sh...@us...> - 2008-11-21 15:18:55
|
Revision: 13185 http://cdk.svn.sourceforge.net/cdk/?rev=13185&view=rev Author: shk3 Date: 2008-11-21 15:18:52 +0000 (Fri, 21 Nov 2008) Log Message: ----------- the jar file works Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2008-11-21 15:12:45 UTC (rev 13184) +++ jchempaint/trunk/build.xml 2008-11-21 15:18:52 UTC (rev 13185) @@ -2,6 +2,10 @@ <property file="build.props"/> + <property name="debug" value="on" /> + <property name="deprecation" value="on" /> + <property name="optimization" value="off" /> + <property name="cdk.dist" value="${cdk.dir}/dist" /> <property name="cdk.lib" value="${cdk.dir}/jar" /> <property name="cdk.devellib" value="${cdk.dir}/develjar" /> @@ -34,67 +38,6 @@ </jar> </target> - <target id="jcp-only" name="jcp-only" - description="Builds the JChemPaint application"> - <antcall target="compile-module"> - <param name="module" value="jchempaint"/> - </antcall> - <antcall target="compile-module"> - <param name="module" value="jchempaint.application"/> - </antcall> - <antcall target="compile-module"> - <param name="module" value="jchempaint.applet"/> - </antcall> - <unjar dest="${appjars.dir}"> - <fileset dir="${dist}/jar"> - <include name="cdk-jchempaint.jar"/> - <include name="cdk-jchempaint.application.jar"/> - <include name="cdk-jchempaint.applet.jar"/> - </fileset> - </unjar> - - <!-- then zip up things --> - <jar jarfile="${dist}/jar/jchempaint-${jcp.version}.jar"> - <manifest> - <attribute name="Main-Class" value="org.openscience.cdk.applications.jchempaint.application.JChemPaint"/> - <section name="org/openscience/cdk/applications/jchempaint/"> - <attribute name="Specification-Title" value="JChemPaint"/> - <attribute name="Specification-Version" value="1.0"/> - <attribute name="Specification-Vendor" value="The CDK Project"/> - <attribute name="Implementation-Title" value="org.openscience.cdk"/> - <attribute name="Implementation-Version" value="${jcp.version}"/> - <attribute name="Implementation-Vendor" value="The CDK Project"/> - </section> - </manifest> - <fileset dir="${appjars.dir}"> - <include name="**/*" /> - </fileset> - <fileset dir="${src}"> - <includesfile name="${metainf}/jchempaint.application.datafiles"/> - </fileset> - </jar> - </target> - - <target id="unjar" name="unjar" description="unjars a lot"> - <unjar dest="${appjars.dir}"> - <fileset dir="${lib}"> - <includesfile name="${metainf}/core.libdepends"/> - <includesfile name="${metainf}/data.libdepends"/> - <includesfile name="${metainf}/experimental.libdepends"/> - <includesfile name="${metainf}/extra.libdepends"/> - <includesfile name="${metainf}/io.libdepends"/> - <includesfile name="${metainf}/libio-cml.libdepends"/> - <includesfile name="${metainf}/qsar.libdepends"/> - <includesfile name="${metainf}/render.libdepends"/> - <includesfile name="${metainf}/standard.libdepends"/> - <includesfile name="${metainf}/svg.libdepends"/> - <includesfile name="${metainf}/sdg.libdepends"/> - <includesfile name="${metainf}/control.libdepends"/> - <includesfile name="${metainf}/jchempaint.libdepends"/> - </fileset> - </unjar> - </target> - <target id="unjar-libjars" name="unjar-libjars"> <unjar dest="${appjars.dir}"> <fileset dir="${cdk.lib}"> @@ -154,6 +97,7 @@ </classpath> </javac> + <copydir dest="${appjars.dir}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2008-12-04 14:58:59
|
Revision: 13475 http://cdk.svn.sourceforge.net/cdk/?rev=13475&view=rev Author: shk3 Date: 2008-12-04 14:58:56 +0000 (Thu, 04 Dec 2008) Log Message: ----------- cleaned up build.xml Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2008-12-04 14:47:21 UTC (rev 13474) +++ jchempaint/trunk/build.xml 2008-12-04 14:58:56 UTC (rev 13475) @@ -13,21 +13,14 @@ <property name="src" value="src" /> <property name="lib" value="lib" /> <property name="dist" value="dist" /> - <property name="appjars.dir" value="${dist}/appjars" /> + <property name="dist-classes" value="${dist}/classes" /> <property name="metainf" value="META-INF" /> - <property name="build" value="build" /> - <property name="growing_list_file" value="${build}/applet-classes-list.files"/> - <property name="growing_classpath" value="${build}/applet-jars-list.files"/> + <property name="growing_list_file" value="${dist}/applet-classes-list.files"/> + <property name="growing_classpath" value="${dist}/applet-jars-list.files"/> <target id="clean" name="clean" description="Removes compiled stuff."> <delete dir="${dist}" /> - <delete> - <fileset dir="${dist}/jar/" includes="jchempaint-applet-*.jar" /> - <fileset file="${growing_list_file}"/> - <fileset file="${growing_classpath}"/> - </delete> - <delete dir="${appjars.dir}"/> </target> <target id="dist" name="dist" depends="compile-jcp, unjar-libjars, unjar-cdkjars" @@ -44,14 +37,14 @@ <attribute name="Implementation-Vendor" value="The CDK Project"/> </section> </manifest> - <fileset dir="${appjars.dir}"> + <fileset dir="${dist-classes}"> <include name="**/*" /> </fileset> </jar> </target> <target id="unjar-libjars" name="unjar-libjars"> - <unjar dest="${appjars.dir}"> + <unjar dest="${dist-classes}"> <fileset dir="${cdk.lib}"> <includesfile name="${cdk.metainf}/core.libdepends"/> <includesfile name="${cdk.metainf}/data.libdepends"/> @@ -62,7 +55,7 @@ <includesfile name="${cdk.metainf}/standard.libdepends"/> </fileset> </unjar> - <unjar dest="${appjars.dir}"> + <unjar dest="${dist-classes}"> <fileset dir="${lib}"> <include name="**/*" /> </fileset> @@ -70,7 +63,7 @@ </target> <target id="unjar-cdkjars" name="unjar-cdkjars"> - <unjar dest="${appjars.dir}"> + <unjar dest="${dist-classes}"> <fileset dir="${cdk.dist}/jar"> <include name="cdk-applications.jar"/> <include name="cdk-core.jar"/> @@ -100,8 +93,8 @@ <target id="compile-jcp" name="compile-jcp"> <!-- TODO check if dist-all in cdk has been done--> <echo message="Compiling JChemPaint classes." /> - <mkdir dir="${appjars.dir}" /> - <javac srcdir="${src}" destdir="${appjars.dir}" optimize="${optimization}" + <mkdir dir="${dist-classes}" /> + <javac srcdir="${src}" destdir="${dist-classes}" optimize="${optimization}" nowarn="${nowarn}" debug="${debug}" deprecation="${deprecation}" target="1.5" source="1.5"> <classpath> @@ -116,7 +109,7 @@ </classpath> </javac> - <copydir dest="${appjars.dir}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> + <copydir dest="${dist-classes}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> </target> <target id="dist-applet" name="dist-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars, build-applet" description="Builds the JChemPaint applet jar files with jarindex" /> @@ -136,7 +129,7 @@ <attribute name="includesfile"/> <sequential> <jar destfile="@{destfile}"> - <fileset dir="${appjars.dir}"> + <fileset dir="${dist-classes}"> <includesfile name="@{includesfile}"/> <excludesfile name="${growing_list_file}"/> </fileset> @@ -152,7 +145,7 @@ <attribute name="includepattern"/> <sequential> <jar destfile="@{destfile}"> - <fileset dir="${appjars.dir}"> + <fileset dir="${dist-classes}"> <include name="@{includepattern}"/> <excludesfile name="${growing_list_file}"/> </fileset> @@ -162,9 +155,9 @@ </sequential> </macrodef> - <!--<echo message="Compiling applet logging tool org/openscience/cdk/tools/LoggingTool.java to ${appjars.dir}"/> - <delete file="${appjars.dir}/org/openscience/cdk/tools/LoggingTool.class"/> - <javac srcdir="applet" destdir="${appjars.dir}" optimize="${optimization}" debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"> + <!--<echo message="Compiling applet logging tool org/openscience/cdk/tools/LoggingTool.java to ${dist-classes}"/> + <delete file="${dist-classes}/org/openscience/cdk/tools/LoggingTool.class"/> + <javac srcdir="applet" destdir="${dist-classes}" optimize="${optimization}" debug="${debug}" deprecation="${deprecation}" target="1.3" source="1.3"> </javac>--> <mkdir dir="${dist}/jar" /> @@ -175,24 +168,15 @@ <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_applications_jchempaint.jar" includepattern="org/openscience/cdk/applications/jchempaint/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_applications.jar" includepattern="org/openscience/cdk/applications/**"/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_dict.jar" includepattern="org/openscience/cdk/dict/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" includepattern="org/openscience/cdk/io/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_iupac.jar" includepattern="org/openscience/cdk/iupac/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_math.jar" includepattern="org/openscience/cdk/math/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" includepattern="org/openscience/cdk/tools/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_structgen.jar" includepattern="org/openscience/cdk/structgen/**" -/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar" includepattern="org/openscience/cdk/nonotify/**" -/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_dict.jar" includepattern="org/openscience/cdk/dict/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" includepattern="org/openscience/cdk/io/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_iupac.jar" includepattern="org/openscience/cdk/iupac/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_math.jar" includepattern="org/openscience/cdk/math/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" includepattern="org/openscience/cdk/tools/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_structgen.jar" includepattern="org/openscience/cdk/structgen/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar" includepattern="org/openscience/cdk/nonotify/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" includepattern="org/openscience/cdk/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience.jar" includepattern="org/openscience/**"/> @@ -222,7 +206,7 @@ <attribute name="Implementation-Vendor" value="The CDK Project"/> </section> </manifest> - <fileset dir="${appjars.dir}"> + <fileset dir="${dist-classes}"> <includesfile name="${metainf}/applet-core.files"/> <exclude name="org/apache/log4j/**"/> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-01-12 13:56:31
|
Revision: 13860 http://cdk.svn.sourceforge.net/cdk/?rev=13860&view=rev Author: shk3 Date: 2009-01-12 13:56:27 +0000 (Mon, 12 Jan 2009) Log Message: ----------- the dist-applet task now builds the zip of all jars Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-01-12 13:29:40 UTC (rev 13859) +++ jchempaint/trunk/build.xml 2009-01-12 13:56:27 UTC (rev 13860) @@ -116,7 +116,12 @@ <copydir dest="${dist-classes}/org/openscience/jchempaint/resources" src="${src}/main/org/openscience/jchempaint/resources"></copydir> </target> - <target id="dist-applet" name="dist-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars, build-applet" description="Builds the JChemPaint applet jar files with jarindex" /> + <target id="dist-applet" name="dist-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars, build-applet" description="Builds the JChemPaint applet jar files with jarindex"> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> + <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> + <zipfileset dir="." includes="LICENCE.txt"/> + </zip> + </target> <target id="build-applet" name="build-applet" description="Builds the JChemPaint applet jar files with jarindex"> <!-- At first jars are packed from file lists --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-04-27 10:28:47
|
Revision: 14571 http://cdk.svn.sourceforge.net/cdk/?rev=14571&view=rev Author: shk3 Date: 2009-04-27 10:28:43 +0000 (Mon, 27 Apr 2009) Log Message: ----------- added all external jars (inchi still has library problems) Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-04-25 18:03:55 UTC (rev 14570) +++ jchempaint/trunk/build.xml 2009-04-27 10:28:43 UTC (rev 14571) @@ -50,12 +50,41 @@ <target id="unjar-libjars" name="unjar-libjars"> <unjar dest="${dist-classes}"> <fileset dir="${cdk.lib}"> + <includesfile name="${cdk.metainf}/atomtype.libdepends"/> + <includesfile name="${cdk.metainf}/builder3d.libdepends"/> + <includesfile name="${cdk.metainf}/builder3dtools.libdepends"/> + <includesfile name="${cdk.metainf}/charges.libdepends"/> + <includesfile name="${cdk.metainf}/control.libdepends"/> <includesfile name="${cdk.metainf}/core.libdepends"/> <includesfile name="${cdk.metainf}/data.libdepends"/> + <includesfile name="${cdk.metainf}/datadebug.libdepends"/> + <includesfile name="${cdk.metainf}/dict.libdepends"/> + <includesfile name="${cdk.metainf}/diff.libdepends"/> <includesfile name="${cdk.metainf}/extra.libdepends"/> + <includesfile name="${cdk.metainf}/forcefield.libdepends"/> + <includesfile name="${cdk.metainf}/formula.libdepends"/> + <includesfile name="${cdk.metainf}/inchi.libdepends"/> + <includesfile name="${cdk.metainf}/interfaces.libdepends"/> <includesfile name="${cdk.metainf}/io.libdepends"/> + <includesfile name="${cdk.metainf}/isomorphism.libdepends"/> + <includesfile name="${cdk.metainf}/libiocml.libdepends"/> + <includesfile name="${cdk.metainf}/libiomd.libdepends"/> + <includesfile name="${cdk.metainf}/nonotify.libdepends"/> + <includesfile name="${cdk.metainf}/pcore.libdepends"/> + <includesfile name="${cdk.metainf}/pdb.libdepends"/> + <includesfile name="${cdk.metainf}/pdbcml.libdepends"/> + <includesfile name="${cdk.metainf}/qm.libdepends"/> <includesfile name="${cdk.metainf}/qsar.libdepends"/> + <includesfile name="${cdk.metainf}/qsaratomic.libdepends"/> + <includesfile name="${cdk.metainf}/qsarbond.libdepends"/> + <includesfile name="${cdk.metainf}/qsarcml.libdepends"/> + <includesfile name="${cdk.metainf}/qsarmolecular.libdepends"/> + <includesfile name="${cdk.metainf}/qsarprotein.libdepends"/> + <includesfile name="${cdk.metainf}/reaction.libdepends"/> <includesfile name="${cdk.metainf}/render.libdepends"/> + <includesfile name="${cdk.metainf}/sdg.libdepends"/> + <includesfile name="${cdk.metainf}/smarts.libdepends"/> + <includesfile name="${cdk.metainf}/smiles.libdepends"/> <includesfile name="${cdk.metainf}/standard.libdepends"/> </fileset> </unjar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-05-06 11:25:12
|
Revision: 14588 http://cdk.svn.sourceforge.net/cdk/?rev=14588&view=rev Author: shk3 Date: 2009-05-06 11:25:05 +0000 (Wed, 06 May 2009) Log Message: ----------- included all jars in build process Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-05-06 10:40:34 UTC (rev 14587) +++ jchempaint/trunk/build.xml 2009-05-06 11:25:05 UTC (rev 14588) @@ -98,27 +98,47 @@ <target id="unjar-cdkjars" name="unjar-cdkjars"> <unjar dest="${dist-classes}"> <fileset dir="${cdk.dist}/jar"> + <include name="cdk-atomtype.jar"/> + <include name="cdk-builder3d.jar"/> + <include name="cdk-builder3dtools.jar"/> + <include name="cdk-charges.jar"/> + <include name="cdk-control.jar"/> <include name="cdk-core.jar"/> + <include name="cdk-datadebug.jar"/> <include name="cdk-data.jar"/> - <include name="cdk-experimental.jar"/> + <include name="cdk-dict.jar"/> + <include name="cdk-diff.jar"/> <include name="cdk-extra.jar"/> + <include name="cdk-extra.jar"/> + <include name="cdk-fingerprint.jar"/> + <include name="cdk-forcefield.jar"/> <include name="cdk-formula.jar"/> + <include name="cdk-inchi.jar"/> <include name="cdk-interfaces.jar"/> - <include name="cdk-inchi.jar"/> <include name="cdk-io.jar"/> - <include name="cdk-libio-cml.jar"/> + <include name="cdk-ionpot.jar"/> + <include name="cdk-isomorphism.jar"/> + <include name="cdk-libiocml.jar"/> + <include name="cdk-libiomd.jar"/> + <include name="cdk-nonotify.jar"/> + <include name="cdk-pcore.jar"/> + <include name="cdk-pdbcml.jar"/> + <include name="cdk-pdb.jar"/> + <include name="cdk-qm.jar"/> + <include name="cdk-qsaratomic.jar"/> + <include name="cdk-qsarbond.jar"/> + <include name="cdk-qsarionpot.jar"/> <include name="cdk-qsar.jar"/> + <include name="cdk-qsarmolecular.jar"/> + <include name="cdk-qsarprotein.jar"/> + <include name="cdk-reaction.jar"/> <include name="cdk-render.jar"/> + <include name="cdk-sdg.jar"/> + <include name="cdk-smarts.jar"/> + <include name="cdk-smiles.jar"/> <include name="cdk-standard.jar"/> - <include name="cdk-svg.jar"/> - <include name="cdk-jchempaint.jar"/> - <include name="cdk-jchempaint.application.jar"/> - <include name="cdk-jchempaint.applet.jar"/> - <include name="cdk-nonotify.jar"/> - <include name="cdk-valencycheck.jar"/> - <include name="cdk-smiles.jar"/> - <include name="cdk-sdg.jar"/> - <include name="cdk-control.jar"/> + <include name="cdk-structgen.jar"/> + <include name="cdk-valencycheck.jar"/> </fileset> </unjar> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-06-25 15:26:28
|
Revision: 14625 http://cdk.svn.sourceforge.net/cdk/?rev=14625&view=rev Author: shk3 Date: 2009-06-25 15:26:26 +0000 (Thu, 25 Jun 2009) Log Message: ----------- made the signing a different target Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-06-25 15:13:21 UTC (rev 14624) +++ jchempaint/trunk/build.xml 2009-06-25 15:26:26 UTC (rev 14625) @@ -174,6 +174,23 @@ </zip> </target> + <target id="dist-applet-signed" name="dist-applet-signed" depends="build-applet" description="Builds the JChemPaint applet jar files with jarindex"> + <signjar destDir="" + alias="${certificatealias}" + storepass="${keystorepassphrase}" + preservelastmodified="true"> + <path> + <fileset dir="."> + <includesfile name="${growing_classpath}"/> + </fileset> + </path> + </signjar> + <zip destfile="${dist}/jchempaint-applet-${jcp.version}.zip"> + <zipfileset dir="${dist}/jar" includes="jchempaint-applet-*.jar"/> + <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> + </zip> + </target> + <target id="build-applet" name="build-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars" description="Builds the JChemPaint applet jar files with jarindex"> <!-- At first jars are packed from file lists --> <!-- The file lists are generated from tomcat access log files with unpacked class files (and without jar files) --> @@ -276,16 +293,6 @@ </fileset> </indexjars--> </jar> - <signjar destDir="" - alias="${certificatealias}" - storepass="${keystorepassphrase}" - preservelastmodified="true"> - <path> - <fileset dir="."> - <includesfile name="${growing_classpath}"/> - </fileset> - </path> - </signjar> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-06-25 15:58:46
|
Revision: 14626 http://cdk.svn.sourceforge.net/cdk/?rev=14626&view=rev Author: mark_rynbeek Date: 2009-06-25 15:56:04 +0000 (Thu, 25 Jun 2009) Log Message: ----------- a zero change, just to test if I can commit to SVN Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-06-25 15:26:26 UTC (rev 14625) +++ jchempaint/trunk/build.xml 2009-06-25 15:56:04 UTC (rev 14626) @@ -1,6 +1,6 @@ <project name="JCPCDK" default="dist" basedir="."> - <property file="ant.properties"/> + <property file="ant.properties"/> <property name="debug" value="on" /> <property name="deprecation" value="on" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-06-29 09:52:44
|
Revision: 14628 http://cdk.svn.sourceforge.net/cdk/?rev=14628&view=rev Author: mark_rynbeek Date: 2009-06-29 09:52:42 +0000 (Mon, 29 Jun 2009) Log Message: ----------- moved the jar i command into an exec task Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-06-25 16:17:22 UTC (rev 14627) +++ jchempaint/trunk/build.xml 2009-06-29 09:52:42 UTC (rev 14628) @@ -283,16 +283,10 @@ <includesfile name="${metainf}/applet-core.files"/> <exclude name="org/apache/log4j/**"/> </fileset> - <!--for unknown reasons, this fails with a "negative seek offset" - could depand on ant version. - it workd directly via jar. For this, go to dist jar and do - jar i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar - --> - <!--indexjars> - <fileset dir="."> - <includesfile name="${growing_classpath}"/> - </fileset> - </indexjars--> </jar> + <exec dir="${dist}/jar" executable="jar" > + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + </exec> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-07-02 14:15:19
|
Revision: 14651 http://cdk.svn.sourceforge.net/cdk/?rev=14651&view=rev Author: shk3 Date: 2009-07-02 14:14:55 +0000 (Thu, 02 Jul 2009) Log Message: ----------- added controlbasic Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-07-02 13:57:30 UTC (rev 14650) +++ jchempaint/trunk/build.xml 2009-07-02 14:14:55 UTC (rev 14651) @@ -136,6 +136,7 @@ <include name="cdk-smarts.jar"/> <include name="cdk-smiles.jar"/> <include name="cdk-standard.jar"/> + <include name="cdk-controlbasic.jar"/> <include name="cdk-structgen.jar"/> <include name="cdk-valencycheck.jar"/> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-08-13 10:49:40
|
Revision: 14717 http://cdk.svn.sourceforge.net/cdk/?rev=14717&view=rev Author: mark_rynbeek Date: 2009-08-13 10:49:23 +0000 (Thu, 13 Aug 2009) Log Message: ----------- need new jar file control awt from primary Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-08-13 09:52:22 UTC (rev 14716) +++ jchempaint/trunk/build.xml 2009-08-13 10:49:23 UTC (rev 14717) @@ -141,6 +141,7 @@ <include name="cdk-valencycheck.jar"/> <!-- added by MR, new controller/renderer --> + <include name="cdk-controlawt.jar"/> <include name="cdk-renderawt.jar"/> <include name="cdk-renderbasic.jar"/> <include name="cdk-rendercontrol.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-08-13 15:08:35
|
Revision: 14718 http://cdk.svn.sourceforge.net/cdk/?rev=14718&view=rev Author: mark_rynbeek Date: 2009-08-13 15:08:27 +0000 (Thu, 13 Aug 2009) Log Message: ----------- Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-08-13 10:49:23 UTC (rev 14717) +++ jchempaint/trunk/build.xml 2009-08-13 15:08:27 UTC (rev 14718) @@ -142,6 +142,7 @@ <!-- added by MR, new controller/renderer --> <include name="cdk-controlawt.jar"/> + <include name="cdk-controlextra.jar"/> <include name="cdk-renderawt.jar"/> <include name="cdk-renderbasic.jar"/> <include name="cdk-rendercontrol.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-08-25 08:29:30
|
Revision: 14758 http://cdk.svn.sourceforge.net/cdk/?rev=14758&view=rev Author: shk3 Date: 2009-08-25 08:29:13 +0000 (Tue, 25 Aug 2009) Log Message: ----------- adopted index command to new jars Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-08-24 15:56:14 UTC (rev 14757) +++ jchempaint/trunk/build.xml 2009-08-25 08:29:13 UTC (rev 14758) @@ -306,7 +306,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-bsh.jar jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest jchempaint-applet-org_jaxen jchempaint-applet-org_xmlcml jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-08-25 09:34:08
|
Revision: 14759 http://cdk.svn.sourceforge.net/cdk/?rev=14759&view=rev Author: shk3 Date: 2009-08-25 09:33:59 +0000 (Tue, 25 Aug 2009) Log Message: ----------- the build works again Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-08-25 08:29:13 UTC (rev 14758) +++ jchempaint/trunk/build.xml 2009-08-25 09:33:59 UTC (rev 14759) @@ -285,7 +285,6 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-jas.jar" includepattern="jas/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-javax_vecmath.jar" includepattern="javax/vecmath/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-nu.jar" includepattern="nu/**"/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-bsh.jar" includepattern="bsh/**"/> <!-- the following jar contains all other classes and resources --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-others.jar" includepattern="**/*"/> <!-- the main jar file is packed from a list, but it must be packed as last file because it contains INDEX.LIST --> @@ -306,7 +305,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-bsh.jar jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest jchempaint-applet-org_jaxen jchempaint-applet-org_xmlcml jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_omegahat.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-04 11:26:39
|
Revision: 14795 http://cdk.svn.sourceforge.net/cdk/?rev=14795&view=rev Author: shk3 Date: 2009-09-04 11:26:32 +0000 (Fri, 04 Sep 2009) Log Message: ----------- build process removes unneeded stuff from src root Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-04 11:17:13 UTC (rev 14794) +++ jchempaint/trunk/build.xml 2009-09-04 11:26:32 UTC (rev 14795) @@ -155,6 +155,9 @@ </fileset> </unjar> <delete dir="${dist-classes}/META-INF" /> + <delete> + <fileset dir="${dist-classes}" includes="*"/> + </delete> </target> <target id="compile-jcp" name="compile-jcp"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-10 09:06:36
|
Revision: 14810 http://cdk.svn.sourceforge.net/cdk/?rev=14810&view=rev Author: shk3 Date: 2009-09-10 09:06:27 +0000 (Thu, 10 Sep 2009) Log Message: ----------- changed the build process to keep io-formats.set Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-09 16:58:11 UTC (rev 14809) +++ jchempaint/trunk/build.xml 2009-09-10 09:06:27 UTC (rev 14810) @@ -156,7 +156,7 @@ </unjar> <delete dir="${dist-classes}/META-INF" /> <delete> - <fileset dir="${dist-classes}" includes="*"/> + <fileset dir="${dist-classes}" includes="*" excludes="io-formats.set"/> </delete> <delete dir="${dist-classes}/org/omegahat" /> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-10 15:20:34
|
Revision: 14816 http://cdk.svn.sourceforge.net/cdk/?rev=14816&view=rev Author: mark_rynbeek Date: 2009-09-10 15:20:26 +0000 (Thu, 10 Sep 2009) Log Message: ----------- removed qsar and modeling jar files from being built Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-10 14:01:28 UTC (rev 14815) +++ jchempaint/trunk/build.xml 2009-09-10 15:20:26 UTC (rev 14816) @@ -266,13 +266,13 @@ <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_dict.jar" includepattern="org/openscience/cdk/dict/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar" includepattern="org/openscience/cdk/io/**"/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**"/> + <!--jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_qsar.jar" includepattern="org/openscience/cdk/qsar/**"/--> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_iupac.jar" includepattern="org/openscience/cdk/iupac/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_math.jar" includepattern="org/openscience/cdk/math/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_tools.jar" includepattern="org/openscience/cdk/tools/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_structgen.jar" includepattern="org/openscience/cdk/structgen/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar" includepattern="org/openscience/cdk/nonotify/**"/> - <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_modeling.jar" includepattern="org/openscience/cdk/modeling/**"/> + <!--jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_modeling.jar" includepattern="org/openscience/cdk/modeling/**"/--> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_controller.jar" includepattern="org/openscience/cdk/controller/**"/> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar" includepattern="org/openscience/cdk/**"/> @@ -309,7 +309,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_openscience_cdk_modeling.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_qsar.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources-core.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-others.jar" /> </exec> </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-23 11:27:11
|
Revision: 14865 http://cdk.svn.sourceforge.net/cdk/?rev=14865&view=rev Author: shk3 Date: 2009-09-23 11:27:05 +0000 (Wed, 23 Sep 2009) Log Message: ----------- For some reasons, log4j classes were not included in build. This caused classnotfound problems when saving as cml Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-23 09:52:00 UTC (rev 14864) +++ jchempaint/trunk/build.xml 2009-09-23 11:27:05 UTC (rev 14865) @@ -215,7 +215,6 @@ <!-- The file lists are generated from tomcat access log files with unpacked class files (and without jar files) --> <!-- cat apache/jakarta-tomcat-5.0.28/logs/localhost_access_log.2005-04-27.txt | awk -v classdir="/jcpapplet/classes/" '$9 != 404 && substr($7,0,length(classdir)) == classdir { print substr($7,length(classdir)+1) }' | sort --> <!-- hint: uncomment <Valve className="org.apache.catalina.valves.AccessLogValve" in conf/server.xml to switch on tomcat's access logging --> - <concat destfile="${growing_list_file}" fixlastline="yes" append="no">org/apache/log4j/**${line.separator}</concat> <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> <fileset file="${metainf}/applet-core.files"/> </concat> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-09-24 13:10:38
|
Revision: 14873 http://cdk.svn.sourceforge.net/cdk/?rev=14873&view=rev Author: shk3 Date: 2009-09-24 13:10:31 +0000 (Thu, 24 Sep 2009) Log Message: ----------- the icons are now in both resources jars Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-24 12:35:12 UTC (rev 14872) +++ jchempaint/trunk/build.xml 2009-09-24 13:10:31 UTC (rev 14873) @@ -210,6 +210,13 @@ <zipfileset dir="${cdk.dir}/doc" includes="lgpl.license"/> </zip> </target> + + <!-- since only targets can be conditional, we need this in a separte target --> + <target name="concat" id="concat" unless="appendtolist"> + <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> + <fileset file="@{includesfile}" /> + </concat> + </target> <target id="build-applet" name="build-applet" depends="compile-jcp, unjar-libjars, unjar-cdkjars" description="Builds the JChemPaint applet jar files with jarindex"> <!-- At first jars are packed from file lists --> @@ -230,9 +237,7 @@ <excludesfile name="${growing_list_file}"/> </fileset> </jar> - <concat destfile="${growing_list_file}" fixlastline="yes" append="yes"> - <fileset file="@{includesfile}" /> - </concat> + <antcall target="concat"/> <concat destfile="${growing_classpath}" fixlastline="no" append="yes">@{destfile}${line.separator}</concat> </sequential> </macrodef> @@ -260,7 +265,11 @@ <jar-from-list destfile="${dist}/jar/jchempaint-applet-viewer-opts.jar" includesfile="${metainf}/applet-viewer-opts.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> + <!-- since for the display of the help, we need the icons in the same jar, we do not log + this to the growing_list_file, so that icons go into the resources.jar as well --> + <property name="appendtolist" value="true"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources-core.jar" includesfile="${metainf}/applet-resources-core.files"/> + <available file="build.xml" property="appendtolist"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-resources.jar" includesfile="${metainf}/jchempaint.datafiles"/> <!-- the following jar files are packed from directory patterns --> <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar" includepattern="org/openscience/cdk/config/**"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-24 16:29:39
|
Revision: 14875 http://cdk.svn.sourceforge.net/cdk/?rev=14875&view=rev Author: mark_rynbeek Date: 2009-09-24 16:29:23 +0000 (Thu, 24 Sep 2009) Log Message: ----------- removed some (big) unnecessary modules Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-24 16:18:53 UTC (rev 14874) +++ jchempaint/trunk/build.xml 2009-09-24 16:29:23 UTC (rev 14875) @@ -101,24 +101,24 @@ <unjar dest="${dist-classes}"> <fileset dir="${cdk.dist}/jar"> <include name="cdk-atomtype.jar"/> - <include name="cdk-builder3d.jar"/> - <include name="cdk-builder3dtools.jar"/> + <!--include name="cdk-builder3d.jar"/> + <include name="cdk-builder3dtools.jar"/--> <include name="cdk-charges.jar"/> <include name="cdk-control.jar"/> <include name="cdk-core.jar"/> - <include name="cdk-datadebug.jar"/> + <!--include name="cdk-datadebug.jar"/--> <include name="cdk-data.jar"/> <include name="cdk-dict.jar"/> <include name="cdk-diff.jar"/> <include name="cdk-extra.jar"/> - <include name="cdk-fingerprint.jar"/> + <!--include name="cdk-fingerprint.jar"/--> <include name="cdk-forcefield.jar"/> <include name="cdk-formula.jar"/> <include name="cdk-inchi.jar"/> <include name="cdk-interfaces.jar"/> <include name="cdk-io.jar"/> <include name="cdk-ionpot.jar"/> - <include name="cdk-isomorphism.jar"/> + <!--include name="cdk-isomorphism.jar"/--> <include name="cdk-libiocml.jar"/> <include name="cdk-libiomd.jar"/> <include name="cdk-nonotify.jar"/> @@ -126,13 +126,13 @@ <include name="cdk-pdbcml.jar"/> <include name="cdk-pdb.jar"/> <include name="cdk-qm.jar"/> - <include name="cdk-qsaratomic.jar"/> + <!--include name="cdk-qsaratomic.jar"/> <include name="cdk-qsarbond.jar"/> <include name="cdk-qsarionpot.jar"/> <include name="cdk-qsar.jar"/> <include name="cdk-qsarmolecular.jar"/> <include name="cdk-qsarprotein.jar"/> - <include name="cdk-reaction.jar"/> + <include name="cdk-reaction.jar"/--> <include name="cdk-render.jar"/> <include name="cdk-sdg.jar"/> <include name="cdk-smarts.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-09-28 14:50:59
|
Revision: 14894 http://cdk.svn.sourceforge.net/cdk/?rev=14894&view=rev Author: mark_rynbeek Date: 2009-09-28 14:50:47 +0000 (Mon, 28 Sep 2009) Log Message: ----------- put log4j partly in core Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-09-28 13:47:05 UTC (rev 14893) +++ jchempaint/trunk/build.xml 2009-09-28 14:50:47 UTC (rev 14894) @@ -319,7 +319,7 @@ </manifest> <fileset dir="${dist-classes}"> <includesfile name="${metainf}/applet-core.files"/> - <exclude name="org/apache/log4j/**"/> + <!--exclude name="org/apache/log4j/**"/--> </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-10-13 14:23:46
|
Revision: 14978 http://cdk.svn.sourceforge.net/cdk/?rev=14978&view=rev Author: mark_rynbeek Date: 2009-10-13 14:23:22 +0000 (Tue, 13 Oct 2009) Log Message: ----------- further shrinking: io_cml jar and nu.xom Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-10-13 12:27:57 UTC (rev 14977) +++ jchempaint/trunk/build.xml 2009-10-13 14:23:22 UTC (rev 14978) @@ -160,6 +160,7 @@ <delete dir="${dist-classes}/org/omegahat" /> <delete dir="${dist-classes}/org/openscience/cdk/modeling" /> <delete dir="${dist-classes}/org/openscience/cdk/fingerprint" /> + <delete dir="${dist-classes}/org/openscience/cdk/io/cml/data" /> </target> <target id="compile-jcp" name="compile-jcp"> @@ -229,6 +230,7 @@ <shrink logfile="shrinklog.core.xml"> <entrypointjar name="${dist}/jar/jchempaint-applet-editor.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_config.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_nonotify.jar"/> @@ -251,6 +253,7 @@ <class name="org.openscience.cdk.tools.manipulator.BondManipulator" methods="public" fields="none" /> <class name="org.apache.log4j.Logger" methods="public" /> <class name="org.apache.log4j.Category" methods="public" /> + <class name="org.openscience.cdk.interfaces.IBond" methods="public" fields="none" /> </keep> </shrink> </yguard> @@ -361,7 +364,6 @@ <shrink logfile="shrinklogcml.xml"> <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> - <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience.jar"/> <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> <property name="error-checking" value="pedantic"/> @@ -377,6 +379,27 @@ </shrink> </yguard> + <!-- shrink nu.xom jar --> + <yguard> + <inoutpair in="${dist}/jar/jchempaint-applet-nu.jar" out="${dist}/jar/shrinkout/jchempaint-applet-nu.jar"/> + <externalclasses> + <fileset dir="${dist}/jar"> + <include name="**/*.jar"/> + </fileset> + </externalclasses> + <shrink logfile="shrinklog.config.xml"> + <entrypointjar name="${dist}/jar/jchempaint-applet-core.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_openscience_cdk_io.jar"/> + <entrypointjar name="${dist}/jar/jchempaint-applet-org_xmlcml.jar"/> + <property name="error-checking" value="pedantic"/> + <keep> + <class name="nu.xom.XPathContext" methods="public" fields="none"/> + <class name="nu.xom.Node" methods="public" fields="none"/> + </keep> + </shrink> + </yguard> + <move todir="${dist}/jar"> <fileset dir="${dist}/jar/shrinkout"> <include name="**/*.jar"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-10-19 09:47:01
|
Revision: 14992 http://cdk.svn.sourceforge.net/cdk/?rev=14992&view=rev Author: mark_rynbeek Date: 2009-10-19 09:46:55 +0000 (Mon, 19 Oct 2009) Log Message: ----------- added obfuscation escape for applet classes Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-10-16 10:02:20 UTC (rev 14991) +++ jchempaint/trunk/build.xml 2009-10-19 09:46:55 UTC (rev 14992) @@ -204,7 +204,6 @@ <externalclasses> <fileset dir="${dist}/jar"> <include name="**/*.jar"/> - <!--exclude name="**/jchempaint-applet-editor.jar"/--> </fileset> </externalclasses> @@ -224,7 +223,6 @@ <externalclasses> <fileset dir="${dist}/jar"> <include name="**/*.jar"/> - <!--exclude name="**/jchempaint-applet-core.jar"/--> </fileset> </externalclasses> <shrink logfile="shrinklog.core.xml"> @@ -254,6 +252,9 @@ <class name="org.apache.log4j.Logger" methods="public" /> <class name="org.apache.log4j.Category" methods="public" /> <class name="org.openscience.cdk.interfaces.IBond" methods="public" fields="none" /> + <class name="org.openscience.jchempaint.applet.JChemPaintAbstractApplet" methods="public" fields="none" /> + <class name="org.openscience.jchempaint.applet.JChemPaintViewerApplet" methods="public" fields="none" /> + <class name="org.openscience.jchempaint.applet.JChemPaintEditorApplet" methods="public" fields="none" /> </keep> </shrink> </yguard> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-11-03 09:59:25
|
Revision: 15042 http://cdk.svn.sourceforge.net/cdk/?rev=15042&view=rev Author: mark_rynbeek Date: 2009-11-03 09:59:16 +0000 (Tue, 03 Nov 2009) Log Message: ----------- Put templates in correctly named jar file Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-11-02 21:47:17 UTC (rev 15041) +++ jchempaint/trunk/build.xml 2009-11-03 09:59:16 UTC (rev 15042) @@ -510,7 +510,7 @@ <mkdir dir="${dist}/jar" /> <delete dir="${dist-classes}/org/openscience/jchempaint/resources/apponly"></delete> - <jar-from-pattern destfile="${dist}/jar/jchempaint-templates.jar" includepattern="org/openscience/jchempaint/dialog/templates/**"/> + <jar-from-pattern destfile="${dist}/jar/jchempaint-applet-templates.jar" includepattern="org/openscience/jchempaint/dialog/templates/**"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-viewer-opts.jar" includesfile="${metainf}/applet-viewer-opts.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor.jar" includesfile="${metainf}/applet-editor.files"/> <jar-from-list destfile="${dist}/jar/jchempaint-applet-editor-opts.jar" includesfile="${metainf}/applet-editor-opts.files"/> @@ -553,7 +553,7 @@ </fileset> </jar> <exec dir="${dist}/jar" executable="jar" > - <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_io_cml.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-templates.jar jchempaint-applet-others.jar" /> + <arg line="i jchempaint-applet-core.jar jchempaint-applet-viewer-opts.jar jchempaint-applet-editor.jar jchempaint-applet-editor-opts.jar jchempaint-applet-resources.jar jchempaint-applet-org_openscience_cdk_config.jar jchempaint-applet-org_openscience_cdk_controller.jar jchempaint-applet-org_fest.jar jchempaint-applet-org_jaxen.jar jchempaint-applet-org_xmlcml.jar jchempaint-applet-org_openscience_cdk_dict.jar jchempaint-applet-org_openscience_cdk_io.jar jchempaint-applet-org_openscience_cdk_io_cml.jar jchempaint-applet-org_openscience_cdk_iupac.jar jchempaint-applet-org_openscience_cdk_math.jar jchempaint-applet-org_openscience_cdk_tools.jar jchempaint-applet-org_openscience_cdk_structgen.jar jchempaint-applet-org_openscience_cdk_nonotify.jar jchempaint-applet-org_openscience_cdk.jar jchempaint-applet-org_openscience.jar jchempaint-applet-org_3pq.jar jchempaint-applet-org_apache.jar jchempaint-applet-org_w3c.jar jchempaint-applet-org.jar jchempaint-applet-com_ozten.jar jchempaint-applet-Jama.jar jchempaint-applet-jas.jar jchempaint-applet-javax_vecmath.jar jchempaint-applet-nu.jar jchempaint-applet-templates.jar jchempaint-applet-others.jar" /> </exec> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2009-11-26 15:04:20
|
Revision: 15101 http://cdk.svn.sourceforge.net/cdk/?rev=15101&view=rev Author: mark_rynbeek Date: 2009-11-26 15:04:08 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Temporarily commented out some problematic yguard Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-11-26 14:24:34 UTC (rev 15100) +++ jchempaint/trunk/build.xml 2009-11-26 15:04:08 UTC (rev 15101) @@ -357,12 +357,11 @@ </yguard> <!-- shrink xmlcml jar--> - <yguard> + <!--yguard> <inoutpair in="${dist}/jar/jchempaint-applet-org_xmlcml.jar" out="${dist}/jar/shrinkout/jchempaint-applet-org_xmlcml.jar"/> <externalclasses> <fileset dir="${dist}/jar"> <include name="**/*.jar"/> - <!--exclude name="**/jchempaint-applet-org_xmlcml.jar"/--> </fileset> </externalclasses> <shrink logfile="shrinklogcml.xml"> @@ -381,10 +380,10 @@ </class> </keep> </shrink> - </yguard> + </yguard--> <!-- shrink nu.xom jar --> - <yguard> + <!--yguard> <inoutpair in="${dist}/jar/jchempaint-applet-nu.jar" out="${dist}/jar/shrinkout/jchempaint-applet-nu.jar"/> <externalclasses> <fileset dir="${dist}/jar"> @@ -402,7 +401,7 @@ <class name="nu.xom.Node" methods="public" fields="none"/> </keep> </shrink> - </yguard> + </yguard--> <move todir="${dist}/jar"> <fileset dir="${dist}/jar/shrinkout"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sh...@us...> - 2009-12-03 15:13:50
|
Revision: 15150 http://cdk.svn.sourceforge.net/cdk/?rev=15150&view=rev Author: shk3 Date: 2009-12-03 15:13:43 +0000 (Thu, 03 Dec 2009) Log Message: ----------- added a target for building a library distribution Modified Paths: -------------- jchempaint/trunk/build.xml Modified: jchempaint/trunk/build.xml =================================================================== --- jchempaint/trunk/build.xml 2009-12-03 15:05:57 UTC (rev 15149) +++ jchempaint/trunk/build.xml 2009-12-03 15:13:43 UTC (rev 15150) @@ -630,6 +630,33 @@ </test> </junit> </target> + + <target id="dist-jars" name="dist-jars" depends="compile-jcp"> + <mkdir dir="${dist}/alljars" /> + <copy todir="${dist}/alljars"> + <fileset dir="${cdk.dist}/jar"> + <include name="*.jar" /> + </fileset> + </copy> + <jar jarfile="${dist}/alljars/cdk-jchempaint.jar"> + <fileset dir="${dist-classes}"> + <include name="**/*" /> + </fileset> + </jar> + <copy todir="${dist}/alljars"> + <fileset dir="${cdk.lib}"> + <include name="*.jar" /> + </fileset> + </copy> + <copy todir="${dist}/alljars"> + <fileset dir="${lib}"> + <include name="*.jar" /> + </fileset> + </copy> + <zip destfile="${dist}/jchempaint-lib-${jcp.version}.zip"> + <zipfileset dir="${dist}/alljars" includes="*.jar"/> + </zip> + </target> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |