[Jdvb-cvs] jdvb-server build.xml,1.3,1.4

[pinder <hu...@us...>]

Update of /cvsroot/jdvb/jdvb-server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9820

Modified Files:
	build.xml 
Log Message:
good night

Index: build.xml
===================================================================
RCS file: /cvsroot/jdvb/jdvb-server/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	19 Feb 2006 17:07:29 -0000	1.3
--- build.xml	19 Feb 2006 22:18:37 -0000	1.4
***************
*** 10,15 ****
--- 10,23 ----
  	<property name="conf" location="conf" />
  	<property name="lib" location="lib" />
+ 
  	<description>JDVB client and server applications</description>
  
+ 
+ 	<path id="compile.libs">
+ 		<fileset dir="${lib}">
+ 			<include name="*.jar"/>
+ 		</fileset>
+ 	</path>
+ 	
  	<target name="init">
  		<tstamp />
***************
*** 21,29 ****
  
  	<target name="build" depends="clean,init">
- 		<path id="compile.libs">
- 			<fileset dir="${lib}">
- 				<include name="*.jar"/>
- 			</fileset>
- 		</path>
  		
  		<javac srcdir="${src}" destdir="${build.classes}">
--- 29,32 ----
***************
*** 33,44 ****
  
  	<target name="dist" depends="build">
! 		<copy todir="${dist}">
! 			<fileset dir="${conf}">
! 				<include name="**/*.conf" />
! 			</fileset>
! 			<fileset dir="${lib}">
! 				<include name="**/*.jar" />
! 			</fileset>
! 		</copy>
  		<jar jarfile="${jars}/JDVBServer.jar">
  			<fileset dir="${build.classes}">
--- 36,43 ----
  
  	<target name="dist" depends="build">
! 		<pathconvert property="jar.classpath" pathsep=" ">
! 				<path refid="compile.libs"></path>
! 				<map from="${lib}/" to=""/>	
! 		</pathconvert>
  		<jar jarfile="${jars}/JDVBServer.jar">
  			<fileset dir="${build.classes}">
***************
*** 47,50 ****
--- 46,50 ----
  			<manifest>
  				<attribute name="Main-Class" value="uk.midearth.dvb.server.JDVBServer" />
+ 				<attribute name="Class-Path" value=". ${jar.classpath}"/>
  			</manifest>
  		</jar>
***************
*** 55,60 ****
--- 55,70 ----
  			<manifest>
  				<attribute name="Main-Class" value="uk.midearth.dvb.client.ClientGUI" />
+ 				<attribute name="Class-Path" value=". ${jar.classpath}"/>
  			</manifest>
  		</jar>
+ 		<copy todir="${jars}">
+ 			<fileset dir="${conf}">
+ 				<include name="**/*.conf" />
+ 				<include name="**/*.xml" />
+ 			</fileset>
+ 			<fileset dir="${lib}">
+ 				<include name="**/*.jar" />
+ 			</fileset>
+ 		</copy>
  	</target>