[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openorb-commits
Subject:    [openorb-commits] CVS: NamingService/src build.xml,1.59,1.60
From:       Erik Putrycz <putrycz () users ! sourceforge ! net>
Date:       2003-02-28 14:55:46
[Download RAW message or body]

Update of /cvsroot/openorb/NamingService/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10672/src

Modified Files:
	build.xml 
Log Message:
added a psdl2java

Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/NamingService/src/build.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- build.xml	19 Feb 2003 13:55:53 -0000	1.59
+++ build.xml	28 Feb 2003 14:55:43 -0000	1.60
@@ -109,6 +109,9 @@
   <taskdef resource="idl2java.properties">
     <classpath refid="build.class.path"/>
   </taskdef>
+  <taskdef resource="psdl2java.properties">
+    <classpath refid="build.class.path"/>
+  </taskdef>
 
 
 
@@ -427,7 +430,7 @@
     depends="compile-naming-psdl"
    />
 
-  <target name="psdl2java">
+<!--  <target name="psdl2java">
     <echo message="Compiling ${source} with ${options}..." />
     <java failonerror="true"
         classname="org.openorb.pss.compiler.PsdlCompiler"
@@ -435,45 +438,32 @@
       <classpath refid="build.class.path" />
       <arg line="-silence ${psdl.dir}/${source} -d ${gensrc.dir}/main ${options}" />
     </java>
-  </target>
+  </target>-->
 
-  <target name="check-naming-psdl">
-    <condition property="naming-psdl-modified">
-    <or>
-      <uptodate targetfile="${psdl.dir}/Naming.psdl">
-        <srcfiles dir="${gensrc.dir}/main">
-          <include name="database/namingPersistence/*.java" />
-          <include name="file/namingPersistence/*.java" />
-          <include name="memory/namingPersistence/*.java" />
-          <include name="namingPersistence/*.java" />
-        </srcfiles>
-      </uptodate>
-      <uptodate targetfile="${idl.dir}/CosNaming.idl">
-        <srcfiles dir="${gensrc.dir}/main">
-          <include name="org/omg/CosNaming/**/*.java" />
-        </srcfiles>
-      </uptodate>
-    </or>
-    </condition>
-  </target>
-  <target name="compile-naming-psdl" depends="check-naming-psdl" if="naming-psdl-modified">
-    <antcall target="psdl2java">
-      <param name="source" value="Naming.psdl" />
-      <param name="options" value="-nowrapper" />
-    </antcall>
-    <antcall target="psdl2java">
-      <param name="source" value="Naming.psdl" />
-      <param name="options" value="-noapi -file -package file" />
-    </antcall>
-    <antcall target="psdl2java">
-      <param name="source" value="Naming.psdl" />
-      <param name="options" value="-noapi -database -package database" />
-    </antcall>
-    <antcall target="psdl2java">
-      <param name="source" value="Naming.psdl" />
-      <param name="options" value="-noapi -package memory" />
-    </antcall>
-  </target>
+  <target name="compile-naming-psdl">
+  	<psdl2java destdir="${gensrc.dir}/main"
+  			   srcdir="${psdl.dir}"
+  			   generatewrapper="false"
+  			   includes="Naming.psdl" />		   
+  	<psdl2java destdir="${gensrc.dir}/main"
+  			   srcdir="${psdl.dir}"
+  			   generateapi="false"
+  			   package="file"
+  			   persistencetype="file"
+  			   includes="Naming.psdl" />		   
+  	<psdl2java destdir="${gensrc.dir}/main"
+  			   srcdir="${psdl.dir}"
+  			   generateapi="false"
+  			   package="database"
+  			   persistencetype="database"
+  			   includes="Naming.psdl" />		   
+  	<psdl2java destdir="${gensrc.dir}/main"
+  			   srcdir="${psdl.dir}"
+  			   generateapi="false"
+  			   package="memory"
+  			   persistencetype="memory"
+  			   includes="Naming.psdl" />		   
+   </target>
 
 
 



-------------------------------------------------------
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]