[ccmtools-cvs] java-environment build.xml, 1.26, 1.26.4.1 .cvsignore, 1.8, 1.8.10.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/java-environment
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21318

Modified Files:
      Tag: BRANCH-FHJ
	build.xml .cvsignore 
Log Message:
merged bugfix from head

Index: .cvsignore
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.8.10.1
diff -C2 -d -r1.8 -r1.8.10.1
*** .cvsignore	7 Mar 2006 16:11:57 -0000	1.8
--- .cvsignore	13 Feb 2007 12:43:38 -0000	1.8.10.1
***************
*** 5,6 ****
--- 5,7 ----
  src-gen
  .settings
+ build-ant

Index: build.xml
===================================================================
RCS file: /cvsroot/ccmtools/java-environment/build.xml,v
retrieving revision 1.26
retrieving revision 1.26.4.1
diff -C2 -d -r1.26 -r1.26.4.1
*** build.xml	10 Jan 2007 16:11:31 -0000	1.26
--- build.xml	13 Feb 2007 12:43:38 -0000	1.26.4.1
***************
*** 7,12 ****
  	<property name="prefix" location="dist" />
  	<property name="src" location="src" />
  	<property name="idl" location="${prefix}/idl" />
! 	<property name="build" location="build" />
  	<property name="lib" location="lib" />
  	<property name="jarname" location="${lib}/ccm-runtime" />
--- 7,13 ----
  	<property name="prefix" location="dist" />
  	<property name="src" location="src" />
+ 	<property name="src-gen" location="src-gen" />	
  	<property name="idl" location="${prefix}/idl" />
! 	<property name="build" location="build-ant" />
  	<property name="lib" location="lib" />
  	<property name="jarname" location="${lib}/ccm-runtime" />
***************
*** 21,25 ****
  	    <mkdir dir="${build}" />
  	    <mkdir dir="${lib}" />
! 	    <mkdir dir="${src}-gen" />
  	</target>
  
--- 22,26 ----
  	    <mkdir dir="${build}" />
  	    <mkdir dir="${lib}" />
! 	    <mkdir dir="${src-gen}" />
  	</target>
  
***************
*** 28,32 ****
  	      description="" >
  	      <exec dir="${idl}" executable="idlj">
! 	          <arg line="-td ${src}-gen -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/>
  	      </exec>
  	  </target>
--- 29,33 ----
  	      description="" >
  	      <exec dir="${idl}" executable="idlj">
! 	          <arg line="-td ${src-gen} -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/>
  	      </exec>
  	  </target>
***************
*** 35,39 ****
  	  <target name="stubs.compile" depends="stubs.generate"
  	      description="" >
! 	      <javac srcdir="${src}-gen:${src}" destdir="${build}" 
  	             debug="on" source="1.5" target="1.5">
  	          <classpath refid="compile.classpath" />  
--- 36,40 ----
  	  <target name="stubs.compile" depends="stubs.generate"
  	      description="" >
! 	      <javac srcdir="${src-gen}:${src}" destdir="${build}" 
  	             debug="on" source="1.5" target="1.5">
  	          <classpath refid="compile.classpath" />  
***************
*** 61,65 ****
  		    description="Clean up the generate, build and lib directory" >
  		<delete dir="${build}" />
! 		<delete dir="${src}-gen/Components" />
  		<delete file="${jarname}.jar" /> 
  	</target>
--- 62,66 ----
  		    description="Clean up the generate, build and lib directory" >
  		<delete dir="${build}" />
! 		<delete dir="${src-gen}" />
  		<delete file="${jarname}.jar" /> 
  	</target>