r1895 - in trunk/dresden-ocl: . debian debian/patches

Wolfgang Bär wbaer-guest at costa.debian.org
Thu Feb 9 22:10:10 UTC 2006


Author: wbaer-guest
Date: 2006-02-09 22:10:10 +0000 (Thu, 09 Feb 2006)
New Revision: 1895

Added:
   trunk/dresden-ocl/debian/ant.properties
Removed:
   trunk/dresden-ocl/build.xml
   trunk/dresden-ocl/debian/patches/01-build_xml.dpatch
Modified:
   trunk/dresden-ocl/debian/changelog
   trunk/dresden-ocl/debian/control
   trunk/dresden-ocl/debian/rules
Log:
dresden-ocl (1.1-9) unstable; urgency=low

  * Move to main - build with kaffe and passes junit tests
  * Added build-dependency on libxerces2-java
  * Added ant.properties file to make xerces known to junit tests
  * kaffe compiler transition
  * Bumped debhelper version to fix linda error
  * Enable junit tests
  * Added myself to uploaders


Deleted: trunk/dresden-ocl/build.xml
===================================================================
--- trunk/dresden-ocl/build.xml	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/build.xml	2006-02-09 22:10:10 UTC (rev 1895)
@@ -1,988 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-dresden-ocl build file
-
-Process this file with ant (http://jakarta.apache.org).
-
-Authored by Dan Shields <daniel at pointrelease.com>.
-Derived from first version by Luc Maisonobe <Luc.Maisonobe at cnes.fr>,
-but heavily reworked.
-New version by Ralf Wiebicke.
-Enhancements by Steffen Zschaler.
--->
-
-<project name="dresden-ocl" default="all" basedir=".">
-
-  <property environment="env" /> <!-- include environment variables -->
-
-  <property name="src.dir"   value="${basedir}/src" />
-  <property name="build.dir" value="${basedir}/build" />
-  <property name="dist.dir"  value="${basedir}/dist" />
-  <property name="docs.dir"  value="${basedir}/api"   />
-  <property name="jars.dir"  value="/usr/share/java" />
-
-  <property name="xerces.jar" value="${jars.dir}/xerces.jar" />
-  <property name="nsuml.jar"  value="${jars.dir}/nsuml.jar" />
-  <property name="jdom.jar"   value="${jars.dir}/jdom.jar" />
-  <property name="junit.jar"  value="${jars.dir}/junit.jar"  />
-
-  <property file="local.properties" />
-
-  <property name="example.dir" value="${build.dir}/example.test" />
-  <property name="royloy.dir"  value="${build.dir}/royloy.test" />
-
-  <target name="info">
-    <echo message="Target info is obsolete, use ant -projecthelp instead." />
-  </target>
-
-  <target name="prepare">
-    <echo message="JDK ${java.version} found, make sure, it is at least 1.3." />
-    <echo message="${ant.version} found, make sure it is at least 1.4." />
-    <echo message="Compiler is ${build.compiler}, dependency check is ${build.depend}" />
-
-    <!-- find ant.jar, search a few possible locations... -->
-    <condition property="path.jar.ant" value="${env.ANT_HOME}/lib/ant.jar">
-      <available file="${env.ANT_HOME}/lib/ant.jar" type="file" />
-    </condition>
-    <condition property="path.jar.ant" value="/usr/share/java/ant.jar">
-      <and>
-        <not>
-          <available file="${env.ANT_HOME}/lib/ant.jar" type="file" /> <!-- a string comparison might be simpler here... -->
-        </not>
-        <available file="/usr/share/java/ant.jar" type="file" />
-      </and>
-    </condition>
-
-    <echo message="Trying to use ant.jar from ${path.jar.ant}." />
-  </target>
-
-
-  <target name="sablecc.checkRequired" depends="prepare">
-    <uptodate property="sablecc.notRequired"
-              targetfile="${src.dir}/tudresden/ocl/parser/parser/parser.dat" >
-      <srcfiles dir="${jars.dir}" includes="sablecc.jar"/>
-      <srcfiles dir="${src.dir}" includes="ocl.grammar" />
-    </uptodate>
-  </target>
-
-  <target name="sablecc"
-          description="Generates the OCL parser using SableCC."
-          depends="prepare,sablecc.checkRequired"
-          unless="sablecc.notRequired">
-    <taskdef name="sablecc"
-             classname="org.sablecc.ant.taskdef.Sablecc"
-             classpath="${jars.dir}/sablecc.jar"
-    />
-    <sablecc outputdirectory="${src.dir}" src="${src.dir}">
-      <include name="ocl.grammar" />
-    </sablecc>
-  </target>
-
-  <target name="sablecc.clean">
-    <delete>
-      <fileset dir="${src.dir}/tudresden/ocl/parser/analysis" includes="*.java"/>
-      <fileset dir="${src.dir}/tudresden/ocl/parser/lexer"    includes="*.java,lexer.dat"/>
-      <fileset dir="${src.dir}/tudresden/ocl/parser/parser"   includes="*.java,parser.dat"/>
-      <fileset dir="${src.dir}/tudresden/ocl/parser/node"     includes="*.java"/>
-    </delete>
-  </target>
-
-
-  <target name="compile"
-          description="Compiles all java files into the source directory."
-          depends="sablecc">
-    <javac srcdir= "${src.dir}"
-           destdir="${src.dir}"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="off">
-      <include name="tudresden/**" />
-      <classpath>
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${nsuml.jar}" />
-        <pathelement location="${junit.jar}" />
-        <pathelement location="${nsuml.jar}" />
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="compile.clean">
-    <delete>
-      <fileset dir="${src.dir}/tudresden" includes="**/*.class" />
-    </delete>
-  </target>
-
-
-  <target name="test"
-          description="Runs all tests."
-          depends="test.junit, test.example, test.royloy, test.dresden-ocl-injector"
-  />
-
-  <target name="test.junit"
-          description="Runs JUnit tests."
-          depends="compile,build.dir">
-    <java classname="junit.textui.TestRunner"
-          taskname="junit"
-          fork="yes"
-          failonerror="yes"
-    >
-          <!-- does not work without fork, don't know why -->
-      <classpath>
-        <pathelement location="${src.dir}" />
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${junit.jar}" />
-        <pathelement location="${nsuml.jar}" />
-      </classpath>
-      <arg value="tudresden.ocl.test.TestAll" />
-      <sysproperty key="tudresden.ocl.test.tempdir" value="${build.dir}"/>
-    </java>
-  </target>
-
-
-  <target name="build.dir" depends="prepare">
-    <mkdir dir="${build.dir}"/>
-  </target>
-
-
-  <target name="jar.dresden-ocl-lib"
-          description="Compiles and jars the OCL Runtime Library."
-          depends="build.dir">
-    <mkdir dir="${build.dir}/dresden-ocl-lib" />
-
-    <copy todir="${build.dir}/dresden-ocl-lib">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/lib/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/injection/ocl/lib/*.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-ocl-lib"
-           destdir="${build.dir}/dresden-ocl-lib"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on">
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-ocl-lib.jar"
-         basedir="${build.dir}/dresden-ocl-lib"
-         excludes="**/*.java"
-    />
-  </target>
-
-
-  <target name="jar.ocl-argo"
-          description="Compiles and jars the OCL for Argo/UML package."
-          depends="sablecc,build.dir">
-
-    <mkdir dir="${build.dir}/ocl-argo" />
-
-    <copy todir="${build.dir}/ocl-argo">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/*.java" />
-        <exclude name="tudresden/ocl/ConstraintEvaluation.java" />
-        <exclude name="tudresden/ocl/SQLTestApp.java" />
-        <exclude name="tudresden/ocl/DocCheck.java" />
-        <exclude name="tudresden/ocl/ConstraintApplet.java" />
-        <exclude name="tudresden/ocl/ASTViewer.java" />
-        <exclude name="tudresden/ocl/ASTApplet.java" />
-        <include name="tudresden/ocl/images/*.gif" />
-        <include name="tudresden/ocl/images/SUNIMAGELICENSE" />
-        <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-        <include name="tudresden/ocl/parser/lexer/lexer.dat" />
-        <include name="tudresden/ocl/parser/parser/parser.dat" />
-        <include name="tudresden/ocl/lib/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/normalize/*.java" />
-        <include name="tudresden/ocl/check/*.java" />
-        <include name="tudresden/ocl/check/bootstrap/*.java" />
-        <include name="tudresden/ocl/check/types/*.java" />
-        <include name="tudresden/ocl/codegen/*.java" />
-        <include name="tudresden/ocl/parser/*.java" />
-        <include name="tudresden/ocl/parser/analysis/*.java" />
-        <include name="tudresden/ocl/parser/node/*.java" />
-        <include name="tudresden/ocl/parser/lexer/*.java" />
-        <include name="tudresden/ocl/parser/parser/*.java" />
-        <include name="tudresden/ocl/gui/*.java" />
-        <include name="tudresden/ocl/gui/events/*.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/ocl-argo"
-           destdir="${build.dir}/ocl-argo"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-    </javac>
-
-    <jar jarfile="${build.dir}/ocl-argo.jar"
-         basedir="${build.dir}/ocl-argo"
-         excludes="**/*.java"
-    />
-  </target>
-
-
-  <target name="jar.dresden-ocl-injector"
-          description="Compiles and jars the OCL for Java package."
-          depends="sablecc,build.dir">
-    <mkdir dir="${build.dir}/dresden-ocl-injector" />
-
-    <copy todir="${build.dir}/dresden-ocl-injector">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/*.java" />
-        <exclude name="tudresden/ocl/ConstraintEvaluation.java" />
-        <exclude name="tudresden/ocl/SQLTestApp.java" />
-        <exclude name="tudresden/ocl/DocCheck.java" />
-        <exclude name="tudresden/ocl/ConstraintApplet.java" />
-        <exclude name="tudresden/ocl/ASTViewer.java" />
-        <exclude name="tudresden/ocl/ASTApplet.java" />
-        <include name="tudresden/ocl/parser/*.java" />
-        <include name="tudresden/ocl/parser/analysis/*.java" />
-        <include name="tudresden/ocl/parser/node/*.java" />
-        <include name="tudresden/ocl/parser/lexer/*.java" />
-        <include name="tudresden/ocl/parser/lexer/lexer.dat" />
-        <include name="tudresden/ocl/parser/parser/*.java" />
-        <include name="tudresden/ocl/parser/parser/parser.dat" />
-        <include name="tudresden/ocl/lib/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/injection/ocl/lib/*.java" />
-        <include name="tudresden/ocl/normalize/*.java" />
-        <include name="tudresden/ocl/check/*.java" />
-        <include name="tudresden/ocl/check/types/*.java" />
-        <include name="tudresden/ocl/check/bootstrap/*.java" />
-        <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-        <include name="tudresden/ocl/codegen/*.java" />
-        <include name="tudresden/ocl/injection/*.java" />
-        <include name="tudresden/ocl/injection/ocl/*.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-ocl-injector"
-           destdir="${build.dir}/dresden-ocl-injector"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-ocl-injector.jar"
-         basedir="${build.dir}/dresden-ocl-injector"
-         excludes="**/*.java"
-         manifest="${src.dir}/injector.manifest"
-    />
-  </target>
-
-
-  <target name="jar.dresden-injector"
-          depends="build.dir">
-    <echo message="EXPERIMENTAL: Compiles and jars the Java Injection package. This is without OCL." />
-
-    <mkdir dir="${build.dir}/dresden-injector" />
-
-    <copy todir="${build.dir}/dresden-injector">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/injection/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/check/OclTypeException.java" />
-        <include name="tudresden/ocl/parser/OclParserException.java" />
-        <include name="tudresden/ocl/OclException.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-injector"
-           destdir="${build.dir}/dresden-injector"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-injector.jar"
-         basedir="${build.dir}/dresden-injector"
-         excludes="**/*.java"
-    />
-  </target>
-
-
-  <target name="jar.dresden-ocl-demo"
-          description="Compiles and jars the OCL Demo Applet."
-          depends="sablecc,build.dir">
-
-    <mkdir dir="${build.dir}/dresden-ocl-demo" />
-
-    <copy todir="${build.dir}/dresden-ocl-demo">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/images/*.gif" />
-        <include name="tudresden/ocl/images/SUNIMAGELICENSE" />
-        <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-        <include name="tudresden/ocl/parser/lexer/lexer.dat" />
-        <include name="tudresden/ocl/parser/parser/parser.dat" />
-        <include name="tudresden/ocl/test/royloy/*.java" />
-        <include name="tudresden/ocl/*.java" />
-        <include name="tudresden/ocl/lib/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/injection/ocl/lib/*.java" />
-        <include name="tudresden/ocl/normalize/*.java" />
-        <include name="tudresden/ocl/check/*.java" />
-        <include name="tudresden/ocl/check/bootstrap/*.java" />
-        <include name="tudresden/ocl/check/types/*.java" />
-        <include name="tudresden/ocl/codegen/*.java" />
-        <include name="tudresden/ocl/parser/*.java" />
-        <include name="tudresden/ocl/parser/analysis/*.java" />
-        <include name="tudresden/ocl/parser/node/*.java" />
-        <include name="tudresden/ocl/parser/lexer/*.java" />
-        <include name="tudresden/ocl/parser/parser/*.java" />
-        <include name="tudresden/ocl/gui/*.java" />
-        <include name="tudresden/ocl/gui/events/*.java" />
-        <include name="tudresden/ocl/check/types/xmifacade/*.java" />
-        <include name="tudresden/ocl/check/types/testfacade/*.java" />
-        <include name="tudresden/ocl/injection/*.java" />
-        <include name="tudresden/ocl/injection/ocl/*.java" />
-        <include name="tudresden/ocl/codegen/decl/*.java" />
-        <include name="tudresden/ocl/sql/*.java" />
-        <include name="tudresden/ocl/sql/orstrategy/*.java" />
-        <include name="tudresden/ocl/sql/gui/*.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-ocl-demo"
-           destdir="${build.dir}/dresden-ocl-demo"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-      <classpath>
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${nsuml.jar}" />
-      </classpath>
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-ocl-demo.jar"
-         basedir="${build.dir}/dresden-ocl-demo"
-         manifest="${src.dir}/demo.manifest">
-      <include name="**/*.class" />
-      <include name="**/*.dat" />
-      <include name="**/*.gif" />
-      <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-      <include name="tudresden/ocl/test/royloy/*.java" />
-      <include name="COPYING" />
-    </jar>
-  </target>
-
-
-  <target name="jar.royloy"
-          description="Compiles and jars the example code for dresden-ocl-injector.jar."
-          depends="build.dir,jar.dresden-ocl-lib">
-
-    <mkdir dir="${build.dir}/royloy" />
-
-    <copy todir="${build.dir}/royloy">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/test/royloy/*.java" />
-        <include name="tudresden/ocl/test/royloy/oclexpressions" />
-        <include name="tudresden/ocl/test/TestInjection.java" />
-        <include name="tudresden/ocl/test/TestInjectionRoyloy.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/royloy"
-           destdir="${build.dir}/royloy"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-lib.jar" />
-      </classpath>
-    </javac>
-
-    <jar jarfile="${build.dir}/royloy.jar"
-         basedir="${build.dir}/royloy"
-    />
-  </target>
-
-  <target name="jar.dresden-ocl-sql"
-          description="Compiles and jars the OCL2SQL application."
-          depends="sablecc,build.dir">
-
-    <mkdir dir="${build.dir}/dresden-ocl-sql" />
-
-    <copy todir="${build.dir}/dresden-ocl-sql">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/images/*.gif" />
-        <include name="tudresden/ocl/images/SUNIMAGELICENSE" />
-        <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-        <include name="tudresden/ocl/parser/lexer/lexer.dat" />
-        <include name="tudresden/ocl/parser/parser/parser.dat" />
-        <include name="tudresden/ocl/codegen/decl/OCL2SQL4SQL92.xml" />
-        <include name="tudresden/ocl/codegen/decl/OCL2SQL4Oracle.xml" />
-        <include name="tudresden/ocl/codegen/decl/MappingRules.dtd" />
-        <include name="tudresden/ocl/*.java" />
-        <include name="tudresden/ocl/lib/*.java" />
-        <include name="tudresden/ocl/normalize/*.java" />
-        <include name="tudresden/ocl/check/*.java" />
-        <include name="tudresden/ocl/check/bootstrap/*.java" />
-        <include name="tudresden/ocl/check/types/*.java" />
-        <include name="tudresden/ocl/check/types/xmifacade/*.java" />
-        <include name="tudresden/ocl/check/types/testfacade/*.java" />
-        <include name="tudresden/ocl/codegen/*.java" />
-        <include name="tudresden/ocl/codegen/decl/*.java" />
-        <include name="tudresden/ocl/parser/*.java" />
-        <include name="tudresden/ocl/parser/analysis/*.java" />
-        <include name="tudresden/ocl/parser/node/*.java" />
-        <include name="tudresden/ocl/parser/lexer/*.java" />
-        <include name="tudresden/ocl/parser/parser/*.java" />
-        <include name="tudresden/ocl/gui/*.java" />
-        <include name="tudresden/ocl/gui/events/*.java" />
-        <include name="tudresden/ocl/sql/*.java" />
-        <include name="tudresden/ocl/sql/*.txt" />
-        <include name="tudresden/ocl/sql/orstrategy/*.java" />
-        <include name="tudresden/ocl/sql/gui/*.java" />
-        <include name="tudresden/ocl/injection/*.java" />
-        <include name="tudresden/ocl/injection/ocl/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/injection/ocl/lib/*.java" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-ocl-sql"
-           destdir="${build.dir}/dresden-ocl-sql"
-           deprecation="on"
-           debug="on"
-           depend="${build.depend}"
-           optimize="on" >
-      <classpath>
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${nsuml.jar}" />
-      </classpath>
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-ocl-sql.jar"
-         basedir="${build.dir}/dresden-ocl-sql"
-         manifest="${src.dir}/sql.manifest">
-      <include name="**/*.class" />
-      <include name="**/*.dat" />
-      <include name="**/*.gif" />
-      <include name="**/*.xml" />
-      <include name="**/*.dtd" />
-      <include name="tudresden/ocl/sql/oracleReserved.txt" />
-      <include name="tudresden/ocl/sql/sybaseReserved.txt" />
-      <include name="tudresden/ocl/check/bootstrap/constraints.txt" />
-      <include name="COPYING" />
-    </jar>
-  </target>
-
-  <target name="jar.dresden-ocl-reverseeng"
-          description="Compiles and jars the ReverseEng application."
-          depends="sablecc,build.dir">
-
-    <mkdir dir="${build.dir}/dresden-ocl-reverseeng" />
-
-    <copy todir="${build.dir}/dresden-ocl-reverseeng">
-      <fileset dir="${basedir}"><include name="COPYING" /></fileset>
-      <fileset dir="${src.dir}">
-        <include name="tudresden/ocl/check/OclTypeException.java" />
-        <include name="tudresden/ocl/OclException.java" />
-        <include name="tudresden/ocl/parser/OclParserException.java" />
-        <include name="tudresden/ocl/injection/*.java" />
-        <include name="tudresden/ocl/injection/lib/*.java" />
-        <include name="tudresden/ocl/injection/reverseeng/**/*.java" />
-        <exclude name="tudresden/ocl/injection/reverseeng/test/*" />
-        <include name="tudresden/ocl/injection/reverseeng/**/*.gif" />
-        <include name="tudresden/ocl/injection/reverseeng/**/*.form" />
-        <include name="tudresden/ocl/injection/reverseeng/**/*.testmodified" />
-      </fileset>
-    </copy>
-
-    <javac srcdir= "${build.dir}/dresden-ocl-reverseeng"
-           destdir="${build.dir}/dresden-ocl-reverseeng"
-           deprecation="on"
-           debug="off"
-           depend="${build.depend}"
-           optimize="on" >
-    </javac>
-
-    <jar jarfile="${build.dir}/dresden-ocl-reverseeng.jar"
-         basedir="${build.dir}/dresden-ocl-reverseeng"
-         manifest="${src.dir}/reveng.manifest">
-      <include name="**/*.class" />
-      <include name="**/*.gif" />
-      <include name="COPYING" />
-    </jar>
-  </target>
-
-  <target name="jar"
-          description="Builds all jar files."
-          depends="jar.dresden-ocl-lib,
-                   jar.ocl-argo,
-                   jar.dresden-ocl-injector,
-                   jar.dresden-ocl-demo,
-                   jar.dresden-ocl-sql,
-                   jar.royloy,
-                   jar.dresden-injector,
-                   jar.dresden-ocl-reverseeng"
-  />
-
-
-  <target name="clean"
-          description="Deletes all generated files except API documentation and distributions."
-          depends="sablecc.clean, compile.clean"
-  >
-    <delete dir="${build.dir}"/>
-  </target>
-
-
-  <target name="docs"
-          description="Builds Javadoc API documentation."
-          depends="sablecc">
-    <!--
-    Requires JDK 1.2.2 or higher, since previous versions did not
-    allow multiple -link or -linkoffline arguments."
-    -->
-
-    <delete dir="${docs.dir}" />
-    <mkdir  dir="${docs.dir}" />
-
-    <javadoc
-        sourcepath="${src.dir}"
-        destdir="${docs.dir}"
-        maxmemory="60m"
-        private="on"
-        author="on"
-        windowtitle="Dresden OCL Toolkit"
-        doctitle=   "Dresden OCL Toolkit"
-        header=  "Dresden OCL Toolkit"
-        footer=  "Dresden OCL Toolkit"
-        splitindex="on"
-        bottom='Developed at the Dresden University of Technology. This software is published under the GNU Lesser General Public License.'
-        >
-      <link offline="on" packagelistLoc="package-list/jdk/"    href="http://java.sun.com/products/jdk/1.2/docs/api/" />
-      <link offline="on" packagelistLoc="package-list/xerces/" href="http://xml.apache.org/apiDocs/"  />
-      <link offline="on" packagelistLoc="package-list/junit/"  href="http://www.junit.org/junit/javadoc/" />
-      <link offline="on" packagelistLoc="package-list/ant/"    href="http://jakarta.apache.org/ant/manual/api/" />
-
-      <package name="tudresden.*" />
-      <excludepackage name="tudresden.ocl.check.bootstrap" />
-      <excludepackage name="tudresden.ocl.check.types.doc-files" />
-      <excludepackage name="tudresden.ocl.check.types.xmifacade.stress" />
-      <excludepackage name="tudresden.ocl.images" />
-      <excludepackage name="tudresden.ocl.injection.reverseeng.resources.*" />
-      <excludepackage name="tudresden.ocl.injection.reverseeng.test.*" />
-      <excludepackage name="tudresden.ocl.lib.doc-files.*" />
-      <excludepackage name="*.CVS" />
-
-      <classpath>
-        <pathelement location="${xerces.jar}" />
-        <pathelement location="${junit.jar}" />
-        <pathelement location="${nsuml.jar}" />
-        <pathelement location="${jdom.jar}" />
-        <pathelement location="${src.dir}" />
-        <pathelement location="${path.jar.ant}" />
-      </classpath>
-    </javadoc>
-
-  </target>
-
-  <target name="docs.clean"
-          description="Removes Javadoc API documentation.">
-    <delete dir="${docs.dir}" />
-  </target>
-
-
-  <target name="task.test" depends="compile">
-    <taskdef name="diff" classname="tudresden.ocl.test.DiffTask" classpath="${src.dir}" />
-    <taskdef name="sort" classname="tudresden.ocl.test.SortTask" classpath="${src.dir}" />
-    <taskdef name="isempty" classname="tudresden.ocl.test.IsEmptyTask" classpath="${src.dir}" />
-  </target>
-
-  <target name="test.dresden-ocl-injector"
-          description="Runs a test suite for dresden-ocl-injector.jar and royloy.jar."
-          depends="jar.dresden-ocl-injector,jar.royloy,task.test">
-    <mkdir  dir="${build.dir}/testweb" />
-    <copy file="${build.dir}/dresden-ocl-injector.jar" todir="${build.dir}/testweb" />
-    <delete dir="${build.dir}/testweb/tudresden" />
-    <unjar src="${build.dir}/royloy.jar" dest="${build.dir}/testweb" />
-    <javac classpath="${build.dir}/dresden-ocl-injector.jar" srcdir= "${build.dir}/testweb" destdir="${build.dir}/testweb" />
-    <java classname="tudresden.ocl.test.TestInjectionRoyloy"
-          output="${build.dir}/dresden-ocl-injector.jar.emptytestoutput"
-          failonerror="yes"
-    >
-      <classpath>
-        <pathelement location="${build.dir}/testweb" />
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-      </classpath>
-    </java>
-    <isempty file="${build.dir}/dresden-ocl-injector.jar.emptytestoutput" />
-    <exec executable="java"
-        dir="${build.dir}/testweb/"
-        failonerror="true"
-    >
-      <arg value="-jar" />
-      <arg value="dresden-ocl-injector.jar" />
-      <arg value="-r" />
-      <arg value="tudresden.ocl.test.royloy" />
-      <arg value="--modify" />
-      <arg value="tudresden/ocl/test/royloy/*.java" />
-    </exec>
-    <javac classpath="${build.dir}/dresden-ocl-injector.jar" srcdir= "${build.dir}/testweb" destdir="${build.dir}/testweb" />
-    <java classname="tudresden.ocl.test.TestInjectionRoyloy"
-          output="${build.dir}/dresden-ocl-injector.jar.testoutput"
-          failonerror="yes"
-    >
-      <classpath>
-        <pathelement location="${build.dir}/testweb" />
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-      </classpath>
-    </java>
-    <sort file="${build.dir}/dresden-ocl-injector.jar.testoutput" />
-    <diff expectedFile=  "${src.dir}/dresden-ocl-injector.jar.testoutput"
-            actualFile="${build.dir}/dresden-ocl-injector.jar.testoutput"
-    />
-    <exec executable="java"
-        dir="${build.dir}/testweb/"
-        failonerror="true"
-    >
-      <arg value="-jar" />
-      <arg value="dresden-ocl-injector.jar" />
-      <arg value="--clean" />
-      <arg value="--modify" />
-      <arg value="tudresden/ocl/test/royloy/*.java" />
-    </exec>
-    <javac classpath="${build.dir}/dresden-ocl-injector.jar" srcdir= "${build.dir}/testweb" destdir="${build.dir}/testweb" />
-  </target>
-
-
-
-
-  <target name="test.example.inject"
-          depends="build.dir,jar.dresden-ocl-lib,jar.dresden-ocl-injector,task.test"
-  >
-    <delete dir="${example.dir}"/>
-    <copy todir="${example.dir}">
-      <fileset dir="${src.dir}" >
-        <include name="tudresden/ocl/injection/test/Example.java" />
-        <include name="tudresden/ocl/injection/test/Interface.java" />
-        <include name="tudresden/ocl/injection/test/AbstractImplementation.java" />
-        <include name="tudresden/ocl/injection/test/Implementation.java" />
-      </fileset>
-    </copy>
-    <javac srcdir="${example.dir}" destdir="${example.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-    <echo taskname="inject" message="Injecting ${example.dir}/tudresden/ocl/injection/test/Example.java" />
-    <java classname="tudresden.ocl.injection.ocl.Main" failonerror="yes">
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-        <pathelement location="${example.dir}" />
-      </classpath>
-      <arg value="--constraint-file" />
-      <arg value="${src.dir}/tudresden/ocl/injection/test/Example.ocl" />
-      <arg value="--reflection-model" />
-      <arg value="tudresden.ocl.injection.test" />
-      <arg value="--name-adapter" />
-      <arg value="argo" />
-      <arg value="--trace-types" />
-      <arg value="--modify" />
-      <arg value="${example.dir}/tudresden/ocl/injection/test/Example.java" />
-    </java>
-    <javac srcdir="${example.dir}" destdir="${example.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-    <diff expectedFile=    "${src.dir}/tudresden/ocl/injection/test/Example.java.injected"
-            actualFile="${example.dir}/tudresden/ocl/injection/test/Example.java"
-    />
-  </target>
-
-  <target name="test.example.run"
-          depends="test.example.inject,jar.dresden-ocl-lib,task.test"
-  >
-    <echo taskname="run" message="Running ${example.dir}/tudresden/ocl/injection/test/Example.java" />
-    <java classname="tudresden.ocl.injection.test.Example"
-          output="${example.dir}/example.testoutput"
-          failonerror="yes"
-    >
-      <classpath>
-        <pathelement location="${example.dir}" />
-        <pathelement location="${build.dir}/dresden-ocl-lib.jar" />
-      </classpath>
-      <sysproperty
-        key="tudresden.ocl.injection.lib.TypeTracer.log"
-        value="${example.dir}/tudresden/ocl/injection/test/Example.ocltypetrace"
-      />
-    </java>
-    <sort file="${example.dir}/example.testoutput" />
-    <diff expectedFile=    "${src.dir}/example.testoutput"
-            actualFile="${example.dir}/example.testoutput"
-    />
-    <diff expectedFile=    "${src.dir}/tudresden/ocl/injection/test/Example.ocltypetrace"
-            actualFile="${example.dir}/tudresden/ocl/injection/test/Example.ocltypetrace"
-    />
-  </target>
-
-  <target name="test.example.clean"
-          depends="test.example.run,jar.dresden-ocl-injector,task.test"
-  >
-    <echo taskname="clean" message="Cleaning ${example.dir}/tudresden/ocl/injection/test/Example.java" />
-    <java classname="tudresden.ocl.injection.ocl.Main" failonerror="yes">
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-      </classpath>
-      <arg value="--clean" />
-      <arg value="--modify" />
-      <arg value="${example.dir}/tudresden/ocl/injection/test/Example.java" />
-    </java>
-    <javac srcdir= "${example.dir}" destdir="${example.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-    <diff expectedFile=    "${src.dir}/tudresden/ocl/injection/test/Example.java"
-            actualFile="${example.dir}/tudresden/ocl/injection/test/Example.java"
-    />
-  </target>
-
-  <target name="test.example"
-          description="Tests the injector tool using Example.java"
-          depends="test.example.clean"
-  />
-
-
-
-  <target name="test.royloy.inject"
-          depends="build.dir,jar.dresden-ocl-lib,jar.dresden-ocl-injector"
-  >
-    <delete dir="${royloy.dir}"/>
-    <copy todir="${royloy.dir}">
-      <fileset dir="${src.dir}" >
-        <include name="tudresden/ocl/test/royloy/*.java" />
-        <include name="tudresden/ocl/test/TestInjection.java" />
-        <include name="tudresden/ocl/test/TestInjectionRoyloy.java" />
-      </fileset>
-    </copy>
-    <javac srcdir="${royloy.dir}" destdir="${royloy.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-    <echo taskname="inject" message="Injecting ${royloy.dir}/tudresden/ocl/test/royloy/*.java" />
-    <java classname="tudresden.ocl.injection.ocl.Main" failonerror="yes">
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-        <pathelement location="${royloy.dir}" />
-      </classpath>
-      <arg value="--constraint-file" />
-      <arg value="${src.dir}/tudresden/ocl/test/royloy/oclexpressions" />
-      <arg value="--reflection-model" />
-      <arg value="tudresden.ocl.test.royloy" />
-      <arg value="--violation-macro" />
-      <arg value="tudresden.ocl.test.TestInjectionRoyloy.theInstance.onViolation" />
-      <arg value="--trace-types" />
-      <arg value="--modcount-hash" />
-      <arg value="--modify" />
-      <arg value="${royloy.dir}/tudresden/ocl/test/royloy/*.java" />
-    </java>
-    <javac srcdir="${royloy.dir}" destdir="${royloy.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-  </target>
-
-  <target name="test.royloy.run"
-          depends="test.royloy.inject,jar.dresden-ocl-lib,task.test"
-  >
-    <echo taskname="run" message="Running ${royloy.dir}/tudresden/ocl/test/TestInjectionRoyloy.java" />
-    <java classname="tudresden.ocl.test.TestInjectionRoyloy" failonerror="yes">
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-lib.jar" />
-        <pathelement location="${royloy.dir}" />
-      </classpath>
-      <arg value="strict" />
-      <sysproperty
-        key="tudresden.ocl.injection.lib.TypeTracer.log"
-        value="${royloy.dir}/tudresden/ocl/test/royloy/royloy.ocltypetrace" />
-    </java>
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/royloy.ocltypetrace"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/royloy.ocltypetrace"
-    />
-  </target>
-
-  <target name="test.royloy.clean"
-          depends="test.royloy.run,jar.dresden-ocl-injector,task.test"
-  >
-    <echo taskname="clean" message="Cleaning ${royloy.dir}/tudresden/ocl/test/royloy/*.java" />
-    <java classname="tudresden.ocl.injection.ocl.Main" failonerror="yes">
-      <classpath>
-        <pathelement location="${build.dir}/dresden-ocl-injector.jar" />
-      </classpath>
-      <arg value="--clean" />
-      <arg value="--modify" />
-      <arg value="${royloy.dir}/tudresden/ocl/test/royloy/*.java" />
-    </java>
-    <javac srcdir="${royloy.dir}" destdir="${royloy.dir}" deprecation="on" debug="on" optimize="off">
-      <classpath><pathelement location="${build.dir}/dresden-ocl-lib.jar" /></classpath>
-    </javac>
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Bank.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Bank.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Burning.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Burning.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Company.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Company.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Customer.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Customer.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/CustomerCard.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/CustomerCard.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Date.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Date.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Day.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Day.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/DayType.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/DayType.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Earning.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Earning.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/LoyaltyAccount.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/LoyaltyAccount.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/LoyaltyProgram.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/LoyaltyProgram.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Membership.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Membership.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Person.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Person.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/ProgramPartner.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/ProgramPartner.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/RLFrame.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/RLFrame.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/RLObject.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/RLObject.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Service.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Service.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/ServiceLevel.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/ServiceLevel.java"
-    />
-    <diff expectedFile=   "${src.dir}/tudresden/ocl/test/royloy/Transaction.java"
-            actualFile="${royloy.dir}/tudresden/ocl/test/royloy/Transaction.java"
-    />
-  </target>
-
-  <target name="test.royloy"
-          description="Tests the injector tool using royloy/*.java"
-          depends="test.royloy.clean"
-  />
-
-
-
-  <target name="all"
-          description="Does everything except dist: compile, test, jar and docs."
-          depends="compile, test, jar, docs"
-  />
-
-
-  <!-- Creating Distributions -->
-
-  <target name="dist.bin" depends="test, jar"
-  >
-    <tar tarfile="${build.dir}/dresden-ocl.tar">
-      <tarfileset dir="${basedir}">
-        <include name="README" />
-        <include name="CHANGELOG" />
-        <include name="COPYING" />
-        <include name="CREDITS" />
-      </tarfileset>
-      <tarfileset dir="${build.dir}">
-        <include name="dresden-ocl-lib.jar" />
-        <include name="ocl-argo.jar" />
-        <include name="dresden-ocl-injector.jar" />
-        <include name="dresden-ocl-demo.jar" />
-        <include name="dresden-ocl-sql.jar" />
-        <include name="dresden-ocl-royloy.jar" />
-        <include name="dresden-ocl-reverseeng.jar" />
-      </tarfileset>
-      <tarfileset dir="${basedir}/www">
-        <include name="*.html" />
-      </tarfileset>
-    </tar>
-    <gzip     src="${build.dir}/dresden-ocl.tar"
-          zipfile="${build.dir}/dresden-ocl.tar.gz"
-    />
-  </target>
-
-  <target name="dist.src" depends="build.dir"
-  >
-    <tar tarfile="${build.dir}/dresden-ocl-src.tar">
-      <tarfileset dir="${basedir}">
-        <include name="README" />
-        <include name="CHANGELOG" />
-        <include name="COPYING" />
-        <include name="CREDITS" />
-        <include name="build.xml" />
-        <include name="jikes.properties" />
-        <include name="www/*.html" />
-        <include name="src/**" />
-        <exclude name="src/tudresden/**/*.class" />
-        <exclude name="src/tudresden/ocl/parser/analysis/*.java" />
-        <exclude name="src/tudresden/ocl/parser/lexer/*.java" />
-        <exclude name="src/tudresden/ocl/parser/lexer/lexer.dat" />
-        <exclude name="src/tudresden/ocl/parser/parser/*.java" />
-        <exclude name="src/tudresden/ocl/parser/parser/parser.dat" />
-        <exclude name="src/tudresden/ocl/parser/node/*.java" />
-      </tarfileset>
-    </tar>
-
-    <echo message="--- testing source distribution for completeness ..." />
-    <delete dir="${build.dir}/dresden-ocl-src.tar.test" />
-    <mkdir  dir="${build.dir}/dresden-ocl-src.tar.test" />
-    <untar  src="${build.dir}/dresden-ocl-src.tar"
-           dest="${build.dir}/dresden-ocl-src.tar.test"
-    />
-    <ant   dir="${build.dir}/dresden-ocl-src.tar.test"
-           inheritAll="false"
-    />
-    <echo message="--- testing source distribution for completeness: done." />
-
-    <gzip     src="${build.dir}/dresden-ocl-src.tar"
-          zipfile="${build.dir}/dresden-ocl-src.tar.gz"
-    />
-  </target>
-
-  <target name="dist.version" unless="dist.version">
-    <fail message="No release version set. Use ant dist -Ddist.version=major.minor.revision" />
-  </target>
-
-  <target name="dist"
-          description="Build a release. Needs the release version in property dist.version."
-          depends="dist.version,dist.bin,dist.src"
-  >
-    <echo message="Building release ${dist.version}" />
-    <mkdir dir="${dist.dir}" />
-    <copy   file="${build.dir}/dresden-ocl.tar.gz"
-          tofile="${dist.dir}/dresden-ocl-${dist.version}.tar.gz"
-    />
-    <copy   file="${build.dir}/dresden-ocl-src.tar.gz"
-          tofile="${dist.dir}/dresden-ocl-src-${dist.version}.tar.gz"
-    />
-  </target>
-
-
-</project>

Added: trunk/dresden-ocl/debian/ant.properties
===================================================================
--- trunk/dresden-ocl/debian/ant.properties	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/debian/ant.properties	2006-02-09 22:10:10 UTC (rev 1895)
@@ -0,0 +1 @@
+xerces.jar=/usr/share/java/xercesImpl.jar

Modified: trunk/dresden-ocl/debian/changelog
===================================================================
--- trunk/dresden-ocl/debian/changelog	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/debian/changelog	2006-02-09 22:10:10 UTC (rev 1895)
@@ -1,3 +1,15 @@
+dresden-ocl (1.1-9) unstable; urgency=low
+
+  * Move to main - build with kaffe and passes junit tests
+  * Added build-dependency on libxerces2-java
+  * Added ant.properties file to make xerces known to junit tests
+  * kaffe compiler transition
+  * Bumped debhelper version to fix linda error
+  * Enable junit tests
+  * Added myself to uploaders
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 19 Jan 2006 15:53:08 +0100
+
 dresden-ocl (1.1-8) unstable; urgency=low
 
   * building with kaffe but not moving to main. I'll move it to main when

Modified: trunk/dresden-ocl/debian/control
===================================================================
--- trunk/dresden-ocl/debian/control	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/debian/control	2006-02-09 22:10:10 UTC (rev 1895)
@@ -1,15 +1,15 @@
 Source: dresden-ocl
-Section: contrib/misc
+Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs (>= 0.4.5.3), dpatch (>= 1.11), kaffe | j2sdk1.4 | java2-compiler, ant, ant-optional, junit, libnsuml-java, sablecc
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.5.3), dpatch (>= 1.11), kaffe, ant, ant-optional, junit, libnsuml-java, sablecc, libxerces2-java
 Standards-Version: 3.6.2
 
 Package: libocl-argo-java
-Section: contrib/libs
+Section: libs
 Architecture: all
-Depends: kaffe | j2re1.3 | j2re1.4 | java2-runtime, junit, sablecc
+Depends: kaffe | java1-runtime | java2-runtime, junit, sablecc
 Suggests: java-virtual-machine
 Description: Dresden OCL (Object Constraint Language) Java Toolkit
  This package contains part of OCL Toolkit which is needed by ArgoUML.

Deleted: trunk/dresden-ocl/debian/patches/01-build_xml.dpatch
===================================================================
--- trunk/dresden-ocl/debian/patches/01-build_xml.dpatch	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/debian/patches/01-build_xml.dpatch	2006-02-09 22:10:10 UTC (rev 1895)
@@ -1,70 +0,0 @@
-#!/bin/sh -e
-## 01-build_xml.dpatch by Arnaud Vandyck <arnaud.vandyck at ulg.ac.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
-       -patch) patch $patch_opts -p1 < $0;;
-       -unpatch) patch $patch_opts -p1 -R < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /tmp/dresden-ocl/build.xml dresden-ocl/build.xml
---- /tmp/dresden-ocl/build.xml	2002-09-05 20:53:03.000000000 +0200
-+++ dresden-ocl/build.xml	2003-08-04 01:10:00.000000000 +0200
-@@ -20,18 +20,18 @@
-   <property name="build.dir" value="${basedir}/build" />
-   <property name="dist.dir"  value="${basedir}/dist" />
-   <property name="docs.dir"  value="${basedir}/api"   />
-+  <property name="jars.dir"  value="/usr/share/java" />
- 
--  <property name="xerces.jar" value="${src.dir}/xerces.jar" />
--  <property name="nsuml.jar"  value="${src.dir}/lib/nsuml.jar" />
--  <property name="jdom.jar"   value="${src.dir}/lib/jdom.jar" />
--  <property name="junit.jar"  value="${src.dir}/junit.jar"  />
-+  <property name="xerces.jar" value="${jars.dir}/xerces.jar" />
-+  <property name="nsuml.jar"  value="${jars.dir}/nsuml.jar" />
-+  <property name="jdom.jar"   value="${jars.dir}/jdom.jar" />
-+  <property name="junit.jar"  value="${jars.dir}/junit.jar"  />
- 
-   <property file="local.properties" />
- 
-   <property name="example.dir" value="${build.dir}/example.test" />
-   <property name="royloy.dir"  value="${build.dir}/royloy.test" />
- 
--
-   <target name="info">
-     <echo message="Target info is obsolete, use ant -projecthelp instead." />
-   </target>
-@@ -61,7 +61,7 @@
-   <target name="sablecc.checkRequired" depends="prepare">
-     <uptodate property="sablecc.notRequired"
-               targetfile="${src.dir}/tudresden/ocl/parser/parser/parser.dat" >
--      <srcfiles dir="${src.dir}" includes="sablecc.jar"/>
-+      <srcfiles dir="${jars.dir}" includes="sablecc.jar"/>
-       <srcfiles dir="${src.dir}" includes="ocl.grammar" />
-     </uptodate>
-   </target>
-@@ -72,7 +72,7 @@
-           unless="sablecc.notRequired">
-     <taskdef name="sablecc"
-              classname="org.sablecc.ant.taskdef.Sablecc"
--             classpath="${src.dir}/sablecc.jar"
-+             classpath="${jars.dir}/sablecc.jar"
-     />
-     <sablecc outputdirectory="${src.dir}" src="${src.dir}">
-       <include name="ocl.grammar" />

Modified: trunk/dresden-ocl/debian/rules
===================================================================
--- trunk/dresden-ocl/debian/rules	2006-02-09 22:06:00 UTC (rev 1894)
+++ trunk/dresden-ocl/debian/rules	2006-02-09 22:10:10 UTC (rev 1895)
@@ -4,20 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
-
-export JITC_PROCESSOR_TYPE=6
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/lib/kaffe /usr/lib/j2se/1.4 /usr/local/IBMJava2-ppc-142
+JAVA_HOME            := /usr/lib/kaffe
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := ant-optional junit sablecc nsuml $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_COMPILER     := jikes
-DEB_ANT_BUILD_TARGET := jar.ocl-argo
+DEB_JARS             := xercesImpl ant-optional junit sablecc nsuml $(ANT_HOME)/lib/ant-launcher.jar
+DEB_ANT_BUILD_TARGET := jar.ocl-argo test.junit
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean




More information about the pkg-java-commits mailing list