Skip to Content.
Sympa Menu

notify-dpml - r1213 - in trunk/main: . transit/core

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1213 - in trunk/main: . transit/core
  • Date: Sat, 18 Mar 2006 12:21:47 +0100

Author: mcconnell
Date: 2006-03-18 12:21:46 +0100 (Sat, 18 Mar 2006)
New Revision: 1213

Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/bootstrap.properties
trunk/main/bootstrap.xml
trunk/main/transit/core/build.properties
trunk/main/transit/core/build.xml
Log:
resolve xmlapis/xerces install

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-03-17 19:05:31 UTC (rev 1212)
+++ trunk/main/bootstrap 2006-03-18 11:21:46 UTC (rev 1213)
@@ -37,6 +37,11 @@
cd .
}

+xmlSetup()
+{
+ ant -f bootstrap.xml xml
+}
+
dpmlCommon()
{
cd lang/common
@@ -144,6 +149,7 @@

ID=$1
antlibCleanup
+xmlSetup
dpmlCommon
dpmlPart
dpmlModule

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-03-17 19:05:31 UTC (rev 1212)
+++ trunk/main/bootstrap.bat 2006-03-18 11:21:46 UTC (rev 1213)
@@ -13,6 +13,8 @@
set ID=%1
CALL :antlib-cleanup
IF ERRORLEVEL 1 GOTO :exit
+CALL :xml-setup
+IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-common
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-part
@@ -55,6 +57,10 @@
POPD
GOTO :EOF

+:xml-setup
+CALL ant -f bootstrap.xml xml
+GOTO :EOF
+
:dpml-common
PUSHD lang\common
CALL :build clean install

Modified: trunk/main/bootstrap.properties
===================================================================
--- trunk/main/bootstrap.properties 2006-03-17 19:05:31 UTC (rev 1212)
+++ trunk/main/bootstrap.properties 2006-03-18 11:21:46 UTC (rev 1213)
@@ -16,4 +16,9 @@
ant.junit.filename = ant-junit-${transit-ant.version}.jar
ant.junit.uri = artifact:jar:ant/ant-junit#${transit-ant.version}

+xml.cache.path = org/apache/xml/jars
+xerces.filename = xerces-2.8.0.jar
+xmlapi.filename = xml-apis-2.8.0.jar
+xerces.url = ${dpml.repository}/${xml.cache.path}/${xerces.filename}
+xmlapi.url = ${dpml.repository}/${xml.cache.path}/${xmlapi.filename}


Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml 2006-03-17 19:05:31 UTC (rev 1212)
+++ trunk/main/bootstrap.xml 2006-03-18 11:21:46 UTC (rev 1213)
@@ -30,8 +30,9 @@

<property file="${user.home}/ant.properties"/>
<property file="${basedir}/user.properties"/>
+ <property file="${basedir}/build.properties"/>
+ <property name="home" location=""/>
<property file="${home}/user.properties"/>
- <property file="${basedir}/build.properties"/>
<property file="${home}/bootstrap.properties"/>

<property name="junit.url"
value="http://repository.dpml.net/classic/junit/jars/junit-3.8.1.jar"/>
@@ -478,6 +479,31 @@
<delete dir="${target.dir}"/>
</target>

+ <target name="xml-check" depends="dpml-setup">
+ <property name="endorsed.location" location="${java.home}\lib\endorsed"/>
+ <property name="xml.cache"
location="${dpml.local.cache}/${xml.cache.path}"/>
+ </target>
+
+ <target name="xmlapi-check" depends="xml-check">
+ <available property="javax.xml.available"
file="${endorsed.location}/${xmlapi.filename}"/>
+ </target>
+
+ <target name="xmlapi-install" depends="xmlapi-check"
unless="javax.xml.available">
+ <get usetimestamp="true" src="${xmlapi.url}"
dest="${xml.cache}/${xmlapi.filename}"/>
+ <copy file="${xml.cache}/${xmlapi.filename}"
toFile="${endorsed.location}/${xmlapi.filename}"/>
+ </target>
+
+ <target name="xerces-check" depends="xml-check">
+ <available property="xerces.available"
file="${endorsed.location}/${xerces.filename}"/>
+ </target>
+
+ <target name="xerces-install" depends="xerces-check"
unless="xerces.available">
+ <get usetimestamp="true" src="${xerces.url}"
dest="${xml.cache}/${xerces.filename}"/>
+ <copy file="${xml.cache}/${xerces.filename}"
toFile="${endorsed.location}/${xerces.filename}"/>
+ </target>
+
+ <target name="xml" depends="xmlapi-install,xerces-install"/>
+
</project>



Modified: trunk/main/transit/core/build.properties
===================================================================
--- trunk/main/transit/core/build.properties 2006-03-17 19:05:31 UTC (rev
1212)
+++ trunk/main/transit/core/build.properties 2006-03-18 11:21:46 UTC (rev
1213)
@@ -5,3 +5,4 @@
project.specification.version = 1.0
project.schema.version = 1.0

+

Modified: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml 2006-03-17 19:05:31 UTC (rev 1212)
+++ trunk/main/transit/core/build.xml 2006-03-18 11:21:46 UTC (rev 1213)
@@ -24,7 +24,7 @@
<property name="project.name" value="dpml-transit-main"/>

<property file="${basedir}/build.properties"/>
-
+ <property file="${home}/bootstrap.properties"/>
<import file="${home}/bootstrap.xml"/>

<target name="setup-path" depends="init">




  • r1213 - in trunk/main: . transit/core, mcconnell at BerliOS, 03/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page