[prev in list] [next in list] [prev in thread] [next in thread]
List: openorb-commits
Subject: [openorb-commits] CVS: TradingService/src build.xml,1.46,1.47
From: Erik Putrycz <putrycz () users ! sourceforge ! net>
Date: 2003-02-28 14:53:45
[Download RAW message or body]
Update of /cvsroot/openorb/TradingService/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9579/src
Modified Files:
build.xml
Log Message:
various fixes
Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/TradingService/src/build.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- build.xml 26 Feb 2003 15:26:33 -0000 1.46
+++ build.xml 28 Feb 2003 14:53:43 -0000 1.47
@@ -3,15 +3,15 @@
<!-- Buildfile -->
<!-- ************************************************************************* -->
-<project name="TradingService" default="help" basedir="..">
+<project name="TradingService" default="help" basedir="..">
<!--
Give user a chance to override without editing this file
(and without typing -D each time he compiles it)
-
+
ant.properties in the user.home directory can hold global
ant settings that should be applied to any ant invocation.
-
+
The local.properties file should contain settings only for
the local project.
-->
@@ -71,7 +71,7 @@
<property name="build.deprecation" value="off" />
<property name="build.optimize" value="off" />
- <property name="main-jar" \
value="openorb_${NAME_SHORT}-${version}.jar" /> + <property name="main-jar" \
value="openorb_${NAME_SHORT}-${version}.jar" /> <property name="examples-jar" \
value="openorb_${NAME_SHORT}_examples-${version}.jar" /> <property name="test-jar" \
value="openorb_${NAME_SHORT}_test-${version}.jar" />
@@ -81,7 +81,7 @@
<!-- =============================== -->
<!-- CLASSPATH used to build -->
- <!-- =============================== -->
+ <!-- =============================== -->
<path id="project.class.path">
<pathelement path="${build.dir}/main" />
<pathelement path="${build.dir}/test" />
@@ -97,7 +97,7 @@
<include name="PersistentStateService/lib/**/*.jar"/>
<include name="TransactionService/lib/**/*.jar"/>
</fileset>
- </path>
+ </path>
<path id="build.class.path">
<path refid="project.class.path" />
@@ -106,11 +106,14 @@
</fileset>
<pathelement path="${java.home}/../lib/tools.jar" />
</path>
-
+
<taskdef resource="idl2java.properties">
<classpath refid="build.class.path"/>
</taskdef>
+ <taskdef resource="psdl2java.properties">
+ <classpath refid="build.class.path"/>
+ </taskdef>
<!-- =============================== -->
<!-- Help -->
@@ -134,7 +137,7 @@
install : Install the jar files in a common directory. The common
directory can be specified via the install.path property
in the local.properties file. Depends on jar-all and doc.
-jar-all : Create all of the jar files. Depends on main,
+jar-all : Create all of the jar files. Depends on main,
compile-test-idl,build-test,build-examples,
create-main-jar,create-test-jar, create-examples-jar
jar : Create the jar file. Depends on main,
@@ -157,7 +160,7 @@
initialize-directory-tree.
</echo>
</target>
-
+
<target name="targets" depends="help">
<echo>
worker targets
@@ -194,7 +197,7 @@
<target name="version" depends="dump-info"/>
-
+
<!-- =============================== -->
<!-- Manifest -->
@@ -291,8 +294,8 @@
</target>
-
-
+
+
<!-- =============================== -->
<!-- Clean up -->
<!-- =============================== -->
@@ -341,7 +344,7 @@
</delete>
</target>
-
+
<!-- =============================== -->
<!-- IDL -->
@@ -358,74 +361,65 @@
<!-- PSDL -->
<!-- =============================== -->
<target name="psdl" depends="initialize-directory-tree,compile-idl,compile-psdl" \
/>
- <target name="compile-psdl" \
depends="compile-servicetype-psdl,compile-offer-psdl,compile-link-psdl" \
/>
-
- <target name="psdl2java">
- <echo message="Build the PSS abstract files for ${source}..." />
- <java failonerror="true" classname="org.openorb.pss.compiler.PsdlCompiler" \
fork="true">
- <classpath refid="project.class.path" />
- <arg line="-silence -nowrapper -d ${destination} -I ${idl.dir} ${source}" />
- </java>
-
- <echo message="Build the PSS File connector files for ${source}..." />
- <java failonerror="true" classname="org.openorb.pss.compiler.PsdlCompiler" \
fork="true">
- <classpath refid="project.class.path" />
- <arg line="-silence -file -noapi -package file -d ${destination} -I ${idl.dir} \
${source}" />
- </java>
-
- <echo message="Build the PSS Database connector files for ${source}..." />
- <java failonerror="true" classname="org.openorb.pss.compiler.PsdlCompiler" \
fork="true">
- <classpath refid="project.class.path" />
- <arg line="-silence -database -noapi -package database -d ${destination} -I \
${idl.dir} ${source}" />
- </java>
-
- <echo message="Build the PSS Memory connector files for ${source}..." />
- <java failonerror="true" classname="org.openorb.pss.compiler.PsdlCompiler" \
fork="true">
- <classpath refid="project.class.path" />
- <arg line="-silence -noapi -package memory -d ${destination} -I ${idl.dir} \
${source}" />
- </java>
- </target>
-
-
- <!-- ServiceType PSDL -->
- <target name="check-servicetype-psdl">
- <uptodate property="servicetype-psdl-modified" \
targetfile="${psdl.dir}/ServiceType.psdl" >
- <srcfiles dir= "${gensrc.dir}/main" \
includes="org/openorb/servicetype/persistence/**/*.java"/>
- </uptodate>
- </target>
- <target name="compile-servicetype-psdl" depends="check-servicetype-psdl" \
if="servicetype-psdl-modified">
- <antcall target="psdl2java" >
+ <target name="compile-psdl">
+ <!-- ServiceType PSDL -->
+ <antcall target="psdl2java-all" >
<param name="destination" value="${gensrc.dir}/main" />
- <param name="source" value="${psdl.dir}/ServiceType.psdl" />
+ <param name="source.dir" value="${psdl.dir}" />
+ <param name="source" value="ServiceType.psdl" />
</antcall>
- </target>
- <!-- offer PSDL -->
- <target name="check-offer-psdl">
- <uptodate property="offer-psdl-modified" targetfile="${psdl.dir}/Offer.psdl" >
- <srcfiles dir= "${gensrc.dir}/main" \
includes="org/openorb/Offer/persistence/**/*.java"/>
- </uptodate>
- </target>
- <target name="compile-offer-psdl" depends="check-offer-psdl" \
if="offer-psdl-modified">
- <antcall target="psdl2java" >
+ <!-- offer PSDL -->
+ <antcall target="psdl2java-all" >
<param name="destination" value="${gensrc.dir}/main" />
- <param name="source" value="${psdl.dir}/Offer.psdl" />
+ <param name="source.dir" value="${psdl.dir}" />
+ <param name="source" value="Offer.psdl" />
</antcall>
- </target>
- <!-- link PSDL -->
- <target name="check-link-psdl">
- <uptodate property="link-psdl-modified" targetfile="${psdl.dir}/Link.psdl" >
- <srcfiles dir= "${gensrc.dir}/main" \
includes="org/openorb/Link/persistence/**/*.java"/>
- </uptodate>
- </target>
- <target name="compile-link-psdl" depends="check-link-psdl" \
if="link-psdl-modified">
- <antcall target="psdl2java" >
+ <!-- link PSDL -->
+ <antcall target="psdl2java-all" >
<param name="destination" value="${gensrc.dir}/main" />
- <param name="source" value="${psdl.dir}/Link.psdl" />
+ <param name="source.dir" value="${psdl.dir}" />
+ <param name="source" value="Link.psdl" />
</antcall>
</target>
+ <target name="psdl2java-all">
+ <echo message="Build the PSS abstract files for ${source}..." />
+ <psdl2java generatewrapper="false"
+ destdir="${destination}"
+ includepath="${idl.dir}"
+ srcdir="${source.dir}"
+ includes="${source}"/>
+
+ <echo message="Build the PSS File connector files for ${source}..." />
+ <psdl2java generateapi="false"
+ destdir="${destination}"
+ includepath="${idl.dir}"
+ package="file"
+ persistencetype="file"
+ srcdir="${source.dir}"
+ includes="${source}"/>
+
+ <echo message="Build the PSS Database connector files for ${source}..." />
+ <psdl2java generateapi="false"
+ destdir="${destination}"
+ includepath="${idl.dir}"
+ package="database"
+ persistencetype="database"
+ srcdir="${source.dir}"
+ includes="${source}"/>
+
+ <echo message="Build the PSS Memory connector files for ${source}..." />
+ <psdl2java generateapi="false"
+ destdir="${destination}"
+ includepath="${idl.dir}"
+ package="memory"
+ persistencetype="memory"
+ srcdir="${source.dir}"
+ includes="${source}"/>
+
+ </target>
<!-- =============================== -->
@@ -454,7 +448,7 @@
<taskdef resource="checkstyletask.properties"/>
<checkstyle
- properties="${tools.dir}/etc/checkstyle.properties"
+ properties="${tools.dir}/etc/checkstyle.properties"
failOnViolation="true">
<fileset dir="${src.dir}"
includes="**/*.java"/>
@@ -523,7 +517,7 @@
includepath="${examples.dir}/org/openorb/trader/examples/bank"
srcdir="${examples.dir}/org/openorb/trader/examples/bank/"
includes="Bank.idl" />
-
+
<!-- <java classname="org.openorb.trader.compiler.StdlCompiler" fork="yes">
<arg line="${examples.dir}/org/openorb/trader/examples/bank/Bank.st -silence \
-export -d ${gensrc.dir}/examples -I \
${examples.dir}/org/openorb/trader/examples/bank/" /> <classpath \
refid="project.class.path" /> @@ -569,7 +563,7 @@
<classpath refid="project.class.path" />
</java> -->
- <javac srcdir="${examples.dir};${gensrc.dir}/examples"
+ <javac srcdir="${examples.dir};${gensrc.dir}/examples"
destdir="${build.dir}/examples"
debug="${build.debug}"
deprecation="${build.deprecation}"
@@ -641,10 +635,13 @@
<java classname="org.apache.fop.apps.Fop" fork="yes">
<arg line="-q -xml ${src.doc.dir}/${NAME_SHORT}.xml -xsl \
${tools.dir}/docbook/xsl/fo/docbook.xsl ${dist.doc.dir}/${NAME_SHORT}.pdf" /> \
<classpath refid="build.class.path" />
- </java>
+ <!-- the bootclasspath is necessary to use xalan.jar with jdk1.4 -->
+ <jvmarg line="-Xbootclasspath/p:${tools.dir}/lib/ext/xml-apis.jar:${tools.dir}/lib/ext/build/xalan.jar" \
/> + </java>
<java classname="org.apache.xalan.xslt.Process" fork="yes">
<arg line="-IN ${src.doc.dir}/${NAME_SHORT}.xml -XSL \
${tools.dir}/docbook/xsl/html/docbook.xsl -OUT \
${dist.doc.dir}/${NAME_SHORT}.html" />
- <jvmarg line="-Djava.endorsed.dirs=${tools.dir}/lib" />
+ <jvmarg line="-Xbootclasspath/p:${tools.dir}/lib/ext/xml-apis.jar:${tools.dir}/lib/ext/build/xalan.jar
+ -Djava.endorsed.dirs=${tools.dir}/lib" />
<classpath refid="build.class.path" />
</java>
<mkdir dir="${dist.doc.dir}/html_img"/>
@@ -725,10 +722,10 @@
<delete file="${dist.dir}/${archive}-src.tgz" />
<delete file="${dist.dir}/${archive}-src.zip" />
- <mkdir dir="${build.dir}/src/${NAME_LONG}" />
+ <mkdir dir="${build.dir}/src/${NAME_LONG}" />
<mkdir dir="${build.dir}/src/${NAME_LONG}/src" />
- <copy todir="${build.dir}/src/${NAME_LONG}">
+ <copy todir="${build.dir}/src/${NAME_LONG}">
<fileset dir=".">
<include name="README" />
<include name="WHATSNEW" />
@@ -742,7 +739,7 @@
<chmod file="${build.dir}/src/${NAME_LONG}/setenv" perm="ugo+rx"/>
<chmod file="${build.dir}/src/${NAME_LONG}/build.sh" perm="ugo+rx"/>
- <copy todir="${build.dir}/src/${NAME_LONG}/src">
+ <copy todir="${build.dir}/src/${NAME_LONG}/src">
<fileset dir="src">
<exclude name="**/CVS/*" />
</fileset>
@@ -820,13 +817,13 @@
<fileset dir="${dist.doc.dir}/javadoc" />
</copy>
- <copy todir="${bin}/idl" >
+ <copy todir="${bin}/idl" >
<fileset dir="${idl.dir}">
<exclude name="**/CVS/*" />
</fileset>
</copy>
- <copy todir="${bin}/psdl" >
+ <copy todir="${bin}/psdl" >
<fileset dir="${psdl.dir}">
<exclude name="**/CVS/*" />
</fileset>
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
openorb-commits mailing list
openorb-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openorb-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic