Author: dthompson
Date: 2008-03-22 08:57:16-0700
New Revision: 14212
Added:
branches/work_issue4625_dthompson/src/argouml-app/
- copied from r14195, /branches/work_issue4625_dthompson/src/app/
branches/work_issue4625_dthompson/src/argouml-build/
branches/work_issue4625_dthompson/src/argouml-build/build.bat
- copied, changed from r14191, /trunk/src/build.bat
branches/work_issue4625_dthompson/src/argouml-build/build.sh
- copied, changed from r14191, /trunk/src/build.sh
branches/work_issue4625_dthompson/src/argouml-build/build.xml
- copied, changed from r14191, /trunk/src/build.xml
branches/work_issue4625_dthompson/src/argouml-build/default.properties
- copied, changed from r14191, /trunk/src/default.properties
branches/work_issue4625_dthompson/src/argouml-core-infra/
- copied from r14195, /branches/work_issue4625_dthompson/src/infra/
branches/work_issue4625_dthompson/src/argouml-core-model/
- copied from r14195, /branches/work_issue4625_dthompson/src/model/
branches/work_issue4625_dthompson/src/argouml-core-model-euml/
- copied from r14195, /branches/work_issue4625_dthompson/src/model-euml/
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/
- copied from r14195, /branches/work_issue4625_dthompson/src/model-mdr/
Removed:
branches/work_issue4625_dthompson/src/app/
branches/work_issue4625_dthompson/src/argouml-app/src/build.bat
branches/work_issue4625_dthompson/src/argouml-app/src/build.sh
branches/work_issue4625_dthompson/src/argouml-app/src/build2.bat
branches/work_issue4625_dthompson/src/argouml-app/src/build2.sh
branches/work_issue4625_dthompson/src/argouml-core-model-euml/build.bat
branches/work_issue4625_dthompson/src/argouml-core-model-euml/build.sh
branches/work_issue4625_dthompson/src/argouml-core-model-euml/build2.bat
branches/work_issue4625_dthompson/src/argouml-core-model-euml/build2.sh
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.bat
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.sh
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build2.bat
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build2.sh
branches/work_issue4625_dthompson/src/build.xml
branches/work_issue4625_dthompson/src/default.properties
branches/work_issue4625_dthompson/src/infra/
branches/work_issue4625_dthompson/src/model/
branches/work_issue4625_dthompson/src/model-euml/
branches/work_issue4625_dthompson/src/model-mdr/
Modified:
branches/work_issue4625_dthompson/src/ (props changed)
branches/work_issue4625_dthompson/src/argouml-app/build.xml
branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml
branches/work_issue4625_dthompson/src/build.bat
branches/work_issue4625_dthompson/src/build.sh
Log:
Experimental repository restructuring (argouml-build folder for cmd line build
scripts & config).
build.sh working, build.bat not working yet. (See option 2 in my 13/3/2008
post at http://argouml.tigris.org/issues/show_bug.cgi?id=4625).
Modified: branches/work_issue4625_dthompson/src/argouml-app/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-app/build.xml?view=diff&rev=14212&p1=/branches/work_issue4625_dthompson/src/app/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-app/build.xml&r1=14195&r2=14212
==============================================================================
--- /branches/work_issue4625_dthompson/src/app/build.xml (original)
+++ branches/work_issue4625_dthompson/src/argouml-app/build.xml 2008-03-22
08:57:16-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>
@@ -340,6 +340,7 @@
<copy file="src/README.txt" tofile="${build.dir}/README.txt"/>
<copy file="src/bin/argouml.sh" todir="${build.dir}"/>
+ <copy file="src/bin/ArgoUML.ico" todir="${build.dir}"/>
<copy file="src/bin/argouml.bat" todir="${build.dir}"/>
</target>
Removed: /branches/work_issue4625_dthompson/src/app/src/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/app/src/build.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/app/src/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/app/src/build.sh?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/app/src/build2.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/app/src/build2.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/app/src/build2.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/app/src/build2.sh?view=auto&rev=14195
Copied: branches/work_issue4625_dthompson/src/argouml-build/build.bat (from
r14191, /trunk/src/build.bat)
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/build.bat?view=diff&rev=14212&p1=/trunk/src/build.bat&p2=branches/work_issue4625_dthompson/src/argouml-build/build.bat&r1=14191&r2=14212
==============================================================================
--- /trunk/src/build.bat (original)
+++ branches/work_issue4625_dthompson/src/argouml-build/build.bat
2008-03-22 08:57:16-0700
@@ -5,7 +5,22 @@
rem
setlocal
-set ANT_HOME=..\tools\apache-ant-1.7.0
+
+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%"
@@ -14,4 +29,13 @@
call "%ANT_HOME%\bin\ant" %1 %2 %3 %4 %5 %6 %7 %8 %9
-endlocal
\ No newline at end of file
+endlocal
+
+goto EOF
+
+:endfail
+echo.
+echo Build failed
+pause
+
+:EOF
\ No newline at end of file
Copied: branches/work_issue4625_dthompson/src/argouml-build/build.sh (from
r14191, /trunk/src/build.sh)
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/build.sh?view=diff&rev=14212&p1=/trunk/src/build.sh&p2=branches/work_issue4625_dthompson/src/argouml-build/build.sh&r1=14191&r2=14212
==============================================================================
--- /trunk/src/build.sh (original)
+++ branches/work_issue4625_dthompson/src/argouml-build/build.sh
2008-03-22 08:57:16-0700
@@ -30,7 +30,24 @@
#
# build.sh always calls the version of ant distributed with ArgoUML
#
-ANT_HOME=`pwd`/../tools/apache-ant-1.7.0
+
+# todo, add 'if exist' here ... to take care of the two possible tool
locations.
+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
Copied: branches/work_issue4625_dthompson/src/argouml-build/build.xml (from
r14191, /trunk/src/build.xml)
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/build.xml?view=diff&rev=14212&p1=/trunk/src/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-build/build.xml&r1=14191&r2=14212
==============================================================================
--- /trunk/src/build.xml (original)
+++ branches/work_issue4625_dthompson/src/argouml-build/build.xml
2008-03-22 08:57:16-0700
@@ -19,7 +19,7 @@
is specified (currently 'compile').
Executing build.bat/build.sh will use the version of Ant from
-the ArgoUML CVS repository. You can use
+the ArgoUML CVS repository. You can use
build -version
to find out what the current version is.
@@ -31,7 +31,7 @@
Property Settings
=================
The default property settings are in "default.properties". To override
-them, create a file called "build.properties" here or
+them, create a file called "build.properties" here or
"argouml.build.properties" in your home directory. Order of precedence
is the reverse of the order they are mentioned in above.
@@ -44,16 +44,16 @@
Roles of the different build.xml files
======================================
-There is a build.xml for each subsystem i.e. in each subdirectory.
+There is a build.xml for each subsystem i.e. in each subdirectory.
They each have the following targets:
- jar - to build everything and move all created and exported jars
+ jar - to build everything and move all created and exported jars
to subdir/build
clean - to remove subdir/build
tests (optional) - to run all tests. Property junit.failure is set if
any of the test fails.
compile, compile-tests (optional) (local to build.xml and used by
tests, and jar)
-The jar and tests target rely on the contents of subdir/build for other
+The jar and tests target rely on the contents of subdir/build for other
subdirectories i.e. they depend on jars exported from other subsystems.
Circular dependencies is not allowed. This build.xml contains an ordered
list defining in what order they are built (using the jar target). This
@@ -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="compile" name="argouml">
+<project basedir=".." default="package" name="argouml">
<!-- =================================================================== -->
<!-- Global initialization -->
@@ -146,17 +146,26 @@
<format pattern="yyyy" property="year"/>
</tstamp>
- <property name="local.build.properties" value="build.properties"/>
- <property name="user.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}"/>
<property file="${user.build.properties}"/>
<!-- 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"/>
+
+ <!-- START OF DEBUG CODE -->
+ <echo>
+ Argo version ${argo.core.version}
+ User home: ${user.home}
+ Argo build dir: ${argo.build.dir}
+ </echo>
+ <!-- END OF DEBUG CODE -->
<property name="tests.reports" value="${argo.build.dir}/tests"/>
@@ -165,7 +174,7 @@
</path>
<path id="run.classpath">
- <fileset dir="../build/">
+ <fileset dir="build/">
<include name="*.jar"/>
</fileset>
</path>
@@ -237,34 +246,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>
@@ -273,15 +282,13 @@
<property name="manifest.update" value="mf.mf"/>
<exec executable="sh">
<arg value="-c"/>
- <arg value="( cd ../build; echo Class-Path: *.jar ext/*.jar >
${manifest.update} )"/>
+ <arg value="( cd build; echo Class-Path: *.jar ext/*.jar >
${manifest.update} )"/>
</exec>
- <!--
<exec executable="sh">
<arg value="-c"/>
- <arg value="( cd ../build; $JAVA_HOME/bin/jar ufm argouml.jar mf.mf )"/>
+ <arg value="( cd build; $JAVA_HOME/bin/jar ufm argouml.jar mf.mf )"/>
</exec>
- -->
<jar update="true"
basedir="${argo.build.dir}"
@@ -337,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>
Copied: branches/work_issue4625_dthompson/src/argouml-build/default.properties
(from r14191, /trunk/src/default.properties)
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/default.properties?view=diff&rev=14212&p1=/trunk/src/default.properties&p2=branches/work_issue4625_dthompson/src/argouml-build/default.properties&r1=14191&r2=14212
==============================================================================
--- /trunk/src/default.properties (original)
+++ branches/work_issue4625_dthompson/src/argouml-build/default.properties
2008-03-22 08:57:16-0700
@@ -37,10 +37,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-euml
#
argo.build.dir=${argo.root.dir}/build
#
@@ -59,7 +59,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 +74,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
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
#
Removed: /branches/work_issue4625_dthompson/src/model-euml/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-euml/build.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-euml/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-euml/build.sh?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-euml/build2.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-euml/build2.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-euml/build2.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-euml/build2.sh?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-mdr/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-mdr/build.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-mdr/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-mdr/build.sh?view=auto&rev=14195
Modified: branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml?view=diff&rev=14212&p1=/branches/work_issue4625_dthompson/src/model-mdr/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml&r1=14195&r2=14212
==============================================================================
--- /branches/work_issue4625_dthompson/src/model-mdr/build.xml (original)
+++ branches/work_issue4625_dthompson/src/argouml-core-model-mdr/build.xml
2008-03-22 08:57:16-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"/>
Removed: /branches/work_issue4625_dthompson/src/model-mdr/build2.bat
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-mdr/build2.bat?view=auto&rev=14195
Removed: /branches/work_issue4625_dthompson/src/model-mdr/build2.sh
Url:
http://argouml.tigris.org/source/browse/argouml//branches/work_issue4625_dthompson/src/model-mdr/build2.sh?view=auto&rev=14195
Modified: branches/work_issue4625_dthompson/src/build.bat
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/build.bat?view=diff&rev=14212&p1=branches/work_issue4625_dthompson/src/build.bat&p2=branches/work_issue4625_dthompson/src/build.bat&r1=14211&r2=14212
==============================================================================
--- branches/work_issue4625_dthompson/src/build.bat (original)
+++ branches/work_issue4625_dthompson/src/build.bat 2008-03-22 08:57:16-0700
@@ -1,17 +1,5 @@
@echo off
-rem
-rem build.bat always calls the version of ant distributed with ArgoUML
-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
+cd ..
Modified: branches/work_issue4625_dthompson/src/build.sh
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/build.sh?view=diff&rev=14212&p1=branches/work_issue4625_dthompson/src/build.sh&p2=branches/work_issue4625_dthompson/src/build.sh&r1=14211&r2=14212
==============================================================================
--- branches/work_issue4625_dthompson/src/build.sh (original)
+++ branches/work_issue4625_dthompson/src/build.sh 2008-03-22 08:57:16-0700
@@ -2,41 +2,8 @@
# $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
-#
-ANT_HOME=`pwd`/../tools/apache-ant-1.7.0
-
-echo ANT_HOME is: $ANT_HOME
-echo
-echo Starting Ant...
-echo
-
-$ANT_HOME/bin/ant $*
+cd argouml-build
+./build.sh
+cd ..
#exit
Removed: branches/work_issue4625_dthompson/src/build.xml
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/build.xml?view=auto&rev=14211
Removed: branches/work_issue4625_dthompson/src/default.properties
Url:
http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/default.properties?view=auto&rev=14211
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
