Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1785 - in development/main: home home/transit home/transit/plugin home/transit/plugin/etc/bin magic/core

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1785 - in development/main: home home/transit home/transit/plugin home/transit/plugin/etc/bin magic/core
  • Date: Tue, 15 Feb 2005 13:31:33 +0100

Author: mcconnell
Date: Tue Feb 15 13:31:30 2005
New Revision: 1785

Modified:
development/main/home/build.xml
development/main/home/transit/build.xml
development/main/home/transit/plugin/build.xml
development/main/home/transit/plugin/etc/bin/transit.bat
development/main/magic/core/build.properties
Log:
fix a bug in the build that has been stuffing people around for the last
couple of days

Modified: development/main/home/build.xml
==============================================================================
--- development/main/home/build.xml (original)
+++ development/main/home/build.xml Tue Feb 15 13:31:30 2005
@@ -94,13 +94,13 @@

<!-- build the library -->
<mkdir dir="${local}/ant/jars"/>
+ <get xmlns="antlib:net.dpml.transit" property="localJUnitPath"
uri="${junit.uri}"/>
+ <copy file="${localJUnitPath}"
tofile="${local}/junit/jars/${junit.filename}"/>
<get xmlns="antlib:net.dpml.transit" property="localAntJUnitPath"
uri="${ant.junit.uri}"/>
- <copy file="${localAntJUnitPath}"
tofile="${local}/ant/jars/${transit-ant.filename}"/>
+ <copy file="${localAntJUnitPath}"
tofile="${local}/ant/jars/${ant.junit.filename}"/>
<get xmlns="antlib:net.dpml.transit" property="localAntPath"
uri="${ant.uri}"/>
<copy file="${localAntPath}"
tofile="${local}/ant/jars/${transit-ant.filename}"/>
<mkdir dir="${local}/junit/jars"/>
- <get xmlns="antlib:net.dpml.transit" property="localJUnitPath"
uri="${junit.uri}"/>
- <copy file="${localJUnitPath}"
tofile="${local}/junit/jars/${junit.filename}"/>
<copy todir="${local}/dpml/util">
<fileset dir="${basedir}/util/target/deliverables"/>
<fileset dir="${basedir}/util/cli/target/deliverables"/>

Modified: development/main/home/transit/build.xml
==============================================================================
--- development/main/home/transit/build.xml (original)
+++ development/main/home/transit/build.xml Tue Feb 15 13:31:30 2005
@@ -75,6 +75,13 @@

<mkdir dir="${api.dir}"/>
<javadoc overview="overview.html" destdir="${api.dir}" use="true">
+ <classpath>
+ <pathelement location="${ant.path}"/>
+ <pathelement location="${i18n.path}"/>
+ <pathelement location="${cli.path}"/>
+ <pathelement location="${exception.path}"/>
+ <pathelement location="${commons-cli.cache.path}"/>
+ </classpath>
<doctitle><![CDATA[<h1>${project.name} API, Build
${project.version}</h1>]]></doctitle>
<packageset dir="handler/target/build/main"/>
<packageset dir="plugin/target/build/main"/>
@@ -91,13 +98,6 @@
packagelistloc="${home}/etc/packagelists/ant"/>
<link offline="true"
href="http://www.dpml.net/api/dpml/util/${project.version}";
packagelistloc="${home}/util/target/api"/>
- <classpath>
- <pathelement location="${i18n.path}"/>
- <pathelement location="${cli.path}"/>
- <pathelement location="${exception.path}"/>
- <pathelement location="${commons-cli.cache.path}"/>
- <pathelement location="${ant.path}"/>
- </classpath>
</javadoc>
</target>


Modified: development/main/home/transit/plugin/build.xml
==============================================================================
--- development/main/home/transit/plugin/build.xml (original)
+++ development/main/home/transit/plugin/build.xml Tue Feb 15 13:31:30
2005
@@ -32,7 +32,7 @@

value="$DPML_HOME/local/dpml/transit/jars/dpml-transit-main-${project.version}.jar"
/>
<filter token="TRANSIT_VERSION" value="${project.version}"/>
<filter token="WINDOWS-CLI-CLASSPATH"
-
value="%DPML_SYSTEM_HOME%\local\dpml\transit\jars\dpml-transit-main-${project.version}.jar"
/>
+
value="%DPML_SYSTEM%\local\dpml\transit\jars\dpml-transit-main-${project.version}.jar"
/>
<filter token="UNIX-CLI-CLASSPATH"

value="$DPML_HOME/local/dpml/transit/jars/dpml-transit-main-${project.version}.jar"
/>
</target>

Modified: development/main/home/transit/plugin/etc/bin/transit.bat
==============================================================================
--- development/main/home/transit/plugin/etc/bin/transit.bat (original)
+++ development/main/home/transit/plugin/etc/bin/transit.bat Tue Feb 15
13:31:30 2005
@@ -15,14 +15,14 @@
set JAVA="%JAVA_HOME%\bin\java"

:SET_METRO
-if "%DPML_HOME%" == "" set DPML_HOME=%USERPROFILE%\.dpml
+if "%DPML_HOME%" == "" set DPML_HOME=%APPDATA%\DPML
if "%DPML_SYSTEM%" == "" set DPML_SYSTEM=%DPML_HOME%
if "%DPML_TRANSIT_CLASSPATH%" == "" set
DPML_TRANSIT_CLASSPATH=@WINDOWS-CLI-CLASSPATH@
if "%TRANSIT_PLUGIN%" == "" set TRANSIT_PLUGIN=@TRANSIT-PLUGIN-URI@

set CMD_LINE_ARGS=%*
set
SECURITY_POLICY=-Djava.security.policy="%DPML_SYSTEM%\bin\security.policy"
-set TRANSIT_CLASSPATH="%DPML_HOME%\transit\lib";"%DPML_TRANSIT_CLASSPATH%"
+set
TRANSIT_CLASSPATH="%DPML_HOME%\Preferences\transit\lib";"%DPML_TRANSIT_CLASSPATH%"

:RUN_METRO
%JAVA% %SECURITY_POLICY% %TRANSIT_JVM_OPTS% -classpath %TRANSIT_CLASSPATH%
net.dpml.transit.Main -Xbootstrap=%TRANSIT_PLUGIN% %CMD_LINE_ARGS%

Modified: development/main/magic/core/build.properties
==============================================================================
--- development/main/magic/core/build.properties (original)
+++ development/main/magic/core/build.properties Tue Feb 15 13:31:30
2005
@@ -4,5 +4,5 @@
project.group = dpml/magic
project.specification.version = 1.0

-checkstyle.uri = artifact:jar:checkstyle/checkstyle#3.4
+checkstyle.uri = artifact:jar:checkstyle/checkstyle#3.5




  • svn commit: r1785 - in development/main: home home/transit home/transit/plugin home/transit/plugin/etc/bin magic/core, mcconnell, 02/15/2005

Archive powered by MHonArc 2.6.24.

Top of Page