Menu
▾
▴
[Jmol-commits] CVS: Jmol/packaging/debian Makefile,1.6,1.7 build.xml,1.1,1.2 changelog,1.4,1.5 control,1.3,1.4 jmol,1.1,1.2
|
From: Egon W. <eg...@us...> - 2002-04-20 12:07:22
|
Update of /cvsroot/jmol/Jmol/packaging/debian
In directory usw-pr-cvs1:/tmp/cvs-serv2337
Modified Files:
Makefile build.xml changelog control jmol
Log Message:
Updated for Jmol 2:
jmol -> new jar libraries
control -> added missing build dependencies, conform java policy
Makefile -> make Jmol Guide with xsltproc
buid.xml -> synchronized with latest one
Index: Makefile
===================================================================
RCS file: /cvsroot/jmol/Jmol/packaging/debian/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile 5 Jun 2001 18:46:06 -0000 1.6
--- Makefile 20 Apr 2002 12:07:20 -0000 1.7
***************
*** 7,11 ****
HTMLDOC = ${DESTDIR}/usr/share/doc/jmol/html
! VERSION=1
CLASSPATH=`find /tmp/jmol-${VERSION}/jars -name "*.jar" | tr '\n' ':'`
--- 7,11 ----
HTMLDOC = ${DESTDIR}/usr/share/doc/jmol/html
! VERSION=2
CLASSPATH=`find /tmp/jmol-${VERSION}/jars -name "*.jar" | tr '\n' ':'`
***************
*** 16,20 ****
jars/jmol.jar:
! @ant jar -Ddocbook.dir=/usr/lib/sgml/stylesheet/xsl/docbook/nwalsh/
clean:
--- 16,20 ----
jars/jmol.jar:
! @ant -Ddocbook.dir=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh
clean:
***************
*** 29,35 ****
@install ./generatedSource/org/openscience/jmol/Data/guide/* ${HTMLDOC}
! deb: clean
@echo "Building package for version ${VERSION}"
! cp /tmp/jmol-${VERSION}.source.tar.gz /tmp/jmol_${VERSION}.orig.tar.gz
cd /tmp; tar zxvf jmol-${VERSION}.source.tar.gz
cp Makefile /tmp/jmol-${VERSION}/.
--- 29,35 ----
@install ./generatedSource/org/openscience/jmol/Data/guide/* ${HTMLDOC}
! setup: clean
@echo "Building package for version ${VERSION}"
! # cp /tmp/jmol-${VERSION}.source.tar.gz /tmp/jmol_${VERSION}.orig.tar.gz
cd /tmp; tar zxvf jmol-${VERSION}.source.tar.gz
cp Makefile /tmp/jmol-${VERSION}/.
***************
*** 37,40 ****
cp -R ../debian /tmp/jmol-${VERSION}/.
cp -R build.xml /tmp/jmol-${VERSION}/.
- cd /tmp/jmol-${VERSION}; dpkg-buildpackage -rfakeroot
--- 37,46 ----
cp -R ../debian /tmp/jmol-${VERSION}/.
cp -R build.xml /tmp/jmol-${VERSION}/.
+ guide:
+ @echo "Compiling Jmol guide..."
+ cd /tmp/jmol-${VERSION}/generatedSource/org/openscience/jmol/Data/guide; xsltproc /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl ../../../../../../doc/source/JMolGuide.docbook.xml
+
+ deb: setup guide
+ mkdir -p /tmp/jmol-${VERSION}/generatedSource/org/openscience/jmol/Data/guide/
+ cd /tmp/jmol-${VERSION}; dpkg-buildpackage -rfakeroot
Index: build.xml
===================================================================
RCS file: /cvsroot/jmol/Jmol/packaging/debian/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** build.xml 5 Jun 2001 08:19:47 -0000 1.1
--- build.xml 20 Apr 2002 12:07:20 -0000 1.2
***************
*** 1,255 ****
<project name="Jmol" default="main" basedir=".">
! <!-- added for Debian -->
! <property name="build.compiler" value="jikes"/>
! <property name="version" value="1" />
! <property name="source.dir" value="src" />
! <property name="generatedSource.dir" value="generatedSource" />
! <property name="lib.dir" value="jars" />
! <property name="classes.dir" value="classes" />
! <property name="dist.dir" value="dist" />
! <property name="sourcedist.dir" value="sourcedist" />
! <property name="doc.dir" value="doc" />
! <property name="javadoc.dir" value="javadoc" />
! <property name="manifest" value="${source.dir}/manifest"/>
! <property name="docbook.dir" value="${user.dir}/../docbook" />
!
! <path id="project.class.path">
! <fileset dir="${lib.dir}">
! <include name="*.jar" />
! </fileset>
! </path>
!
! <target name="main" depends="init,jar"/>
!
! <target name="init" depends="check.docbook,check.xsl" />
!
! <target name="initFailure">
! <fail message="Init failed. See messages above." />
! </target>
!
! <target name="setup" >
! <uptodate property="jmolGuilde.uptodate" targetfile="${generatedSource.dir}/org/openscience/jmol/Data/guide/index.html">
! <srcfiles dir="${doc.dir}/source" includes="JMolGuide.docbook.xml" />
! </uptodate>
! <available file="${docbook.dir}" property="docbook.dir.present"/>
! <available classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar"
! property="xsl.available"/>
! <uptodate property="javadoc.uptodate" targetfile="${javadoc.dir}/index.html">
! <srcfiles dir="${source.dir}" includes="**/*.java" />
! </uptodate>
! </target>
!
! <target name="check.docbook" depends="setup" unless="docbook.dir.present" >
! <echo message="Docbook directory '${docbook.dir}' not found." />
! <echo message="Please set with the argument '-Ddocbook.dir=directory'." />
! <antcall target="initFailure" />
! </target>
!
! <target name="check.xsl" depends="setup" unless="xsl.available" >
! <echo message="XSLT class 'com.icl.saxon.StyleSheet' not found." />
! <antcall target="initFailure" />
! </target>
!
! <target name="jmolGuide" depends="init" unless="jmolGuilde.uptodate" >
! <echo message="Generating user's guide" />
! <mkdir dir="${generatedSource.dir}/org/openscience/jmol/Data/guide" />
! <java fork="true" dir="${generatedSource.dir}/org/openscience/jmol/Data/guide"
! classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar" >
! <arg value="${user.dir}/${doc.dir}/source/JMolGuide.docbook.xml" />
! <arg value="${docbook.dir}/html/chunk.xsl" />
! </java>
! </target>
!
! <target name="classes" depends="init,jmolGuide">
! <mkdir dir="${classes.dir}"/>
! <javac srcdir="${source.dir}" destdir="${classes.dir}"
! debug="off" deprecation="on">
! <classpath refid="project.class.path" />
! </javac>
! <copy todir="${classes.dir}" >
! <fileset dir="${source.dir}">
! <include name="**/*.jpg" />
! <include name="**/*.gif" />
! <include name="**/*.html" />
! <include name="**/*.dtd" />
! <include name="**/Properties/*" />
! <include name="**/Data/*" />
! </fileset>
! </copy>
! <copy todir="${classes.dir}" >
! <fileset dir="${generatedSource.dir}">
! <include name="**/*.jpg" />
! <include name="**/*.gif" />
! <include name="**/*.html" />
! </fileset>
! </copy>
! </target>
!
! <target name="jar" depends="init,classes">
! <jar jarfile="${lib.dir}/jmol.jar" manifest="${manifest}" >
! <fileset dir="${classes.dir}" >
! <exclude name="**/.*" />
! <exclude name="**/Test*.class" />
! <include name="**/jmol/**" />
! </fileset>
! </jar>
!
! <jar jarfile="${lib.dir}/jmol-applet.jar" >
! <fileset dir="${classes.dir}" >
! <exclude name="**/.*" />
! <include name="**/miniJmol/**" />
! <include name="**/jmol/FortranFormat.class" />
! <include name="**/jmol/Matrix3D.class" />
! <include name="**/jmol/DisplaySettings.class" />
! <include name="**/jmol/PhysicalProperty.class" />
! </fileset>
! </jar>
! </target>
!
! <target name="dist" depends="jar">
! <mkdir dir="${dist.dir}/jmol-${version}"/>
! <copy todir="${dist.dir}/jmol-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol-applet.jar" />
! <exclude name="swing.jar" />
! <exclude name="junit.jar" />
! <exclude name="saxon.jar" />
! </fileset>
! </copy>
! <copy todir="${dist.dir}/jmol-${version}" >
! <fileset dir=".">
! <include name="jmol" />
! <include name="jmol.mac" />
! <include name="jmol.bat" />
! <include name="*.txt" />
! </fileset>
! </copy>
! <copy todir="${dist.dir}/jmol-${version}/samples" >
! <fileset dir="samples" />
! </copy>
!
! <mkdir dir="${dist.dir}/jmol-applet-${version}"/>
! <copy todir="${dist.dir}/jmol-applet-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol.jar" />
! <exclude name="jas.jar" />
! <exclude name="Acme.jar" />
! <exclude name="swing.jar" />
! <exclude name="junit.jar" />
! <exclude name="multi.jar" />
! <exclude name="saxon.jar" />
! </fileset>
! </copy>
! <copy todir="${dist.dir}/jmol-applet-${version}" >
! <fileset dir=".">
! <include name="*.txt" />
! </fileset>
! </copy>
! </target>
!
! <target name="dist.zip" depends="dist">
! <zip zipfile="jmol-${version}.zip" basedir="${dist.dir}"
! includes="jmol-${version}/**" />
!
! <zip zipfile="jmol-applet-${version}.zip" basedir="${dist.dir}"
! includes="jmol-applet-${version}/**" />
! </target>
!
! <target name="dist.tar.gz" depends="dist">
! <tar tarfile="jmol-${version}.tar" basedir="${dist.dir}"
! includes="jmol-${version}/**"/>
! <gzip zipfile="jmol-${version}.tar.gz" src="jmol-${version}.tar"/>
! <delete file="jmol-${version}.tar" />
!
! <tar tarfile="jmol-applet-${version}.tar" basedir="${dist.dir}"
! includes="jmol-applet-${version}/**"/>
! <gzip zipfile="jmol-applet-${version}.tar.gz" src="jmol-applet-${version}.tar"/>
! <delete file="jmol-applet-${version}.tar" />
! </target>
!
! <target name="sourcedist">
! <mkdir dir="${sourcedist.dir}/jmol-${version}"/>
! <copy todir="${sourcedist.dir}/jmol-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol*.jar" />
! </fileset>
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}" >
! <fileset dir=".">
! <include name="build.xml" />
! <include name="jmol" />
! <include name="jmol.mac" />
! <include name="jmol.bat" />
! <include name="*.txt" />
! <include name="build.xml" />
! </fileset>
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/${source.dir}" >
! <fileset dir="${source.dir}" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/${doc.dir}" >
! <fileset dir="${doc.dir}" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/samples" >
! <fileset dir="samples" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/packaging" >
! <fileset dir="packaging" />
! </copy>
! </target>
!
! <target name="sourcedist.zip" depends="sourcedist">
! <zip zipfile="jmol-${version}.source.zip" basedir="${sourcedist.dir}" includes="**" />
! </target>
!
! <target name="sourcedist.tar.gz" depends="sourcedist">
! <tar tarfile="jmol.source.tar" basedir="${sourcedist.dir}" includes="**"/>
! <gzip zipfile="jmol-${version}.source.tar.gz" src="jmol.source.tar"/>
! <delete file="jmol.source.tar" />
! </target>
!
! <target name="clean">
! <delete dir="${generatedSource.dir}"/>
! <delete dir="${classes.dir}"/>
! <delete>
! <fileset dir="${lib.dir}">
! <include name="jmol.jar" />
! <include name="jmol-applet.jar" />
! </fileset>
! <fileset dir=".">
! <include name="jmol-*.zip" />
! <include name="jmol-*.tar.gz" />
! </fileset>
! </delete>
! <delete dir="${javadoc.dir}"/>
! <delete dir="${dist.dir}"/>
! <delete dir="${sourcedist.dir}"/>
! </target>
!
! <target name="run" depends="classes">
! <java fork="true" classname="org.openscience.jmol.Jmol">
! <classpath location="classes" />
! <classpath refid="project.class.path" />
! </java>
! </target>
!
! <target name="runtests" depends="classes">
! <java fork="true" classname="org.openscience.jmol.TestAll">
! <classpath location="classes" />
! <classpath refid="project.class.path" />
! </java>
! </target>
!
! <target name="javadoc" depends="init" unless="javadoc.uptodate">
! <mkdir dir="${javadoc.dir}"/>
! <javadoc destdir="${javadoc.dir}" sourcepath="src"
! private="true" packagenames="org.openscience.*">
! <classpath refid="project.class.path" />
! </javadoc>
! </target>
</project>
--- 1,334 ----
<project name="Jmol" default="main" basedir=".">
! <!-- added for Debian -->
! <property name="build.compiler" value="jikes"/>
! <property name="version" value="2" />
! <property name="source.dir" value="src" />
! <property name="generatedSource.dir" value="generatedSource" />
! <property name="lib.dir" value="jars" />
! <property name="classes.dir" value="classes" />
! <property name="applet.classes.dir" value="applet-classes" />
! <property name="dist.dir" value="dist" />
! <property name="sourcedist.dir" value="sourcedist" />
! <property name="doc.dir" value="doc" />
! <property name="javadoc.dir" value="javadoc" />
! <property name="manifest" value="${source.dir}/manifest"/>
! <property name="docbook.dir" value="${user.dir}/../docbook-xsl" />
!
! <path id="project.class.path">
! <fileset dir="${lib.dir}">
! <include name="*.jar" />
! </fileset>
! </path>
!
! <target name="main" depends="init,jar,applet-jar"/>
!
! <target name="init" depends="check.docbook,check.xsl" />
!
! <target name="initFailure">
! <fail message="Init failed. See messages above." />
! </target>
!
! <target name="setup" >
! <uptodate property="jmolGuide.uptodate" targetfile="${generatedSource.dir}/org/openscience/jmol/Data/guide/index.html">
! <srcfiles dir="${doc.dir}/source" includes="JMolGuide.docbook.xml" />
! </uptodate>
! <uptodate property="jmolHistory.uptodate" targetfile="${generatedSource.dir}/org/openscience/jmol/Data/ChangeLog.html">
! <srcfiles dir="${doc.dir}/source" includes="JmolHistory.xml,JmolHistoryToHtml.xsl" />
! </uptodate>
! <uptodate property="jmolDevelopersGuide.uptodate"
! targetfile="${doc.dir}/JmolDevelopersGuide.html">
! <srcfiles dir="${doc.dir}/source" includes="JmolDevelopersGuide.docbook.xml" />
! </uptodate>
! <available file="${docbook.dir}" property="docbook.dir.present"/>
! <available classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar"
! property="xsl.available"/>
! <uptodate property="javadoc.uptodate" targetfile="${javadoc.dir}/index.html">
! <srcfiles dir="${source.dir}" includes="**/*.java" />
! </uptodate>
! </target>
!
! <target name="check.docbook" depends="setup" unless="docbook.dir.present" >
! <echo message="Docbook directory '${docbook.dir}' not found." />
! <echo message="Please set with the argument '-Ddocbook.dir=directory'." />
! <antcall target="initFailure" />
! </target>
!
! <target name="check.xsl" depends="setup" unless="xsl.available" >
! <echo message="XSLT class 'com.icl.saxon.StyleSheet' not found." />
! <antcall target="initFailure" />
! </target>
!
! <target name="jmolGuide" depends="init" unless="jmolGuide.uptodate" >
! <echo message="Generating user's guide" />
! <mkdir dir="${generatedSource.dir}/org/openscience/jmol/Data/guide" />
! <java fork="true" dir="${generatedSource.dir}/org/openscience/jmol/Data/guide"
! classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar" >
! <arg value="${user.dir}/${doc.dir}/source/JMolGuide.docbook.xml" />
! <arg value="${docbook.dir}/html/chunk.xsl" />
! </java>
! </target>
!
! <target name="jmolHistory" depends="init" unless="jmolHistory.uptodate" >
! <echo message="Generating history of changes" />
! <mkdir dir="${generatedSource.dir}/org/openscience/jmol/Data" />
! <java fork="true" dir="${generatedSource.dir}/org/openscience/jmol/Data"
! classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar" >
! <arg value="-o" />
! <arg value="ChangeLog.html" />
! <arg value="${user.dir}/${doc.dir}/source/JmolHistory.xml" />
! <arg value="${user.dir}/${doc.dir}/source/JmolHistoryToHtml.xsl" />
! </java>
! </target>
!
! <target name="doc" depends="jmolDevelopersGuide,javadoc" />
!
! <target name="jmolDevelopersGuide" depends="init" unless="jmolDevelopersGuide.uptodate" >
! <echo message="Generating developer's guide" />
! <java fork="true" dir="${doc.dir}"
! classname="com.icl.saxon.StyleSheet"
! classpath="${lib.dir}/saxon.jar" >
! <arg value="-o" />
! <arg value="${user.dir}/${doc.dir}/JmolDevelopersGuide.html" />
! <arg value="${user.dir}/${doc.dir}/source/JmolDevelopersGuide.docbook.xml" />
! <arg value="${docbook.dir}/html/docbook.xsl" />
! </java>
! </target>
!
! <target name="classes" depends="init,jmolGuide,jmolHistory">
! <mkdir dir="${classes.dir}"/>
! <javac srcdir="${source.dir}" destdir="${classes.dir}"
! debug="on" deprecation="on">
! <classpath refid="project.class.path" />
! </javac>
! <copy todir="${classes.dir}" >
! <fileset dir="${source.dir}">
! <include name="**/*.jpg" />
! <include name="**/*.gif" />
! <include name="**/*.html" />
! <include name="**/*.dtd" />
! <include name="**/Properties/*" />
! <include name="**/Data/*" />
! <include name="**/*.txt" />
! </fileset>
! </copy>
! <copy todir="${classes.dir}" >
! <fileset dir="${generatedSource.dir}">
! <include name="**/*.jpg" />
! <include name="**/*.gif" />
! <include name="**/*.html" />
! </fileset>
! </copy>
! </target>
!
! <target name="applet-classes" >
! <mkdir dir="${applet.classes.dir}"/>
! <javac srcdir="${source.dir}" destdir="${applet.classes.dir}"
! debug="on" deprecation="on" target="1.1"
! includesfile="applet.classes">
! <classpath refid="project.class.path" />
! </javac>
! <copy todir="${applet.classes.dir}" >
! <fileset dir="${source.dir}">
! <include name="**/applet/Data/*" />
! <include name="**/*.dtd" />
! <include name="**/*.txt" />
! </fileset>
! </copy>
! </target>
!
! <target name="jar" depends="init,classes">
! <jar jarfile="${lib.dir}/jmol.jar" manifest="${manifest}" >
! <fileset dir="${classes.dir}" >
! <exclude name="**/.*" />
! <exclude name="**/Test*.class" />
! <exclude name="**/jmol/applet/*" />
! <include name="**/jmol/**" />
! <include name="com/**" />
! <include name="freeware/**" />
! </fileset>
! </jar>
! </target>
!
! <target name="applet-jar" depends="applet-classes">
! <jar jarfile="${lib.dir}/jmol-applet.jar" >
! <fileset dir="${applet.classes.dir}" >
! <exclude name="**/.*" />
! <include name="**/jmol/**" />
! </fileset>
! </jar>
! </target>
!
! <target name="dist" depends="jar,applet-jar">
! <mkdir dir="${dist.dir}/jmol-${version}"/>
! <copy todir="${dist.dir}/jmol-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol-applet.jar" />
! <exclude name="swing.jar" />
! <exclude name="junit.jar" />
! <exclude name="saxon.jar" />
! </fileset>
! </copy>
! <copy todir="${dist.dir}/jmol-${version}" >
! <fileset dir=".">
! <include name="jmol" />
! <include name="jmol.mac" />
! <include name="jmol.bat" />
! <include name="*.txt" />
! </fileset>
! </copy>
! <chmod perm="+x">
! <fileset dir="${dist.dir}/jmol-${version}">
! <include name="jmol"/>
! <include name="jmol.bat"/>
! </fileset>
! </chmod>
! <copy todir="${dist.dir}/jmol-${version}/samples" >
! <fileset dir="samples" />
! </copy>
!
! <mkdir dir="${dist.dir}/jmol-applet-${version}"/>
! <copy todir="${dist.dir}/jmol-applet-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol.jar" />
! <exclude name="jas.jar" />
! <exclude name="Acme.jar" />
! <exclude name="swing.jar" />
! <exclude name="junit.jar" />
! <exclude name="multi.jar" />
! <exclude name="saxon.jar" />
! </fileset>
! </copy>
! <copy todir="${dist.dir}/jmol-applet-${version}" >
! <fileset dir=".">
! <include name="*.txt" />
! </fileset>
! </copy>
! </target>
!
! <target name="dist.zip" depends="dist">
! <zip zipfile="jmol-${version}.zip" basedir="${dist.dir}"
! includes="jmol-${version}/**" />
!
! <zip zipfile="jmol-applet-${version}.zip" basedir="${dist.dir}"
! includes="jmol-applet-${version}/**" />
! </target>
!
! <target name="dist.tar.gz" depends="dist">
! <tar tarfile="jmol-${version}.tar" basedir="${dist.dir}" excludes="**">
! <!-- The excludes="**" attribute in the tag above is a workaround
! for a problem in Ant 1.3 -->
! <tarfileset dir="${dist.dir}" mode="755">
! <include name="jmol-${version}/jmol"/>
! <include name="jmol-${version}/jmol.bat"/>
! </tarfileset>
! <tarfileset dir="${dist.dir}">
! <include name="jmol-${version}/**"/>
! <exclude name="jmol-${version}/jmol"/>
! <exclude name="jmol-${version}/jmol.bat"/>
! </tarfileset>
! </tar>
! <gzip zipfile="jmol-${version}.tar.gz" src="jmol-${version}.tar"/>
! <delete file="jmol-${version}.tar" />
!
! <tar tarfile="jmol-applet-${version}.tar" basedir="${dist.dir}"
! includes="jmol-applet-${version}/**"/>
! <gzip zipfile="jmol-applet-${version}.tar.gz" src="jmol-applet-${version}.tar"/>
! <delete file="jmol-applet-${version}.tar" />
! </target>
!
! <target name="sourcedist">
! <mkdir dir="${sourcedist.dir}/jmol-${version}"/>
! <copy todir="${sourcedist.dir}/jmol-${version}/${lib.dir}" >
! <fileset dir="${lib.dir}">
! <exclude name="jmol*.jar" />
! </fileset>
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}" >
! <fileset dir=".">
! <include name="*" />
! </fileset>
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/${source.dir}" >
! <fileset dir="${source.dir}" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/${doc.dir}" >
! <fileset dir="${doc.dir}" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/samples" >
! <fileset dir="samples" />
! </copy>
! <copy todir="${sourcedist.dir}/jmol-${version}/packaging" >
! <fileset dir="packaging" />
! </copy>
! </target>
!
! <target name="sourcedist.zip" depends="sourcedist">
! <zip zipfile="jmol-${version}.source.zip" basedir="${sourcedist.dir}" includes="**" />
! </target>
!
! <target name="sourcedist.tar.gz" depends="sourcedist">
! <tar tarfile="jmol-${version}.source.tar" basedir="${sourcedist.dir}"
! excludes="**">
! <!-- The excludes="**" attribute in the tag above is a workaround
! for a problem in Ant 1.3 -->
! <tarfileset dir="${sourcedist.dir}" mode="755">
! <include name="jmol-${version}/jmol"/>
! <include name="jmol-${version}/jmol.bat"/>
! </tarfileset>
! <tarfileset dir="${sourcedist.dir}">
! <include name="jmol-${version}/**"/>
! <exclude name="jmol-${version}/jmol"/>
! <exclude name="jmol-${version}/jmol.bat"/>
! </tarfileset>
! </tar>
! <gzip zipfile="jmol-${version}.source.tar.gz" src="jmol-${version}.source.tar"/>
! <delete file="jmol-${version}.source.tar" />
! </target>
!
! <target name="clean">
! <delete dir="${generatedSource.dir}"/>
! <delete dir="${classes.dir}"/>
! <delete dir="${applet.classes.dir}"/>
! <delete>
! <fileset dir="${lib.dir}">
! <include name="jmol.jar" />
! <include name="jmol-applet.jar" />
! </fileset>
! <fileset dir=".">
! <include name="jmol-*.zip" />
! <include name="jmol-*.tar.gz" />
! </fileset>
! </delete>
! <delete dir="${javadoc.dir}"/>
! <delete dir="${dist.dir}"/>
! <delete dir="${sourcedist.dir}"/>
! </target>
!
! <target name="run" depends="classes">
! <java fork="true" classname="org.openscience.jmol.Jmol">
! <classpath location="classes" />
! <classpath refid="project.class.path" />
! </java>
! </target>
!
! <target name="runtests" depends="classes">
! <java fork="true" classname="org.openscience.jmol.TestAll">
! <classpath location="classes" />
! <classpath refid="project.class.path" />
! </java>
! </target>
!
! <target name="javadoc" depends="init" unless="javadoc.uptodate">
! <mkdir dir="${javadoc.dir}"/>
! <javadoc destdir="${javadoc.dir}" sourcepath="src"
! private="true" packagenames="org.openscience.*">
! <classpath refid="project.class.path" />
! </javadoc>
! </target>
</project>
Index: changelog
===================================================================
RCS file: /cvsroot/jmol/Jmol/packaging/debian/changelog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** changelog 5 Jun 2001 18:46:06 -0000 1.4
--- changelog 20 Apr 2002 12:07:20 -0000 1.5
***************
*** 1,2 ****
--- 1,12 ----
+ jmol (2-1) unstable; urgency=low
+
+ * new upstream version
+ * conform woody Java policy
+ * relicensed to LGPL
+ * now properly requires docbook stylesheets
+ * no longer able to make a .diff.gz
+
+ -- E.L. Willighagen (Egon) <eg...@sc...> Sat, 20 Apr 2002 09:09:16 +0200
+
jmol (1-3) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvsroot/jmol/Jmol/packaging/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** control 5 Jun 2001 08:19:47 -0000 1.3
--- control 20 Apr 2002 12:07:20 -0000 1.4
***************
*** 1,4 ****
Source: jmol
! Build-Depends: ant (>= 1.3), jikes, debmake
Section: x11
Priority: optional
--- 1,4 ----
Source: jmol
! Build-Depends: ant (>= 1.4), jikes, docbook-xsl, xsltproc
Section: x11
Priority: optional
Index: jmol
===================================================================
RCS file: /cvsroot/jmol/Jmol/packaging/debian/jmol,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** jmol 6 May 2001 20:39:40 -0000 1.1
--- jmol 20 Apr 2002 12:07:20 -0000 1.2
***************
*** 13,17 ****
# This classpath line should be OK for JDK 1.1. Comment it out if you have 1.2
#
! CLASSPATH=${JAVALIBS}/jmol.jar:$JAVA_HOME/lib/classes.zip:$JAVA_HOME/lib/rt.jar:${EXTRALIBS}/swing.jar:${EXTRALIBS}/multi.jar:${JAVALIBS}/repository:${EXTRALIBS}/aelfred.jar:${EXTRALIBS}/cml.jar:${EXTRALIBS}/Acme.jar:${EXTRALIBS}/vecmath1.1-1.12.jar:${EXTRALIBS}/jas.jar
export CLASSPATH
--- 13,17 ----
# This classpath line should be OK for JDK 1.1. Comment it out if you have 1.2
#
! CLASSPATH=${JAVALIBS}/jmol.jar:$JAVA_HOME/lib/classes.zip:$JAVA_HOME/lib/rt.jar:${EXTRALIBS}/swing.jar:${EXTRALIBS}/multi.jar:${JAVALIBS}/repository:${EXTRALIBS}/gnujaxp.jar:${EXTRALIBS}/cdk-cml.jar:${EXTRALIBS}/Acme.jar:${EXTRALIBS}/vecmath1.1-1.12.jar:${EXTRALIBS}/jas.jar
export CLASSPATH
|