Skip to Content.
Sympa Menu

notify-dpml - r2059 - in trunk: . central/site/src/docs/about/resources main/depot/build main/depot/build/etc/bin main/depot/build/src/main/dpml/build main/depot/library main/depot/tools main/external main/metro/main/etc/bin main/metro/part main/metro/station/etc/bin main/transit/core tutorials/tooling/unit

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r2059 - in trunk: . central/site/src/docs/about/resources main/depot/build main/depot/build/etc/bin main/depot/build/src/main/dpml/build main/depot/library main/depot/tools main/external main/metro/main/etc/bin main/metro/part main/metro/station/etc/bin main/transit/core tutorials/tooling/unit

Chronological Thread  
    < Chronological >       < Thread >
  • From: davidoff at BerliOS <davidoff AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r2059 - in trunk: . central/site/src/docs/about/resources main/depot/build main/depot/build/etc/bin main/depot/build/src/main/dpml/build main/depot/library main/depot/tools main/external main/metro/main/etc/bin main/metro/part main/metro/station/etc/bin main/transit/core tutorials/tooling/unit
  • Date: Wed, 21 Oct 2009 13:03:54 +0200
Author: davidoff
Date: 2009-10-21 13:03:34 +0200 (Wed, 21 Oct 2009)
New Revision: 2059

Modified:
trunk/bootstrap.properties
trunk/bootstrap.sh
trunk/bootstrap.xml
trunk/build.xml
trunk/central/site/src/docs/about/resources/navigation.xml
trunk/main/depot/build/bootstrap.xml
trunk/main/depot/build/etc/bin/build
trunk/main/depot/build/src/main/dpml/build/Main.java
trunk/main/depot/library/bootstrap.xml
trunk/main/depot/tools/bootstrap.xml
trunk/main/external/index.xml
trunk/main/metro/main/etc/bin/metro
trunk/main/metro/part/bootstrap.xml
trunk/main/metro/station/etc/bin/station
trunk/main/transit/core/bootstrap.xml
trunk/tutorials/tooling/unit/project.xml
Log:
Housekeeping.

Modified: trunk/bootstrap.properties
===================================================================
--- trunk/bootstrap.properties 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/bootstrap.properties 2009-10-21 11:03:34 UTC (rev 2059)
@@ -11,7 +11,7 @@
junit.uri = artifact:jar:junit/junit#${junit.version}
junit.url =
http://repository.dpml.net/modern/junit/junit/${junit.version}/${junit.filename}

-transit-ant.version = 1.7.0
+transit-ant.version = 1.7.1
transit-ant.filename = ant-${transit-ant.version}.jar
transit-ant.parent = ant/jars
transit-ant.path = ${transit-ant.parent}/${transit-ant.filename}

Modified: trunk/bootstrap.sh
===================================================================
--- trunk/bootstrap.sh 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/bootstrap.sh 2009-10-21 11:03:34 UTC (rev 2059)
@@ -16,11 +16,11 @@
fi
}

-dpmlLibrary()
+dpmlTransit()
{
- cd main/depot/library
+ cd main/transit/core
executeAnt -f bootstrap.xml clean install
- cd ../../..
+ cd ../../..
}

dpmlPart()
@@ -30,11 +30,11 @@
cd ../../..
}

-dpmlTransit()
+dpmlLibrary()
{
- cd main/transit/core
+ cd main/depot/library
executeAnt -f bootstrap.xml clean install
- cd ../../..
+ cd ../../..
}

dpmlCli()

Modified: trunk/bootstrap.xml
===================================================================
--- trunk/bootstrap.xml 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/bootstrap.xml 2009-10-21 11:03:34 UTC (rev 2059)
@@ -110,17 +110,31 @@
<property name="dpml.config" location="${dpml.system}/config"/>
<mkdir dir="${dpml.config}"/>
</target>
-
+
+ <!--
<target name="junit-download" depends="dpml-data"
unless="junit.cache.available">
<mkdir dir="${dpml.local.cache}/junit/jars"/>
<get src="${junit.url}" usetimestamp="true"
dest="${dpml.local.cache}/junit/jars/${junit.filename}"/>
- </target>
+ </target>
+ -->

- <target name="junit-test" depends="junit-download">
- <available property="junit.available"
file="${user.home}/.ant/lib/junit.jar"/>
+ <target name="junit-win32" if="isWindows">
+ <property name="junit.path" location="${user.home}/.ant/lib/junit.jar"/>
+ </target>
+
+ <target name="junit-nix" unless="isWindows">
+ <property name="junit.path" location="/usr/share/java/junit.jar"/>
+ </target>
+
+ <target name="junit-test" depends="junit-win32,junit-nix">
+ <available property="junit.available" file="${junit.path}"/>
+ </target>
+
+ <target name="junit-setup" depends="junit-test" unless="junit.available">
+ <fail message="Failed to locate junit."/>
</target>

- <target name="junit-setup" depends="junit-test" unless="junit.available">
+ <target name="junit-setup-disabled" depends="junit-test"
unless="junit.available">
<property name="junit.url"
value="${dpml.repository}/junit/jars/${junit.filename}"/>
<echo>

#----------------------------------------------------------------------------------
@@ -209,7 +223,7 @@
<path id="project.test.path">
<path refid="project.main.path"/>
<pathelement location="${ant.home}/lib/ant-junit.jar"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
</path>
</target>


Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/build.xml 2009-10-21 11:03:34 UTC (rev 2059)
@@ -25,6 +25,10 @@
<condition property="nsis.available" value="true">
<isset property="ENV.NSIS_HOME"/>
</condition>
+
+ <condition property="snapshot" value="true">
+ <equals arg1="SNAPSHOT" arg2="${project.version}"/>
+ </condition>

<x:import uri="local:template:dpml/depot/standard"/>

@@ -79,7 +83,7 @@
<echo>Created target/dist/dpml-sdk-win32-${project.version}.exe</echo>
</target>

- <target name="debian" depends="prepare">
+ <target name="debian" depends="prepare" unless="snapshot">
<echo>Building Debian Installer</echo>
<x:get uri="artifact:jar:com/google/code/ant-deb/ant-deb-task#20070903"
property="debian.jar"/>
<path id="debian.path">

Modified: trunk/central/site/src/docs/about/resources/navigation.xml
===================================================================
--- trunk/central/site/src/docs/about/resources/navigation.xml 2009-10-20
09:09:27 UTC (rev 2058)
+++ trunk/central/site/src/docs/about/resources/navigation.xml 2009-10-21
11:03:34 UTC (rev 2059)
@@ -23,7 +23,7 @@

<body>
<menu>
- <item name="Mailing Lists" href="lists.html"/>
+ <!--<item name="Mailing Lists" href="lists.html"/> (moving to blog) -->
<!--<item name="Issue Tracking" href="issues.html"/>-->
<item name="SVN Code Management" href="svn.html"/>
<item name="Build Procedure" href="build.html"/>

Modified: trunk/main/depot/build/bootstrap.xml
===================================================================
--- trunk/main/depot/build/bootstrap.xml 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/depot/build/bootstrap.xml 2009-10-21 11:03:34 UTC (rev
2059)
@@ -25,7 +25,7 @@
</path>
<path id="project.test.path">
<path refid="project.main.path"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
<pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
</path>
</target>

Modified: trunk/main/depot/build/etc/bin/build
===================================================================
--- trunk/main/depot/build/etc/bin/build 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/depot/build/etc/bin/build 2009-10-21 11:03:34 UTC (rev
2059)
@@ -35,5 +35,6 @@

BUILD_ARGS=$@
ARGS="$JVM_OPTIONS dpml.util.Main $BUILD_ARGS"
-echo $ARGS | xargs "java"
+COMMAND="exec \"java\" $ARGS"
+eval $COMMAND


Modified: trunk/main/depot/build/src/main/dpml/build/Main.java
===================================================================
--- trunk/main/depot/build/src/main/dpml/build/Main.java 2009-10-20
09:09:27 UTC (rev 2058)
+++ trunk/main/depot/build/src/main/dpml/build/Main.java 2009-10-21
11:03:34 UTC (rev 2059)
@@ -134,9 +134,29 @@
* @return the logical result of executation - a value less than zero
indicates failure
*/
public int run( InputStream in, OutputStream out, OutputStream err,
String... arguments )
- {
+ {
+
+ // handle the simple case of $ depot -version
+
+ try
+ {
+ CommandLine line = getCommandLine( arguments );
+ if( line.hasOption( VERSION_OPTION ) )
+ {
+ printVersionMessage();
+ return 0;
+ }
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Unexpected error.";
+ m_logger.error( error, e );
+ return -1;
+ }
+
// setup the project/resource index
-
+
try
{
m_library = new DefaultLibrary( m_logger );
@@ -264,8 +284,8 @@
buffer.append( "\n DPML Depot" );
buffer.append( "\n Version @PROJECT-VERSION@" );
buffer.append( "\n Codebase " +
getClass().getProtectionDomain().getCodeSource().getLocation() );
- buffer.append( "\n Copyright 2005-2007 Stephen J. McConnell" );
- buffer.append( "\n Digital Product Management Library" );
+ buffer.append( "\n Copyright 2005-2009 Stephen J. McConnell" );
+ buffer.append( "\n Digital Product Management Labs" );
buffer.append( "\n" );
String message = buffer.toString();
m_logger.info( message );

Modified: trunk/main/depot/library/bootstrap.xml
===================================================================
--- trunk/main/depot/library/bootstrap.xml 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/depot/library/bootstrap.xml 2009-10-21 11:03:34 UTC (rev
2059)
@@ -16,7 +16,7 @@
</path>
<path id="project.test.path">
<path refid="project.main.path"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
<pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
</path>
</target>

Modified: trunk/main/depot/tools/bootstrap.xml
===================================================================
--- trunk/main/depot/tools/bootstrap.xml 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/depot/tools/bootstrap.xml 2009-10-21 11:03:34 UTC (rev
2059)
@@ -36,7 +36,7 @@
</path>
<path id="project.test.path">
<path refid="project.main.path"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
<pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
</path>
</target>

Modified: trunk/main/external/index.xml
===================================================================
--- trunk/main/external/index.xml 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/main/external/index.xml 2009-10-21 11:03:34 UTC (rev 2059)
@@ -28,7 +28,7 @@

</module>

- <module name="org/apache/ant" version="1.7.0" basedir="ant">
+ <module name="org/apache/ant" version="1.7.1" basedir="ant">

<properties>
<property name="project.publisher.name" value="Apache Software
Foundation"/>

Modified: trunk/main/metro/main/etc/bin/metro
===================================================================
--- trunk/main/metro/main/etc/bin/metro 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/main/metro/main/etc/bin/metro 2009-10-21 11:03:34 UTC (rev 2059)
@@ -36,5 +36,6 @@

METRO_ARGS=$@
ARGS="$JVM_OPTIONS dpml.util.Main $METRO_ARGS"
-echo $ARGS | xargs "java"
+COMMAND="exec \"java\" $ARGS"
+eval $COMMAND


Modified: trunk/main/metro/part/bootstrap.xml
===================================================================
--- trunk/main/metro/part/bootstrap.xml 2009-10-20 09:09:27 UTC (rev 2058)
+++ trunk/main/metro/part/bootstrap.xml 2009-10-21 11:03:34 UTC (rev 2059)
@@ -39,7 +39,7 @@
<pathelement location="${ant.home}/lib/ant.jar"/>
<pathelement location="${ant.home}/lib/ant-junit.jar"/>
<pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
</path>
</target>

@@ -140,7 +140,6 @@
<attribute name="Implementation-Vendor" value="DPML"/>
<attribute name="Implementation-Vendor-Id" value="net.dpml"/>
<attribute name="Implementation-Version"
value="${project.version}"/>
- <attribute name="Main-Class" value="dpml.util.Main"/>
</manifest>
</jar>
<echo file="${target.deliverables.jars.dir}/${project.name}.jar.link"

Modified: trunk/main/metro/station/etc/bin/station
===================================================================
--- trunk/main/metro/station/etc/bin/station 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/metro/station/etc/bin/station 2009-10-21 11:03:34 UTC (rev
2059)
@@ -36,5 +36,6 @@

STATION_ARGS=$@
ARGS="$JVM_OPTIONS dpml.util.Main $STATION_ARGS"
-echo $ARGS | xargs "java"
+COMMAND="exec \"java\" $ARGS"
+eval $COMMAND


Modified: trunk/main/transit/core/bootstrap.xml
===================================================================
--- trunk/main/transit/core/bootstrap.xml 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/main/transit/core/bootstrap.xml 2009-10-21 11:03:34 UTC (rev
2059)
@@ -32,7 +32,7 @@
<pathelement location="${ant.home}/lib/ant.jar"/>
<pathelement location="${ant.home}/lib/ant-junit.jar"/>
<pathelement
location="${target.deliverables.jars.dir}/${project.filename}"/>
- <pathelement
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
+ <pathelement location="${junit.path}"/>
</path>
</target>

@@ -41,14 +41,20 @@
<filter token="PROJECT-GROUP" value="${project.group}"/>
<filter token="PROJECT-VERSION" value="${project.version}"/>
</target>
-
+
<target name="package" depends="build">
<mkdir dir="${target.deliverables.jars.dir}"/>
<jar destfile="${target.deliverables.jars.dir}/${project.filename}"
- basedir="${target.classes.dir}"
- includes="**/*.*" excludes="**/*.html,**/*.png"
- index="true">
+ basedir="${target.classes.dir}"
+ includes="**/*.*"
+ excludes="**/*.html,**/*.gif,**/*.png">
+ <manifest>
+ <attribute name="Created-By" value="The Digital Product Management
Library."/>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Main-Class" value="dpml.util.Main"/>
+ </manifest>
</jar>
+
<checksum fileext=".md5"
file="${target.deliverables.jars.dir}/${project.filename}"/>
<delete file="${target.deliverables.jars.dir}/${project.filename}.asc"/>
<antcall target="execute.jar.asc"/>
@@ -64,35 +70,19 @@
</target>

<target name="install" depends="bootstrap.install">
- <property name="lib" location="${dpml.system}/lib"/>
+ <property name="lib" location="${dpml.system}/lib"/>
<property name="short.filename" value="${project.name}.jar"/>
<property name="long.filename"
value="${project.name}-${project.version}.jar"/>
+ <property name="lib.filename" location="${lib}/ext/${short.filename}"/>
<mkdir dir="${lib}/ext"/>
<echo>

#----------------------------------------------------------------------------------
-# Updating DPML Lib ${lib}
+# Updating DPML Lib ${lib.filename}
+# Using ${target.deliverables.jars.dir}/${long.filename}

#----------------------------------------------------------------------------------
</echo>
- <!--
- <delete verbose="true" failonerror="false">
- <fileset dir="${lib}">
- <include name="${project.name}-*.*"/>
- <exclude name="${short.filename}"/>
- </fileset>
- </delete>
- -->
- <copy toFile="${lib}/ext/${short.filename}" preservelastmodified="true"
overwrite="true"
- file="${target.deliverables.jars.dir}/${long.filename}"/>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating Ant. ${user.home}/.ant/lib
-#----------------------------------------------------------------------------------
- </echo>
- <!--
- <copy preservelastmodified="true" overwrite="true"
- tofile="${user.home}/.ant/lib/${short.filename}"
- file="${target.deliverables.jars.dir}/${long.filename}"/>
- -->
+ <copy toFile="${lib.filename}" overwrite="true"
+ file="${target.deliverables.jars.dir}/${long.filename}"
verbose="true"/>
</target>

</project>

Modified: trunk/tutorials/tooling/unit/project.xml
===================================================================
--- trunk/tutorials/tooling/unit/project.xml 2009-10-20 09:09:27 UTC (rev
2058)
+++ trunk/tutorials/tooling/unit/project.xml 2009-10-21 11:03:34 UTC (rev
2059)
@@ -16,8 +16,8 @@

<dependencies>
<test>
- <include uri="artifact:jar:org/apache/ant/ant#1.7.0"/>
- <include uri="artifact:jar:org/apache/ant/ant-junit#1.7.0"/>
+ <include uri="artifact:jar:org/apache/ant/ant#1.7.1"/>
+ <include uri="artifact:jar:org/apache/ant/ant-junit#1.7.1"/>
<include uri="artifact:jar:junit/junit#4.2"/>
</test>
</dependencies>



  • r2059 - in trunk: . central/site/src/docs/about/resources main/depot/build main/depot/build/etc/bin main/depot/build/src/main/dpml/build main/depot/library main/depot/tools main/external main/metro/main/etc/bin main/metro/part main/metro/station/etc/bin main/transit/core tutorials/tooling/unit, davidoff at BerliOS, 10/21/2009

Archive powered by MHonArc 2.6.24.

Top of Page