avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-cornerstone/apps/enterprise/pss build.xml build.properties
Date Mon, 11 Feb 2002 21:55:52 GMT
mcconnell    02/02/11 13:55:52

  Modified:    apps/enterprise/pss build.xml build.properties
  Log:
  no message
  
  Revision  Changes    Path
  1.6       +18 -38    jakarta-avalon-cornerstone/apps/enterprise/pss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	4 Feb 2002 17:32:08 -0000	1.5
  +++ build.xml	11 Feb 2002 21:55:52 -0000	1.6
  @@ -61,10 +61,13 @@
     <property name="jdk.href"  value="http://java.sun.com/j2se/1.4/docs/api/" />
   
     <path id="project.classpath">
  -      <fileset dir="${orb.path}">
  +      <fileset dir="${orb.lib.path}">
           <include name="${orb.jar}" />
           <include name="${idl.jar}" />
         </fileset>
  +      <fileset dir="${orb.path}">
  +        <include name="${orb-manager.jar}" />
  +      </fileset>
         <fileset dir="${ots.path}">
           <include name="${ots.jar}" />
           <include name="${ots.jta.jar}" />
  @@ -72,6 +75,7 @@
         <fileset dir="../../../lib">
           <include name="*.jar" />
         </fileset>
  +      
     </path>
   
     <!-- PREPARE -->
  @@ -147,7 +151,6 @@
     <target name="pss.build.context" depends="pss.context" >
       <uptodate property="pss.uptodate" targetfile="${dist}/${pss.jar}">
         <srcfiles dir="${idl}"/>
  -      <srcfiles dir="${build}/pss/src"/>
         <srcfiles dir="${src}/java">
            <exclude name="org/apache/pss/compiler/**"/>
            <exclude name="org/apache/pss/wrapper/**"/>
  @@ -156,7 +159,7 @@
     </target>
   
     <target name="pss" depends="pss.idl,pss.build.context" unless="pss.uptodate" >
  -      <echo message="Building PSS Implementation."/>
  +      <echo message="Building PSS Implementation. ${pss.jar}"/>
         <javac debug="off" destdir="${build}/pss/lib" deprecation="true" target="1.2"
>
           <classpath>
   	    <path refid="project.classpath" />
  @@ -171,6 +174,7 @@
         <copy todir="${build}/pss/lib">
           <fileset dir="${src}/java">
             <include name="org/apache/pss/config.xml"/>
  +          <include name="org/apache/pss/PSSServer.xinfo"/>
           </fileset>
         </copy>
         <jar file="${dist}/${pss.jar}" basedir="${build}/pss/lib" />
  @@ -180,15 +184,6 @@
   
     <target name="test.context" depends="prepare" >
       <mkdir dir="${build}/test" />
  -    <mkdir dir="${build}/test/file" />
  -    <mkdir dir="${build}/test/file/src" />
  -    <mkdir dir="${build}/test/file/lib" />
  -    <mkdir dir="${build}/test/memory" />
  -    <mkdir dir="${build}/test/memory/src" />
  -    <mkdir dir="${build}/test/memory/lib" />
  -    <mkdir dir="${build}/test/database" />
  -    <mkdir dir="${build}/test/database/src" />
  -    <mkdir dir="${build}/test/database/lib" />
     </target>
   
     <target name="test.psdl.context" depends="test.context" >
  @@ -201,20 +196,23 @@
       </uptodate>
     </target>
   
  -  <target name="test.psdl" depends="compiler,test.psdl.context" if="test.psdl.modified"
>
  -    <antcall target="test.psdl.action">
  +  <target name="test" depends="compiler,test.psdl.context" if="test.psdl.modified" >
  +    <antcall target="test.action">
         <param name="connector" value="file"/>
       </antcall>
  -    <antcall target="test.psdl.action">
  +    <antcall target="test.action">
         <param name="connector" value="memory"/>
       </antcall>
  -    <antcall target="test.psdl.action">
  +    <antcall target="test.action">
         <param name="connector" value="database"/>
       </antcall>
     </target>
   
  -  <target name="test.psdl.action" >
  +  <target name="test.action">
       <echo message="Compiling Test PSDL for ${connector}"/>
  +    <mkdir dir="${build}/test/${connector}" />
  +    <mkdir dir="${build}/test/${connector}/src" />
  +    <mkdir dir="${build}/test/${connector}/lib" />
       <java classname="org.apache.pss.compiler.PsdlCompiler" fork="yes" failonerror="true">
         <classpath>
   	  <path refid="project.classpath"/>
  @@ -227,23 +225,7 @@
   	<arg line="-d ${build}/test/${connector}/src"/>
   	<arg line="${psdl}/test.psdl"/>
       </java>
  -  </target>
  -
  -  <target name="test.build" depends="test.psdl,pss">
  -    <antcall target="test.build.action">
  -      <param name="connector" value="file"/>
  -    </antcall>
  -    <antcall target="test.build.action">
  -      <param name="connector" value="memory"/>
  -    </antcall>
  -    <antcall target="test.build.action">
  -      <param name="connector" value="database"/>
  -    </antcall>
  -  </target>
  -
  -  <target name="test.build.action" >
  -      <echo message="Compilation Test for ${connector} connector."/>
  -      <javac debug="off" destdir="${build}/test/${connector}/lib" deprecation="true"
target="1.2" >
  +    <javac debug="off" destdir="${build}/test/${connector}/lib" deprecation="true" target="1.2"
>
           <classpath>
   	    <path refid="project.classpath" />
             <pathelement path="${dist}/${pss.jar}" />
  @@ -251,21 +233,19 @@
           <src path="${build}/test/${connector}/src" />
           <src path="${src}/java" />
           <include name="org/apache/test/**"/>
  -      </javac>
  +    </javac>
     </target>
   
     <!-- MAIN TARGETS -->
   
     <target name="clean">
        <delete dir="${build}"/>
  -     <!--<delete dir="${dist}"/>-->
  +     <delete dir="${dist}"/>
     </target>
   
     <target name="build" depends="compiler,pss"/>
   
     <target name="dist" depends="build,javadoc,support"/>
  -
  -  <target name="test" depends="test.build"/>
   
     <target name="all" depends="clean,dist,test,install"/>
   
  
  
  
  1.2       +4 -1      jakarta-avalon-cornerstone/apps/enterprise/pss/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/enterprise/pss/build.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties	4 Feb 2002 17:32:08 -0000	1.1
  +++ build.properties	11 Feb 2002 21:55:52 -0000	1.2
  @@ -5,9 +5,12 @@
   # to related cornerstone resource
   #
   
  -orb.path=../orb/lib
  +orb.lib.path=../orb/lib
   orb.jar=openorb-1.2.2.jar
   idl.jar=openorb_tools-1.2.2.jar
  +
  +orb.path=../orb/dist
  +orb-manager.jar=orb-manager-1.0.1.jar
   
   ots.path=../ots/lib
   ots.jar=openorb_ots-1.2.1.jar
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message