[MOBY-guts] biomoby commit
Martin Senger
senger at dev.open-bio.org
Wed Feb 20 08:05:41 UTC 2008
senger
Wed Feb 20 03:05:41 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv14927/xmls
Modified Files:
mosesBuild.xml
Log Message:
Fixed: build file for generating moses datatypes and libraries to use maven
moby-live/Java/xmls mosesBuild.xml,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml 2008/02/14 06:13:37 1.2
+++ /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml 2008/02/20 08:05:40 1.3
@@ -44,7 +44,7 @@
-->
<!-- A directories containing generated code -->
-<!-- (the dir.generated is definedin the parent build.xml) -->
+<!-- (the dir.generated is defined in the parent build.xml) -->
<property name="src.datatypes" location="${dir.generated}/datatypes"/>
<property name="src.skeletons" location="${dir.generated}/skeletons"/>
@@ -59,13 +59,50 @@
<property name="classes.datatypes" location="${build.others}/datatypes"/>
<property name="classes.skeletons" location="${build.others}/skeletons"/>
-<!-- Additional classpath (includes classes of generated sources) -->
-<path id="moses.build.classpath">
- <path refid="build.classpath"/>
- <path refid="dependency.classpath"/>
- <pathelement location="${classes.datatypes}"/>
- <pathelement location="${classes.skeletons}"/>
-</path>
+<!-- ================================================================== -->
+<!-- Moses Initialization -->
+<!-- ================================================================== -->
+<target name="moses-init" depends="init">
+
+ <!-- Additional classpath (includes classes of generated sources) -->
+ <path id="moses.build.classpath">
+ <path refid="build.classpath"/>
+ <path refid="dependency.classpath"/>
+ <pathelement location="${classes.datatypes}"/>
+ <pathelement location="${classes.skeletons}"/>
+ </path>
+
+ <copy todir="${build.classes}/templates">
+ <fileset dir="${src.templates}"/>
+ </copy>
+ <mkdir dir="${src.datatypes}"/>
+ <mkdir dir="${src.skeletons}"/>
+ <mkdir dir="${classes.datatypes}"/>
+ <mkdir dir="${classes.skeletons}"/>
+
+ <property name="moses.quiet" value="false"/>
+ <condition property="real.moses.quiet" value="-q" else="">
+ <istrue value="${moses.quiet}"/>
+ </condition>
+
+ <property name="moses.nogener" value="false"/>
+ <condition property="real.moses.nogener" value="-n" else="">
+ <istrue value="${moses.nogener}"/>
+ </condition>
+
+ <property name="moses.nographs" value="false"/>
+ <condition property="real.moses.nographs" value="-ng" else="">
+ <istrue value="${moses.nographs}"/>
+ </condition>
+
+ <condition property="filter.services">
+ <or>
+ <isset property="moses.service"/>
+ <isset property="moses.authority"/>
+ </or>
+ </condition>
+
+</target>
<!-- ================================================================== -->
<!-- Moses datatypes: do everything -->
@@ -85,7 +122,7 @@
<property name="dot.location" value=""""/>
<java classname="MosesGenerators" taskname="Data Types"
- classpathref="build.classpath" fork="true" failonerror="true">
+ classpathref="moses.build.classpath" fork="true" failonerror="true">
<arg value="-dt"/>
<arg value="-cacheDir"/>
<arg file="${registry.cache.dir}"/>
@@ -124,10 +161,14 @@
<!-- ================================================================== -->
<target name="jar-datatypes" depends="moses-compile"
description="Generate jar file with generated data types">
+
+ <property name="released.date" value="${TODAY_SHORT}"/>
+
<jar destfile="${build.lib}/${datatypes.jar}">
<fileset dir="${classes.datatypes}" excludes="**/doc-files/*"/>
<manifest>
- <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Released-Date" value="${released.date}"/>
</manifest>
</jar>
</target>
@@ -182,10 +223,14 @@
<!-- ================================================================== -->
<target name="jar-services" depends="moses-compile"
description="Jar files with generated services.">
+
+ <property name="released.date" value="${TODAY_SHORT}"/>
+
<jar destfile="${build.lib}/${skeletons.jar}">
<fileset dir="${classes.skeletons}" excludes="**/doc-files/*"/>
<manifest>
- <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Built-By" value="${user.name}"/>
+ <attribute name="Released-Date" value="${released.date}"/>
</manifest>
</jar>
</target>
@@ -195,7 +240,7 @@
<!-- ================================================================== -->
<target name="service-check" unless="filter.services">
<input validargs="y,n" addproperty="do.services">
- Neither property 'moses.service' or 'moses.authority is set.
+ Neither property 'moses.service' nor 'moses.authority' is set.
This means that skeletons for ALL services will be generated.
If this is what you want, press 'y'. Continue? </input>
<condition property="do.abort">
@@ -214,42 +259,6 @@
<!-- ================================================================== -->
-<!-- Moses generally: Init -->
-<!-- ================================================================== -->
-<target name="moses-init" depends="init">
- <copy todir="${build.classes}/templates">
- <fileset dir="${src.templates}"/>
- </copy>
- <mkdir dir="${src.datatypes}"/>
- <mkdir dir="${src.skeletons}"/>
- <mkdir dir="${classes.datatypes}"/>
- <mkdir dir="${classes.skeletons}"/>
-
- <property name="moses.quiet" value="false"/>
- <condition property="real.moses.quiet" value="-q" else="">
- <istrue value="${moses.quiet}"/>
- </condition>
-
- <property name="moses.nogener" value="false"/>
- <condition property="real.moses.nogener" value="-n" else="">
- <istrue value="${moses.nogener}"/>
- </condition>
-
- <property name="moses.nographs" value="false"/>
- <condition property="real.moses.nographs" value="-ng" else="">
- <istrue value="${moses.nographs}"/>
- </condition>
-
- <condition property="filter.services">
- <or>
- <isset property="moses.service"/>
- <isset property="moses.authority"/>
- </or>
- </condition>
-
-</target>
-
-<!-- ================================================================== -->
<!-- Moses generally: Compile generated datatypes and skeletons -->
<!-- ================================================================== -->
<target name="moses-compile" depends="moses-init,compile"
@@ -317,7 +326,7 @@
</sourcepath>
<!-- decorations -->
- <header><![CDATA[<font size='-1'>Generated: ${TODAY_LONG}</font>]]></header>
+ <header><![CDATA[<font size='-1'>Version: ${maven.project.version}</font>]]></header>
<bottom><![CDATA[<font size='-1'><a href='mailto:moby-dev at biomoby.org?subject=Moses%20API'>Submit a bug or feature</a><BR>Generated: ${TODAY_LONG}</font>]]></bottom>
<group
title="Biomoby data types"
@@ -332,5 +341,5 @@
<!-- Moses generally: create jar files for datatypes and skeletons -->
<!-- ================================================================== -->
<target name="moses-jars" depends="jar-datatypes,jar-services"
- description="Generate jar files with generated data types and skeletons.">
+ description="Create jar files with generated data types and skeletons.">
</target>
More information about the MOBY-guts
mailing list