Author: linus
Date: 2008-06-14 11:41:58-0700
New Revision: 14927
Added:
trunk/src/argouml-core-diagrams-sequence2/build.xml (contents, props changed)
Modified:
trunk/src/argouml-app/build.xml
trunk/src/argouml-build/build.xml
trunk/src/argouml-core-diagrams-sequence2/ (props changed)
trunk/src/argouml-core-model-mdr/build.xml
Log:
Added file to build argouml-core-diagrams-sequence2 including rules.
Included the module in the echoed texts throughout.
Modified: trunk/src/argouml-app/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&rev=14927&p1=trunk/src/argouml-app/build.xml&p2=trunk/src/argouml-app/build.xml&r1=14926&r2=14927
==============================================================================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2008-06-14 11:41:58-0700
@@ -175,7 +175,7 @@
<target name="prepare" depends="init,check-version">
<!-- create directories -->
- <echo message="Preparing the build directories"/>
+ <echo message="Preparing the build directories in argouml-app"/>
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes}"/>
@@ -221,7 +221,7 @@
<target name="generateparser" depends="init"
description="Generate the antlr parsers.">
- <echo message="Generate parsers"/>
+ <echo message="Generate parsers in argouml-app"/>
<uptodate property="parser.re.is.current"
targetfile="src/org/argouml/uml/reveng/java/JavaTokenTypes.txt">
@@ -313,7 +313,7 @@
<target name="update-version" depends="check-version"
unless="version.is.current">
- <echo message="Creating ArgoVersion.java for version ${argo.build.version}"/>
+ <echo message="Creating ArgoVersion.java for version ${argo.build.version} in argouml-app"/>
<filter token="ARGO_RELEASE_VERSION" value="${argo.build.version}"/>
<copy file="src/templates/ArgoVersion.template"
filtering="on"
@@ -328,7 +328,7 @@
depends="prepare,update-version,generateparser"
description="Compile the sources.">
- <echo message="Compiling the sources"/>
+ <echo message="Compiling the sources in argouml-app"/>
<javac debug="${debug}"
deprecation="${deprecation}"
Modified: trunk/src/argouml-build/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14927&p1=trunk/src/argouml-build/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14926&r2=14927
==============================================================================
--- trunk/src/argouml-build/build.xml (original)
+++ trunk/src/argouml-build/build.xml 2008-06-14 11:41:58-0700
@@ -121,7 +121,7 @@
<echo>
-Property files to be searched:
+Property files to be searched (in argouml-build):
1. ${lbp.path}
File is ${lbp.exists}.
@@ -244,7 +244,9 @@
<!--
<ant dir="argouml-core-model-euml" inheritAll="false" target="jar"/>
-->
- <ant dir="../argouml-app" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-app" inheritAll="false" target="jar"/>
+
+ <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false" target="jar"/>
<!-- Copy everything to the build directory -->
<mkdir dir="${argo.build.dir}"/>
@@ -263,6 +265,9 @@
<fileset dir="../argouml-app/build">
<include name="*"/>
</fileset>
+ <fileset dir="../argouml-core-diagrams-sequence2/build">
+ <include name="*"/>
+ </fileset>
</copy>
<!-- The argouml.jar is copied again and again since it is modified below -->
@@ -306,21 +311,28 @@
<!-- Build the subdirs in order. -->
<!-- infra doesn't have tests. -->
- <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
-
<!-- model doesn't have tests. -->
- <ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
+ <!-- Tests for model-mdr -->
+ <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model-mdr" inheritAll="false" target="tests"/>
<!-- <ant dir="model-euml" inheritAll="false" target="tests"/> -->
-<!-- why is this called twice?
-Can't we use a single target with dependencies? tfm -->
+ <!-- Tests for argouml-app -->
+ <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
<ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/>
-
<ant dir="../argouml-app" inheritAll="false" target="tests"/>
+ <!-- Tests for sequence2 -->
+ <ant dir="../argouml-core-infra" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-core-model" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-core-model-mdr" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-app" inheritAll="false" target="jar"/>
+ <ant dir="../argouml-core-diagrams-sequence2" inheritAll="false" target="tests"/>
+
<antcall target="tests-reports"/>
</target>
@@ -344,6 +356,9 @@
<fileset dir="../argouml-app">
<include name="build/tests/reports/**/TEST-*.xml"/>
</fileset>
+ <fileset dir="../argouml-core-diagrams-sequence2">
+ <include name="build/tests/reports/**/TEST-*.xml"/>
+ </fileset>
<report format="frames" todir="${tests.reports}/html"/>
</junitreport>
</target>
@@ -359,6 +374,8 @@
<delete dir="${argo.build.dir}"/>
<!-- Build the subdirs in opposite order. -->
+ <ant dir="../argouml-core-diagrams-sequence2"
+ inheritAll="false" target="clean"/>
<ant dir="../argouml-app" inheritAll="false" target="clean"/>
<ant dir="../argouml-core-model-euml" inheritAll="false" target="clean"/>
<ant dir="../argouml-core-model-mdr" inheritAll="false" target="clean"/>
@@ -401,6 +418,7 @@
<pathelement location="../argouml-app/src"/>
<pathelement location="../argouml-core-model/src"/>
<pathelement location="../argouml-core-model-mdr/src"/>
+ <pathelement location="../argouml-core-diagrams-sequence2/src"/>
</sourcepath>
<classpath>
Added: trunk/src/argouml-core-diagrams-sequence2/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/build.xml?view=auto&rev=14927
==============================================================================
--- (empty file)
+++ trunk/src/argouml-core-diagrams-sequence2/build.xml 2008-06-14 11:41:58-0700
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$
+
+ Ant build file for argouml-core-diagrams-sequence2.
+
+ This is designed to work:
+ - in the subdirectory named argouml-core-diagrams-sequence2,
+ as stored in the repository.
+ Used when compiling, running tests from the command line.
+ - When checked out from within Eclipse (project named
+ argouml-core-diagrams-sequence2)
+ Used for generating code.
+
+Building this requires:
+ argouml-core-infra
+ argouml-core-model
+ argouml-app
+
+ -->
+
+<project basedir="." default="compile" name="argouml">
+
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+
+ <target name="init">
+ <path id="src.compile.classpath">
+ <fileset dir="../argouml-core-infra/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-app/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- This runtime classpath is used for tests and other things started
+ from this file.
+ -->
+ <path id="src.run.classpath">
+ <path refid="src.compile.classpath"/>
+ <!-- only one of the following will be used at a time -->
+ <!-- we put them together because there's little risk of crosstalk -->
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="../argouml-core-model-euml/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Try to figure out where our tools directory is. Done after overrides
+ are loaded so user can override, but before defaults -->
+ <property name="tool.test.file" value="checkstyle/java.header"/>
+ <available file="../argouml-core-tools/${tool.test.file}" type="file"
+ value="../argouml-core-tools"
+ property="argo.tools.dir"
+ />
+ <available file="../../tools/${tool.test.file}" type="file"
+ value="../../tools"
+ property="argo.tools.dir"
+ />
+
+ <path id="tests.compile.classpath">
+ <pathelement location="build/classes"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ <path refid="src.compile.classpath"/>
+ </path>
+
+ <path id="tests.run.classpath">
+ <path refid="tests.compile.classpath"/>
+ <fileset dir="../argouml-core-model-mdr/build/">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Initialization target for optional ant tasks -->
+ <!-- =================================================================== -->
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.home}/libopt/ant-junit.jar"/>
+ <pathelement location="${argo.tools.dir}/junit-3.8.2/junit.jar"/>
+ </path>
+
+ <taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.classpath"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+
+ <target name="prepare" depends="init">
+ <mkdir dir="build"/>
+ <mkdir dir="build/classes"/>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare"
+ description="Compile the sources.">
+
+ <echo message="Compiling the sources in argouml-core-diagrams-sequence2"/>
+
+ <javac debug="on"
+ deprecation="on"
+ destdir="build/classes"
+ includes="org/argouml/**/*.java"
+ optimize="on"
+ srcdir="src"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="src.compile.classpath"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Creates the jar file -->
+ <!-- =================================================================== -->
+ <target name="jar" depends="compile"
+ description="Build the main jar file.">
+ <jar basedir="build/classes"
+ excludes="*.txt,*.bat,*.xml,*.sh"
+ includes="org/argouml/**"
+ jarfile="build/argouml-sequence.jar" />
+ </target>
+
+
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init"
+ description="Clean out all built files.">
+ <delete dir="build"/>
+ </target>
+
+
+
+ <!-- ################################################################### -->
+ <!-- Section with tests. -->
+ <!-- ################################################################### -->
+
+
+ <!-- =================================================================== -->
+ <!-- Compiles the tests -->
+ <!-- =================================================================== -->
+
+ <target name="compile-tests" depends="prepare">
+
+ <!-- create directories -->
+ <mkdir dir="build/tests/classes"/>
+
+ <javac debug="true"
+ deprecation="on"
+ optimize="false"
+ destdir="build/tests/classes"
+ srcdir="tests"
+ source="1.5"
+ target="1.5">
+ <compilerarg compiler="javac1.5" line="-Xlint:unchecked"/>
+ <classpath>
+ <path refid="tests.compile.classpath"/>
+ </classpath>
+ </javac>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Run the junit tests. -->
+ <!-- =================================================================== -->
+ <target name="tests" depends="compile,compile-tests"
+ description="Run all tests that don't require any GUI components in headleass mode.">
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" dir="${basedir}" forkmode="perTest"
+ haltonfailure="false"
+ maxmemory="48M" printsummary="${junit.printsummary}">
+ <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>
+ <sysproperty key="java.awt.headless" value="true"/>
+ <assertions>
+ <enable/>
+ </assertions>
+ <classpath refid="tests.all.classpath"/>
+ <formatter type="xml"/>
+ <batchtest todir="build/tests/reports}">
+ <fileset dir="tests">
+ <include name="org/argouml/**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+</project>
+<!-- End of file -->
+
+
Modified: trunk/src/argouml-core-model-mdr/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/build.xml?view=diff&rev=14927&p1=trunk/src/argouml-core-model-mdr/build.xml&p2=trunk/src/argouml-core-model-mdr/build.xml&r1=14926&r2=14927
==============================================================================
--- trunk/src/argouml-core-model-mdr/build.xml (original)
+++ trunk/src/argouml-core-model-mdr/build.xml 2008-06-14 11:41:58-0700
@@ -175,7 +175,7 @@
</target>
<target name="generate-skipped" if="generate.notRequired">
- <echo message="${build.dir}/UML14.dtd is up to date"/>
+ <echo message="${build.dir}/UML14.dtd is up to date in argouml-core-model-mdr"/>
</target>
<!-- =================================================================== -->
@@ -195,7 +195,7 @@
<!-- NOTE: The MDR task needs an absolute path for storageFile or it will
put it in the caller's directory when called from argouml build
-->
- <echo message="Generating JMI interfaces from ${xmi.file}"/>
+ <echo message="Generating JMI interfaces from ${xmi.file} in argouml-core-model-mdr"/>
<echo message="Storage file is in ${basedir}/${build.javas}"/>
<echo message="Sources written to ${build.javas}"/>
<mdr storageFile="${basedir}/${build.javas}/mymdr">
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.