Menu
▾
▴
[Tomtesttool-svn] SF.net SVN: tomtesttool: [7] trunk
|
From: <ru...@us...> - 2008-01-20 17:02:09
|
Revision: 7
http://tomtesttool.svn.sourceforge.net/tomtesttool/?rev=7&view=rev
Author: rumbi
Date: 2008-01-20 09:02:00 -0800 (Sun, 20 Jan 2008)
Log Message:
-----------
RR: no idea what I did, see ChangeLog
Modified Paths:
--------------
trunk/build.xml
trunk/buildsettings.properties
trunk/docs/ChangeLog
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-09-10 12:04:06 UTC (rev 6)
+++ trunk/build.xml 2008-01-20 17:02:00 UTC (rev 7)
@@ -1,118 +1,118 @@
<?xml version="1.0"?>
<project name="TOM" default="usage" basedir=".">
- <!--
- Might the user be allowed to override our beautiful
- and timeconsuming configuration without hurting this sensitive file.
- The creators of this project have spoken
- -->
- <property file=".ant.properties" />
- <property file="${user.home}/.ant.properties" />
- <property file="buildsettings.properties" />
+ <!--
+ Might the user be allowed to override our beautiful
+ and timeconsuming configuration without hurting this sensitive file.
+ The creators of this project have spoken
+ -->
+ <property file=".ant.properties" />
+ <property file="${user.home}/.ant.properties" />
+ <property file="buildsettings.properties" />
- <target name="init">
- <mkdir dir="${dirs.build}" />
- <mkdir dir="${dirs.build.jars}" />
- <mkdir dir="${dirs.build.code}" />
- <mkdir dir="${dirs.build.src}" />
- <mkdir dir="${dirs.dist}" />
+ <target name="init">
+ <mkdir dir="${dirs.build}" />
+ <mkdir dir="${dirs.build.jars}" />
+ <mkdir dir="${dirs.build.code}" />
+ <mkdir dir="${dirs.build.src}" />
+ <mkdir dir="${dirs.dist}" />
- <unjar dest="${dirs.build.code}" src="${jars.itext}" />
- </target>
+ <unjar dest="${dirs.build.code}" src="${jars.itext}" />
+ </target>
- <target name="usage">
- <echo level="info">compile ----------------- compile, do not package</echo>
- <echo level="info">TOM.jar ----------------- build executable jar</echo>
- <echo level="info">javadocs ---------------- construct javadocs for the whole project</echo>
- <echo level="info">dist -------------------- create a source + javadocs distribution</echo>
- <echo level="info">clean ------------------- remove all .jar and .class files</echo>
- <echo level="info">distclean --------------- remove all .jar and .class files, as well</echo>
- <echo level="info"> as the build and dist directories</echo>
- </target>
+ <target name="usage">
+ <echo level="info">compile ----------------- compile, do not package</echo>
+ <echo level="info">TOM.jar ----------------- build executable jar</echo>
+ <echo level="info">javadocs ---------------- construct javadocs for the whole project</echo>
+ <echo level="info">dist -------------------- create a source + javadocs distribution</echo>
+ <echo level="info">clean ------------------- remove all .jar and .class files</echo>
+ <echo level="info">distclean --------------- remove all .jar and .class files, as well</echo>
+ <echo level="info"> as the build and dist directories</echo>
+ </target>
- <target name="compile" depends="init">
- <javac srcdir="${dirs.de}" destdir="${dirs.build.code}" deprecation="on" source="${java.version.used}" classpath="${dirs.build.code}" debug="true" debuglevel="lines,source" />
- <copy todir="${dirs.build.code}">
- <fileset dir="${dirs.src}">
- <include name="**/resources/**" />
- <exclude name="**/*.java" />
- <exclude name="**/*.pdf" />
- <exclude name="**/*.zip" />
- <exclude name="**/*.jar" />
- <exclude name="**/tom.cfg" />
- </fileset>
- </copy>
- </target>
+ <target name="compile" depends="init">
+ <javac srcdir="${dirs.de}" destdir="${dirs.build.code}" deprecation="on" source="${java.version.used}" classpath="${dirs.build.code}" debug="true" debuglevel="lines,source" />
+ <copy todir="${dirs.build.code}">
+ <fileset dir="${dirs.src}">
+ <include name="**/resources/**" />
+ <exclude name="**/*.java" />
+ <exclude name="**/*.pdf" />
+ <exclude name="**/*.zip" />
+ <exclude name="**/*.jar" />
+ <exclude name="**/tom.cfg" />
+ </fileset>
+ </copy>
+ </target>
- <target name="TOM.jar" depends="compile">
- <manifest file="${manifest.path}/${manifest.name}">
- <attribute name="Main-Class" value="de.sopra.controller.TOM" />
- </manifest>
+ <target name="TOM.jar" depends="compile">
+ <manifest file="${manifest.path}/${manifest.name}">
+ <attribute name="Main-Class" value="de.sopra.controller.TOM" />
+ </manifest>
- <jar destfile="${dirs.build.jars}/TOM.jar" manifest="${manifest.path}/${manifest.name}">
- <fileset dir="${basedir}">
- <include name="src/" />
- <include name="docs/" />
- <include name="*.lang" />
- <exclude name="**/*.jar" />
- <exclude name="**/*.zip" />
- <exclude name="**/resoures/tom.cfg" />
- </fileset>
- <fileset dir="${dirs.build.code}" />
- </jar>
+ <jar destfile="${dirs.build.jars}/TOM-${version}.jar" manifest="${manifest.path}/${manifest.name}">
+ <fileset dir="${basedir}">
+ <include name="src/" />
+ <include name="docs/" />
+ <include name="*.lang" />
+ <exclude name="**/*.jar" />
+ <exclude name="**/*.zip" />
+ <exclude name="**/resoures/tom.cfg" />
+ </fileset>
+ <fileset dir="${dirs.build.code}" />
+ </jar>
- <copy todir="${dirs.dist}" file="${dirs.build.jars}/TOM.jar" />
- <copy todir="${dirs.dist}" file="${pdfs.handbuch}" />
- </target>
+ <copy todir="${dirs.dist}" file="${dirs.build.jars}/TOM-${version}.jar" />
+ <copy tofile="${dirs.dist}/${pdfs.manual.version.de}" file="${basedir}/${pdfs.manual.de}" />
+ </target>
- <target name="languages">
- <zip destfile="${dirs.dist}/langs.zip">
- <fileset dir="${basedir}">
- <include name="*.lang" />
- </fileset>
- </zip>
- <tar compression="none" tarfile="${dirs.dist}/langs.tar">
- <tarfileset dir="${basedir}">
- <include name="*.lang" />
- </tarfileset>
- </tar>
- <bzip2 destfile="${dirs.dist}/langs.tar.bz2" src="${dirs.dist}/langs.tar" />
- <gzip destfile="${dirs.dist}/langs.tar.gz" src="${dirs.dist}/langs.tar" />
- </target>
+ <target name="languages">
+ <zip destfile="${dirs.dist}/langs-${version}.zip">
+ <fileset dir="${basedir}">
+ <include name="*.lang" />
+ </fileset>
+ </zip>
+ <tar compression="none" tarfile="${dirs.dist}/langs-${version}.tar">
+ <tarfileset dir="${basedir}">
+ <include name="*.lang" />
+ </tarfileset>
+ </tar>
+ <bzip2 destfile="${dirs.dist}/langs-${version}.tar.bz2" src="${dirs.dist}/langs-${version}.tar" />
+ <gzip destfile="${dirs.dist}/langs-${version}.tar.gz" src="${dirs.dist}/langs-${version}.tar" />
+ </target>
- <target name="dist" depends="distclean,TOM.jar,languages,javadocs" />
+ <target name="dist" depends="distclean,TOM.jar,languages,javadocs" />
- <target name="javadoc" depends="javadocs" />
+ <target name="javadoc" depends="javadocs" />
- <target name="javadocs" depends="init">
- <javadoc access="public" author="true" classpath="." destdir="${dirs.build.javadocs}" doctitle="${name}" windowtitle="${name} - Javadoc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="${java.version.used}" sourcepath="${dirs.src}" splitindex="true" use="true" version="true" encoding="utf-8" serialwarn="false">
- <fileset dir="${dirs.de}" />
- <fileset dir="${dirs.resources}" />
- <link href="${links.j2se}" />
- </javadoc>
+ <target name="javadocs" depends="init">
+ <javadoc access="public" author="true" classpath="." destdir="${dirs.build.javadocs}" doctitle="${name}" windowtitle="${name} - Javadoc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="${java.version.used}" sourcepath="${dirs.src}" splitindex="true" use="true" version="true" encoding="utf-8" serialwarn="false">
+ <fileset dir="${dirs.de}" />
+ <fileset dir="${dirs.resources}" />
+ <link href="${links.j2se}" />
+ </javadoc>
- <copy todir="${dirs.dist}/javadocs">
- <fileset dir="${dirs.build.javadocs}" />
- </copy>
- </target>
+ <copy todir="${dirs.dist}/javadocs-${version}">
+ <fileset dir="${dirs.build.javadocs}" />
+ </copy>
+ </target>
- <target name="develdocs" depends="init">
- <javadoc access="private" author="true" classpath="." destdir="${dirs.build.develdocs}" doctitle="${name}" windowtitle="${name} - Javadoc for developers" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="${java.version.used}" sourcepath="${dirs.src}" splitindex="true" use="true" version="true" encoding="utf-8" serialwarn="false">
- <fileset dir="${dirs.de}" />
- <fileset dir="${dirs.resources}" />
- <link href="${links.j2se}" />
- <link href="${links.itext}" />
- </javadoc>
+ <target name="develdocs" depends="init">
+ <javadoc access="private" author="true" classpath="." destdir="${dirs.build.develdocs}" doctitle="${name}" windowtitle="${name} - Javadoc for developers" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="${java.version.used}" sourcepath="${dirs.src}" splitindex="true" use="true" version="true" encoding="utf-8" serialwarn="false">
+ <fileset dir="${dirs.de}" />
+ <fileset dir="${dirs.resources}" />
+ <link href="${links.j2se}" />
+ <link href="${links.itext}" />
+ </javadoc>
- <copy todir="${dirs.dist}/develdocs">
- <fileset dir="${dirs.build.develdocs}" />
- </copy>
- </target>
+ <copy todir="${dirs.dist}/develdocs-${version}">
+ <fileset dir="${dirs.build.develdocs}" />
+ </copy>
+ </target>
- <target name="clean">
- <delete dir="${dirs.build}" />
- </target>
+ <target name="clean">
+ <delete dir="${dirs.build}" />
+ </target>
- <target name="distclean" depends="clean">
- <delete dir="${dirs.dist}" />
- </target>
-</project>
\ No newline at end of file
+ <target name="distclean" depends="clean">
+ <delete dir="${dirs.dist}" />
+ </target>
+</project>
Modified: trunk/buildsettings.properties
===================================================================
--- trunk/buildsettings.properties 2007-09-10 12:04:06 UTC (rev 6)
+++ trunk/buildsettings.properties 2008-01-20 17:02:00 UTC (rev 7)
@@ -1,5 +1,6 @@
# generic variables
name=TOM
+version=1.0.1
java.version.used=1.6
# directories
@@ -22,7 +23,8 @@
# files
jars.itext=${dirs.resources}/itext-2.0.3.jar
-pdfs.handbuch=${basedir}/Handbuch.pdf
+pdfs.manual.de=Handbuch.pdf
+pdfs.manual.version.de=Handbuch-${version}.pdf
# links
links.j2se=http://java.sun.com/javase/6/docs/api
Modified: trunk/docs/ChangeLog
===================================================================
--- trunk/docs/ChangeLog 2007-09-10 12:04:06 UTC (rev 6)
+++ trunk/docs/ChangeLog 2008-01-20 17:02:00 UTC (rev 7)
@@ -1,4 +1,10 @@
-2007-10-08 Reinhold Rumberger <ru...@us...>
+2007-09-11 Reinhold Rumberger <ru...@us...>
+ * corrected date in previous entry
+ * adapted build.xml and buildsettings.properties to include version numbers in
+ distribution builds because the sf release system can't handle multiple files
+ with the same names
+
+2007-09-10 Reinhold Rumberger <ru...@us...>
* some bugs due to missing spaces at the end of lines in *.lang files
2007-09-08 Reinhold Rumberger <ru...@us...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
