Author: dthompson
Date: 2008-04-19 14:20:57-0700
New Revision: 14405
Added:
trunk/src/argouml-build/build.bat (contents, props changed)
trunk/src/argouml-build/build.sh (contents, props changed)
trunk/src/argouml-build/build.xml
- copied, changed from r14403, /trunk/src/build.xml
trunk/src/argouml-build/default.properties
- copied, changed from r14403, /trunk/src/default.properties
Removed:
trunk/src/build.xml
trunk/src/default.properties
Modified:
trunk/src/ (props changed)
trunk/src/argouml-app/build.xml
trunk/src/argouml-core-model-mdr/build.xml
trunk/src/build.bat
trunk/src/build.sh
Log:
Issue 4625: Updated build scripts and build.xml files.
build targets: [run, clean, package] now working in Cygwin and WinXP cmd prompt
on SVN check-out.
Modified: trunk/src/argouml-app/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/build.xml?view=diff&rev=14405&p1=trunk/src/argouml-app/build.xml&p2=trunk/src/argouml-app/build.xml&r1=14404&r2=14405
==============================================================================
--- trunk/src/argouml-app/build.xml (original)
+++ trunk/src/argouml-app/build.xml 2008-04-19 14:20:57-0700
@@ -57,10 +57,10 @@
<fileset dir="lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="../infra/build/">
+ <fileset dir="../argouml-core-infra/build/">
<include name="*.jar"/>
</fileset>
- <fileset dir="../model/build/">
+ <fileset dir="../argouml-core-model/build/">
<include name="*.jar"/>
</fileset>
</path>
@@ -72,10 +72,10 @@
<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="../model-mdr/build/">
+ <fileset dir="../argouml-core-model-mdr/build/">
<include name="*.jar"/>
</fileset>
- <fileset dir="../model-euml/build/">
+ <fileset dir="../argouml-core-model-euml/build/">
<include name="*.jar"/>
</fileset>
</path>
@@ -90,7 +90,7 @@
<path id="tests.run.classpath">
<path refid="tests.compile.classpath"/>
- <fileset dir="../model-mdr/build/">
+ <fileset dir="../argouml-core-model-mdr/build/">
<include name="*.jar"/>
</fileset>
</path>
@@ -465,7 +465,7 @@
haltonfailure="false"
maxmemory="48M" printsummary="${junit.printsummary}">
<sysproperty key="test.model.uml"
- value="../model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml"/>
+
value="../argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml"/>
<sysproperty key="argouml.model.implementation"
value="${test.model.implementation}"/>
<sysproperty key="log4j.configuration"
value="org/argouml/resource/default.lcf"/>
Added: trunk/src/argouml-build/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.bat?view=auto&rev=14405
==============================================================================
--- (empty file)
+++ trunk/src/argouml-build/build.bat 2008-04-19 14:20:57-0700
@@ -0,0 +1,43 @@
[EMAIL PROTECTED] off
+
+rem
+rem build.bat always calls the version of ant distributed with ArgoUML
+rem
+
+setlocal
+
+echo Searching for tools dir...
+
+set ANT_HOME=..\..\tools\apache-ant-1.7.0
+echo trying %ANT_HOME%
+if exist %ANT_HOME% goto antpathok
+
+set ANT_HOME=..\argouml-core-tools\apache-ant-1.7.0
+echo trying %ANT_HOME%
+if exist %ANT_HOME% goto antpathok
+
+echo Could not find tools dir.
+goto endfail
+
+:antpathok
+echo Ant Found
+
+:: Convert relative path to absolute
+pushd "%ANT_HOME%"
+set ANT_HOME=%CD%
+popd
+
+call "%ANT_HOME%\bin\ant" %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+if ERRORLEVEL 1 goto endfail
+endlocal
+
+goto EOF
+
+:endfail
+echo.
+echo Build failed
+pause
+endlocal
+
+:EOF
\ No newline at end of file
Added: trunk/src/argouml-build/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.sh?view=auto&rev=14405
==============================================================================
--- (empty file)
+++ trunk/src/argouml-build/build.sh 2008-04-19 14:20:57-0700
@@ -0,0 +1,58 @@
+#! /bin/sh
+# $Id$
+#
+
+# OS specific support.
+darwin=false
+
+case "`uname`" in
+ Darwin*) darwin=true;;
+esac
+
+# +-------------------------------------------------------------------------+
+# | Verify and Set Required Environment Variables |
+# +-------------------------------------------------------------------------+
+if [ "$JAVA_HOME" = "" ] ; then
+ if $darwin; then
+ # Set Java Home automatically
+ JAVA_HOME=/Library/Java/Home
+ export JAVA_HOME
+ else
+ echo
"***************************************************************"
+ echo " ERROR: JAVA_HOME environment variable not found."
+ echo ""
+ echo " Please set JAVA_HOME to the Java JDK installation
directory."
+ echo
"***************************************************************"
+ exit 1
+ fi
+fi
+
+#
+# build.sh always calls the version of ant distributed with ArgoUML
+#
+
+if [ -e `pwd`/../argouml-core-tools ] ; then
+ ANT_HOME=`pwd`/../argouml-core-tools/apache-ant-1.7.0
+elif [ -e `pwd`/../../tools ] ; then
+ ANT_HOME=`pwd`/../../tools/apache-ant-1.7.0
+else
+ echo "***************************************************************"
+ echo " ERROR: tools directory not found."
+ echo ""
+ echo " Please check-out the argouml tools directory to"
+ echo ""
+ echo " `pwd`/../../tools"
+ echo " or"
+ echo " `pwd`/../argouml-core-tools"
+ echo "***************************************************************"
+ exit 1
+fi
+
+echo ANT_HOME is: $ANT_HOME
+echo
+echo Starting Ant...
+echo
+
+$ANT_HOME/bin/ant $*
+
+#exit
Copied: trunk/src/argouml-build/build.xml (from r14403, /trunk/src/build.xml)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/build.xml?view=diff&rev=14405&p1=/trunk/src/build.xml&p2=trunk/src/argouml-build/build.xml&r1=14403&r2=14405
==============================================================================
--- /trunk/src/build.xml (original)
+++ trunk/src/argouml-build/build.xml 2008-04-19 14:20:57-0700
@@ -63,13 +63,13 @@
Paths are resolved by specifying every jar in subdir/build to avoid
maintaining name changes of jars throughout the build.xml-files.
-This files is not used by the Eclipse setup. When building in Eclipse,
+This file is not used by the Eclipse setup. When building in Eclipse,
the project dependencies are used and Eclipse will take care of the
order. The subdir/build.xml files are used by the Eclipse setup.
-->
-<project basedir="." default="package" name="argouml">
+<project basedir=".." default="package" name="argouml">
<!-- =================================================================== -->
<!-- Global initialization -->
@@ -146,7 +146,8 @@
<format pattern="yyyy" property="year"/>
</tstamp>
- <property name="local.build.properties" value="build.properties"/>
+ <property name="local.build.properties"
+ value="argouml-build/build.properties"/>
<property name="user.build.properties"
value="${user.home}/argouml.build.properties"/>
<property file="${local.build.properties}"/>
@@ -154,9 +155,9 @@
<!-- we really need an absolute path for argo.root.dir -->
<!-- if it is set in a property file before now, it must be absolute -->
- <property name="argo.root.dir" value="${basedir}/.." />
+ <property name="argo.root.dir" value="${basedir}" />
<property file="${override.build.properties}"/>
- <property file="default.properties"/>
+ <property file="argouml-build/default.properties"/>
<property name="tests.reports" value="${argo.build.dir}/tests"/>
@@ -165,7 +166,7 @@
</path>
<path id="run.classpath">
- <fileset dir="../build/">
+ <fileset dir="build/">
<include name="*.jar"/>
</fileset>
</path>
@@ -237,34 +238,34 @@
description="Prepare all jar files, both built and just delivered.">
<!-- Build the subdirs in order. -->
- <ant dir="infra" inheritAll="false" target="jar"/>
- <ant dir="model" inheritAll="false" target="jar"/>
- <ant dir="model-mdr" inheritAll="false" target="jar"/>
+ <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="model-euml" inheritAll="false" target="jar"/> -->
- <ant dir="app" inheritAll="false" target="jar"/>
+ <ant dir="argouml-app" inheritAll="false" target="jar"/>
<!-- Copy everything to the build directory -->
<mkdir dir="${argo.build.dir}"/>
<copy todir="${argo.build.dir}">
- <fileset dir="infra/build">
+ <fileset dir="argouml-core-infra/build">
<include name="*"/>
</fileset>
- <fileset dir="model/build">
+ <fileset dir="argouml-core-model/build">
<include name="*"/>
</fileset>
- <fileset dir="model-mdr/build">
+ <fileset dir="argouml-core-model-mdr/build">
<include name="*"/>
</fileset>
<!-- model-euml Not currently included -->
- <fileset dir="app/build">
+ <fileset dir="argouml-app/build">
<include name="*"/>
</fileset>
</copy>
<!-- The argouml.jar is copied again and again since it is modified below
-->
<copy todir="${argo.build.dir}" overwrite="on">
- <fileset dir="app/build">
+ <fileset dir="argouml-app/build">
<include name="argouml.jar"/>
</fileset>
</copy>
@@ -303,19 +304,19 @@
<!-- Build the subdirs in order. -->
<!-- infra doesn't have tests. -->
- <ant dir="infra" inheritAll="false" target="jar"/>
+ <ant dir="argouml-core-infra" inheritAll="false" target="jar"/>
<!-- model doesn't have tests. -->
- <ant dir="model" inheritAll="false" target="jar"/>
+ <ant dir="argouml-core-model" inheritAll="false" target="jar"/>
- <ant dir="model-mdr" inheritAll="false" target="tests"/>
+ <ant dir="argouml-core-model-mdr" inheritAll="false" target="tests"/>
<!-- <ant dir="model-euml" inheritAll="false" target="tests"/> -->
- <ant dir="model-mdr" inheritAll="false" target="jar"/>
+ <ant dir="argouml-core-model-mdr" inheritAll="false" target="jar"/>
- <ant dir="app" inheritAll="false" target="tests"/>
+ <ant dir="argouml-app" inheritAll="false" target="tests"/>
<ant target="tests-reports"/>
</target>
@@ -343,11 +344,11 @@
<delete dir="${argo.build.dir}"/>
<!-- Build the subdirs in opposite order. -->
- <ant dir="app" inheritAll="false" target="clean"/>
- <ant dir="model-euml" inheritAll="false" target="clean"/>
- <ant dir="model-mdr" inheritAll="false" target="clean"/>
- <ant dir="model" inheritAll="false" target="clean"/>
- <ant dir="infra" 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"/>
+ <ant dir="argouml-core-model" inheritAll="false" target="clean"/>
+ <ant dir="argouml-core-infra" inheritAll="false" target="clean"/>
</target>
@@ -381,9 +382,9 @@
use="${javadoc.use}"
windowtitle="ArgoUML Javadoc for internal use">
<sourcepath>
- <pathelement location="app/src"/>
- <pathelement location="model/src"/>
- <pathelement location="model-mdr/src"/>
+ <pathelement location="argouml-app/src"/>
+ <pathelement location="argouml-core-model/src"/>
+ <pathelement location="argouml-core-model-mdr/src"/>
</sourcepath>
<classpath>
Copied: trunk/src/argouml-build/default.properties (from r14403,
/trunk/src/default.properties)
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-build/default.properties?view=diff&rev=14405&p1=/trunk/src/default.properties&p2=trunk/src/argouml-build/default.properties&r1=14403&r2=14405
==============================================================================
--- /trunk/src/default.properties (original)
+++ trunk/src/argouml-build/default.properties 2008-04-19 14:20:57-0700
@@ -7,12 +7,11 @@
#
# build.properties takes precedence over ${user.home}/argouml.build.properties
#
+# todo: There is some possible duplication of properties between
+# src/argouml-build/default.properties, and
+# src/argouml-app/default.properties
#
-# Argo version
-#
-argo.core.version=PRE-0.25.5
-#
# Compilation properties
#
debug=on
@@ -37,10 +36,10 @@
# set in one of the user's property files. It should be set to an absolute
# path so that it works for subcomponent builds.
#
-argo.tools.dir=${argo.root.dir}/tools
-argo.model.dir=${argo.root.dir}/src/model
-argo.mdr.dir=${argo.root.dir}/src/model-mdr
-argo.euml.dir=${argo.root.dir}/src/model-euml
+argo.tools.dir=${argo.root.dir}/argouml-core-tools
+argo.model.dir=${argo.root.dir}/argouml-core-model
+argo.mdr.dir=${argo.root.dir}/argouml-core-model-mdr
+argo.euml.dir=${argo.root.dir}/argouml-core-model-emul
#
argo.build.dir=${argo.root.dir}/build
#
@@ -59,7 +58,7 @@
#
# Docbook directory locations
#
-argo.docbook.dir=${argo.root.dir}/documentation/docbook-setup
+argo.docbook.dir=${argo.root.dir}/argouml-documentation/docbook-setup
#
@@ -74,16 +73,16 @@
# The defaults point to known on-line locations
#
jdk.javadoc.link=http://java.sun.com/j2se/1.5.0/docs/api
-jdk.javadoc.packagelist=app/lib/javadocs/j2se150
+jdk.javadoc.packagelist=argouml-app/lib/javadocs/j2se150
log4j.javadoc.link=http://jakarta.apache.org/log4j/docs/api
-log4j.javadoc.packagelist=infra/lib/javadocs/log4j
+log4j.javadoc.packagelist=argouml-core-infra/lib/javadocs/log4j
jmi.javadoc.link=http://java.sun.com/products/jmi/jmi-1_0-fr-doc/
-jmi.javadoc.packagelist=model-mdr/lib/javadocs/jmi
+jmi.javadoc.packagelist=argouml-core-model-mdr/lib/javadocs/jmi
gef.javadoc.link=http://gef.tigris.org/nonav/api/current
-gef.javadoc.packagelist=app/lib/javadocs/gef
+gef.javadoc.packagelist=argouml-app/lib/javadocs/gef
#
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=14405&p1=trunk/src/argouml-core-model-mdr/build.xml&p2=trunk/src/argouml-core-model-mdr/build.xml&r1=14404&r2=14405
==============================================================================
--- trunk/src/argouml-core-model-mdr/build.xml (original)
+++ trunk/src/argouml-core-model-mdr/build.xml 2008-04-19 14:20:57-0700
@@ -70,10 +70,10 @@
</path>
<path id="compile.classpath">
- <fileset dir="../infra/build/">
+ <fileset dir="../argouml-core-infra/build/">
<include name="*.jar"/>
</fileset>
- <fileset dir="../model/build/">
+ <fileset dir="../argouml-core-model/build/">
<include name="*.jar"/>
</fileset>
<path refid="mdr.compile.classpath"/>
Modified: trunk/src/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/build.bat?view=diff&rev=14405&p1=trunk/src/build.bat&p2=trunk/src/build.bat&r1=14404&r2=14405
==============================================================================
--- trunk/src/build.bat (original)
+++ trunk/src/build.bat 2008-04-19 14:20:57-0700
@@ -1,17 +1,11 @@
@echo off
rem
-rem build.bat always calls the version of ant distributed with ArgoUML
+rem A skeleton script to call the real build script at
+rem ./argouml-build/build.bat
rem
setlocal
-set ANT_HOME=..\tools\apache-ant-1.7.0
-
-:: Convert relative path to absolute
-pushd "%ANT_HOME%"
-set ANT_HOME=%CD%
-popd
-
-call "%ANT_HOME%\bin\ant" %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-endlocal
\ No newline at end of file
+cd argouml-build
+build.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+endlocal
Modified: trunk/src/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/build.sh?view=diff&rev=14405&p1=trunk/src/build.sh&p2=trunk/src/build.sh&r1=14404&r2=14405
==============================================================================
--- trunk/src/build.sh (original)
+++ trunk/src/build.sh 2008-04-19 14:20:57-0700
@@ -2,41 +2,9 @@
# $Id$
#
-# OS specific support.
-darwin=false
+# A skeleton script to call the real build script at
+# ./argouml-build/build.sh
-case "`uname`" in
- Darwin*) darwin=true;;
-esac
-
-# +-------------------------------------------------------------------------+
-# | Verify and Set Required Environment Variables |
-# +-------------------------------------------------------------------------+
-if [ "$JAVA_HOME" = "" ] ; then
- if $darwin; then
- # Set Java Home automatically
- JAVA_HOME=/Library/Java/Home
- export JAVA_HOME
- else
- echo
"***************************************************************"
- echo " ERROR: JAVA_HOME environment variable not found."
- echo ""
- echo " Please set JAVA_HOME to the Java JDK installation
directory."
- echo
"***************************************************************"
- exit 1
- fi
-fi
-
-#
-# build.sh always calls the version of ant distributed with ArgoUML
-#
-ANT_HOME=`pwd`/../tools/apache-ant-1.7.0
-
-echo ANT_HOME is: $ANT_HOME
-echo
-echo Starting Ant...
-echo
-
-$ANT_HOME/bin/ant $*
-
-#exit
+cd argouml-build
+./build.sh $*
+cd ..
Removed: trunk/src/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/build.xml?view=auto&rev=14404
Removed: trunk/src/default.properties
Url:
http://argouml.tigris.org/source/browse/argouml/trunk/src/default.properties?view=auto&rev=14404
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
