Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r319 - trunk/build.xml

argouml-sql
Discussion topic

Back to topic list

svn commit: r319 - trunk/build.xml

Author linus
Full name Linus Tolke
Date 2014-09-06 14:13:30 PDT
Message Author: linus
Date: 2014-09-06 14:13:30-0700
New Revision: 319

Modified:
   trunk/build.xml

Log:
Changed the java version to 1.5.


Modified: trunk/build.xml
Url: http://argouml-sql.t​igris.org/source/bro​wse/argouml-sql/trun​k/build.xml?view=dif​f&pathrev=319​&r1=318&r2=319
====================​====================​====================​==================
--- trunk/build.xml (original)
+++ trunk/build.xml 2014-09-06 14:13:30-0700
@@ -22,11 +22,11 @@
         <property name="build.classes" value="${build.dir}/classes" />
         <property name="module.root" location="."/>
         <property name="module.src.dir" value="src" />
- <property name="module.tests.src" value="tests" />
- <property name="module.tests.reports" value="${build.dir}/tests" />
- <property name="module.tests.h​tml-reports"
- value="${module.tes​ts.reports}/html" />
- <property name="module.javadocs.dir" value="${build.dir}/javadocs" />
+ <property name="module.tests.src" value="tests" />
+ <property name="module.tests.reports" value="${build.dir}/tests" />
+ <property name="module.tests.h​tml-reports"
+ value="${module.tes​ts.reports}/html" />
+ <property name="module.javadocs.dir" value="${build.dir}/javadocs" />
 
         <property name="module.src_generated.dir" value="${module.roo​t}/src_generated"/​>
         
@@ -63,25 +63,25 @@
 
         <path id="run.classpath">
             <fileset dir="${argo.build.dir}" includes="*.jar" />
- </path>
-
- <mkdir dir="${build.dir}" />
+ </path>
+
+ <mkdir dir="${build.dir}" />
         <mkdir dir="${module.src_g​enerated.dir}"/>
-
- <copy file="${module.src.​dir}/org/argouml/lan​guage/sql/domainmapp​ing.xml"
- todir="${build.dir}"/>
- <copy todir="${build.classes}">
- <fileset dir="${module.src.dir}" includes="**/*.xml **/*.xsd"/>
- </copy>
+
+ <copy file="${module.src.​dir}/org/argouml/lan​guage/sql/domainmapp​ing.xml"
+ todir="${build.dir}"/>
+ <copy todir="${build.classes}">
+ <fileset dir="${module.src.dir}" includes="**/*.xml **/*.xsd"/>
+ </copy>
     </target>
 
     <!-- ====================​====================​====================​======= -->
     <!-- Run from classes -->
     <!-- ====================​====================​====================​======= -->
     <target name="run" depends="install" description="Run with this module.">
- <java classname="org.argou​ml.application.Main"​ fork="yes"
+ <java classname="org.argou​ml.application.Main"​ fork="yes"
                 taskname="argouml" jvmargs="-Xmx500M">
- <sysproperty key="log4j.configuration"
+ <sysproperty key="log4j.configuration"
                     value="org/argouml/r​esource/error_consol​e.lcf" />
             <classpath>
                 <pathelement location="${build.d​ir}/${result.jar}" />
@@ -128,41 +128,42 @@
         <!-- create directories -->
         <mkdir dir="${build.classes}" />
 
- <javac srcdir="src" destdir="${build.classes}"
- includes="org/argoum​l/**/*.java" debug="${debug}"
- deprecation="${deprecation}" optimize="${optimize}"
- source="1.6" target="1.6">
+ <javac srcdir="src" destdir="${build.classes}"
+ includes="org/argoum​l/**/*.java" debug="${debug}"
+ deprecation="${deprecation}" optimize="${optimize}"
+ source="1.5"
+ target="1.5">
             <classpath>
                 <path refid="compile.classpath" />
             </classpath>
         </javac>
- <copy file="${module.src.​dir}/manifest.mf" todir="${build.classes}" />
- <copy todir="${build.clas​ses}/org/argouml/i18​n">
- <fileset dir="${module.src.d​ir}/org/argouml/i18n​"
- includes="*.properties" />
- </copy>
+ <copy file="${module.src.​dir}/manifest.mf" todir="${build.classes}" />
+ <copy todir="${build.clas​ses}/org/argouml/i18​n">
+ <fileset dir="${module.src.d​ir}/org/argouml/i18n​"
+ includes="*.properties" />
+ </copy>
     </target>
 
     <!-- ====================​====================​====================​======= -->
     <!-- Creates the jar file -->
     <!-- ====================​====================​====================​======= -->
- <target name="jar" depends="compile"
+ <target name="jar" depends="compile"
             description="Build the ${result.jar} file.">
- <jar basedir="${build.classes}" includes="org/argouml/**"
- jarfile="${build.di​r}/${result.jar}"
+ <jar basedir="${build.classes}" includes="org/argouml/**"
+ jarfile="${build.di​r}/${result.jar}"
                 manifest="${build.c​lasses}/manifest.mf"​ />
     </target>
 
     <!-- ====================​====================​====================​======= -->
     <!-- Install the jar file -->
     <!-- ====================​====================​====================​======= -->
- <target name="install" depends="jar"
+ <target name="install" depends="jar"
             description="Copy the ${result.jar} file to the ArgoUML directory.">
         <copy todir="${argo.build​.dir}/ext">
             <fileset dir="${build.dir}" includes="${result.jar}" />
- </copy>
- <copy file="${module.src.​dir}/org/argouml/lan​guage/sql/domainmapp​ing.xml"
- todir="${argo.build​.dir}/ext"/>
+ </copy>
+ <copy file="${module.src.​dir}/org/argouml/lan​guage/sql/domainmapp​ing.xml"
+ todir="${argo.build​.dir}/ext"/>
     </target>
 
     <!-- ====================​====================​====================​======= -->
@@ -174,102 +175,102 @@
             <fileset dir="${build.dir}" includes="${result.jar}" />
         </delete>
     </target>
-
- <!-- ====================​====================​====================​======= -->
- <!-- Tests -->
- <!-- ====================​====================​====================​======= -->
- <target name="compile-tests" depends="compile"
- description="Compiles all tests.">
- <javac srcdir="${module.tests.src}" destdir="${build.classes}"
- includes="org/argoum​l/**/*.java" debug="${debug}"
- deprecation="${deprecation}" optimize="${optimize}"
- source="1.6" target="1.6">
- <classpath>
- <path refid="compile.classpath" />
- <pathelement location="${junit.jar.path}" />
- </classpath>
- </javac>
- </target>
-
- <target name="ant.optional.init" depends="init">
- <path id="ant.optional.classpath">
- <pathelement location="${ant.hom​e}/libopt/ant-junit.​jar"/>
- <pathelement location="${junit.j​ar.path}"/>
- <pathelement location="${jdepend​.jar.path}"/>
- </path>
-
- <taskdef classname="org.apach​e.tools.ant.taskdefs​.optional.junit.JUni​tTask" name="junit">
- <classpath>
- <path refid="ant.optional.​classpath"/>
- </classpath>
- </taskdef>
-
- <taskdef classname="org.apach​e.tools.ant.taskdefs​.optional.junit.XMLR​esultAggregator" name="junitreport">
- <classpath>
- <path refid="ant.optional.​classpath"/>
- </classpath>
- </taskdef>
-
- </target>
-
-
- <target name="run-tests" depends="compile-tes​ts,ant.optional.init​"
- description="Runs all tests.">
- <mkdir dir="${module.tests​.reports}"/>
- <mkdir dir="${module.tests​.html-reports}" />
-
- <junit errorproperty="junit.failure" failureproperty="junit.failure"
- fork="yes" haltonfailure="false"
- maxmemory="48M" printsummary="true">
- <sysproperty key="log4j.configuration"
- value="org/argouml/r​esource/error_consol​e.lcf" />
- <classpath>
- <pathelement location="${build.classes}" />
- <path refid="compile.classpath" />
- </classpath>
-
- <formatter type="xml"/>
-
- <batchtest todir="${module.tes​ts.reports}">
- <fileset dir="${module.tests.src}">
- <include name="org/argouml/la​nguage/sql/Test*.jav​a"/>
- </fileset>
- </batchtest>
-
- </junit>
- <antcall target="junit-report-create" />
- </target>
-
- <target name="junit-report-create">
- <junitreport todir="${module.tes​ts.reports}">
- <fileset dir="${module.tests​.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${module.tes​ts.html-reports}"/​>
- </junitreport>
- </target>
-
- <!-- ====================​====================​====================​======= -->
- <!-- Javadoc -->
- <!-- ====================​====================​====================​======= -->
- <target name="javadocs" depends="init">
- <mkdir dir="${module.javad​ocs.dir}"/>
-
- <javadoc bottom="&lt;table width=&apos;100%​&apos;&gt;​&lt;tr&gt;​&lt;td width=&apos;25%&apos; align=&apos;left​&apos;&gt;Ar​goUML &amp;copy; 1996-2006&lt;/td​&gt;&lt;td width=&apos;25%&apos; align=&apos;cent​er&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/&apos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Homepage&lt;/a​&gt;&lt;/td​&gt;&lt;td width=&apos;25%&apos; align=&apos;cent​er&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/dev.html&a​pos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Developers' page&lt;/a&g​t;&lt;/td&gt​;&lt;td width=&apos;25%&apos; align=&apos;righ​t&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/documentation/​defaulthtml/cookbook​/&apos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Cookbook&lt;/a​&gt;&lt;/td​&gt;&lt;/tr​&gt;&lt;/table​&gt;"
- destdir="${module.j​avadocs.dir}"
- maxmemory="128M"
- packagenames="org.argouml.*"
- source="1.6"
- use="true"
- windowtitle="ArgoUML-SQL Javadoc for internal use">
- <sourcepath>
- <pathelement location="${module.​src.dir}"/>
- </sourcepath>
-
- <classpath>
- <path refid="compile.classpath"/>
- </classpath>
- </javadoc>
- </target>
-
+
+ <!-- ====================​====================​====================​======= -->
+ <!-- Tests -->
+ <!-- ====================​====================​====================​======= -->
+ <target name="compile-tests" depends="compile"
+ description="Compiles all tests.">
+ <javac srcdir="${module.tests.src}" destdir="${build.classes}"
+ includes="org/argoum​l/**/*.java" debug="${debug}"
+ deprecation="${deprecation}" optimize="${optimize}"
+ source="1.6" target="1.6">
+ <classpath>
+ <path refid="compile.classpath" />
+ <pathelement location="${junit.jar.path}" />
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="ant.optional.init" depends="init">
+ <path id="ant.optional.classpath">
+ <pathelement location="${ant.hom​e}/libopt/ant-junit.​jar"/>
+ <pathelement location="${junit.j​ar.path}"/>
+ <pathelement location="${jdepend​.jar.path}"/>
+ </path>
+
+ <taskdef classname="org.apach​e.tools.ant.taskdefs​.optional.junit.JUni​tTask" name="junit">
+ <classpath>
+ <path refid="ant.optional.​classpath"/>
+ </classpath>
+ </taskdef>
+
+ <taskdef classname="org.apach​e.tools.ant.taskdefs​.optional.junit.XMLR​esultAggregator" name="junitreport">
+ <classpath>
+ <path refid="ant.optional.​classpath"/>
+ </classpath>
+ </taskdef>
+
+ </target>
+
+
+ <target name="run-tests" depends="compile-tes​ts,ant.optional.init​"
+ description="Runs all tests.">
+ <mkdir dir="${module.tests​.reports}"/>
+ <mkdir dir="${module.tests​.html-reports}" />
+
+ <junit errorproperty="junit.failure" failureproperty="junit.failure"
+ fork="yes" haltonfailure="false"
+ maxmemory="48M" printsummary="true">
+ <sysproperty key="log4j.configuration"
+ value="org/argouml/r​esource/error_consol​e.lcf" />
+ <classpath>
+ <pathelement location="${build.classes}" />
+ <path refid="compile.classpath" />
+ </classpath>
+
+ <formatter type="xml"/>
+
+ <batchtest todir="${module.tes​ts.reports}">
+ <fileset dir="${module.tests.src}">
+ <include name="org/argouml/la​nguage/sql/Test*.jav​a"/>
+ </fileset>
+ </batchtest>
+
+ </junit>
+ <antcall target="junit-report-create" />
+ </target>
+
+ <target name="junit-report-create">
+ <junitreport todir="${module.tes​ts.reports}">
+ <fileset dir="${module.tests​.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${module.tes​ts.html-reports}"/​>
+ </junitreport>
+ </target>
+
+ <!-- ====================​====================​====================​======= -->
+ <!-- Javadoc -->
+ <!-- ====================​====================​====================​======= -->
+ <target name="javadocs" depends="init">
+ <mkdir dir="${module.javad​ocs.dir}"/>
+
+ <javadoc bottom="&lt;table width=&apos;100%​&apos;&gt;​&lt;tr&gt;​&lt;td width=&apos;25%&apos; align=&apos;left​&apos;&gt;Ar​goUML &amp;copy; 1996-2006&lt;/td​&gt;&lt;td width=&apos;25%&apos; align=&apos;cent​er&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/&apos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Homepage&lt;/a​&gt;&lt;/td​&gt;&lt;td width=&apos;25%&apos; align=&apos;cent​er&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/dev.html&a​pos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Developers' page&lt;/a&g​t;&lt;/td&gt​;&lt;td width=&apos;25%&apos; align=&apos;righ​t&apos;&gt;​&lt;a href=&apos;http://argouml.tigri​s.org/documentation/​defaulthtml/cookbook​/&apos; target=&apos;_bl​ank&apos;&gt​;ArgoUML Cookbook&lt;/a​&gt;&lt;/td​&gt;&lt;/tr​&gt;&lt;/table​&gt;"
+ destdir="${module.j​avadocs.dir}"
+ maxmemory="128M"
+ packagenames="org.argouml.*"
+ source="1.6"
+ use="true"
+ windowtitle="ArgoUML-SQL Javadoc for internal use">
+ <sourcepath>
+ <pathelement location="${module.​src.dir}"/>
+ </sourcepath>
+
+ <classpath>
+ <path refid="compile.classpath"/>
+ </classpath>
+ </javadoc>
+ </target>
+
 </project>

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r319 - trunk/build.xml linus Linus Tolke 2014-09-06 14:13:30 PDT
Messages per page: