From 718a520c0faa92a357d0fb11e89ff4ea28bc63a3 Mon Sep 17 00:00:00 2001
From: Manuel Traut <manut@vogone.traut>
Date: Sun, 27 Dec 2009 16:32:21 +0100
Subject: build: fix CR/LF

Signed-off-by: Manuel Traut <manut@mecka.net>
---
 build.xml | 464 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 231 insertions(+), 233 deletions(-)

diff --git a/build.xml b/build.xml
index 1777a52..e17faf0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,235 +1,234 @@
-<<<<<<< HEAD
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="yalp" default="all" basedir=".">
-	<property name="srcInterfaces" value="src/YalpInterfaces"/>
-
-	<property name="srcInputs" value="src/YalpInputs"/>
-	<property name="srcOutputs" value="src/YalpOutputs"/>
-	<property name="srcAuth" value="src/YalpAuth"/>
-	<property name="srcServer" value="src/YalpServer"/>
-	<property name="srcClients" value="src/YalpClients"/>
-	<property name="srcPgSqlInputIndexer" value="${srcInputs}/YalpPGSqlInput/YalpPGSQLIndexer"/>
-	<property name="srcVlcTelnetOutput" value="${srcOutputs}/YalpVlcTelnetOutput"/>
-	<property name="srcPGSqlInput" value="${srcInputs}/YalpPGSqlInput"/>
-	<property name="srcPGSqlAuth" value="${srcAuth}/YalpPGSqlAuth"/>
-
-	<property name="srcSwtClient" value="${srcClients}/SwtClient"/>
-	<property name="srcSwtClientGUI" value="${srcSwtClient}/GUI"/>
-
-	<property name="src" value="src/"/>
-	<property name="doc" value="doc/"/>
-	<property name="sqldoc" value="${doc}/sql"/>
-	<property name="javadoc" value="${doc}/java"/>
-	<property name="doxydoc" value="${doc}/doxygen"/>
-	<property name="build" value="build/"/>
-	<property name="lib" value="lib/"/>
-
-	<property name="log4jLibs" value="lib/log4j-1.2.15.jar"/>
-	<property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/>
-	<property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar /usr/share/java/swt.jar"/>
-	<property name="indexerLibs" value="lib/yajil-0.3.3.jar"/>
-	<property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/>
-
-	<property name="idlj" value="../idlj.sh"/>
-	<property name="psqldoc" value="./postgresql_autodoc/postgresql_autodoc"/>
-
-	<path id="project.class.path">
-		<pathelement location="{lib}"/>
-		<pathelement path="${java.class.path}"/>
-		<pathelement path="${additional.path}"/>
-	</path>
-	
-	<target name="all" depends="vlctelnetoutput, pgsqlinput, pgsqlindexer, pgsqlauth, server, swtclient" description="builds server and client">
-		<echo>Doing all</echo>
-	</target>
-
-	<target name="interfaces" description="Create stubs/skeletons from idl">
-		<mkdir dir="${build}"/>
-		<exec dir="${src}" executable="${idlj}">
-			<arg value="yalp.idl"/>
-		</exec>
-		<javac srcdir="${srcInterfaces}" destdir="${build}"/>
-	</target>
-
-	<target name ="server" depends="interfaces" description="builds the Server">
-		<javac debug="true" srcdir="${srcServer}" destdir="${build}"/>
-		<jar destfile="yalpServer.jar" basedir="${build}">
-			<path id="project.class.path">
-				<pathelement location="${lib}"/>
-				<pathelement path="${java.class.path}"/>
-				<pathelement path="${additional.path}"/>
-			</path>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Main-Class" value="YalpServer.YalpServer"/>
-				<attribute name="Class-Path" value="${log4jLibs}"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name ="outputs" description="builds output base files">
-		<javac debug="true" srcdir="${srcOutputs}" destdir="${build}"/>
-	</target>
-
-	<target name ="vlctelnetoutput" depends="interfaces, outputs" description="builds the vlctelnetoutput">
-		<javac debug="true" srcdir="${srcVlcTelnetOutput}" destdir="${build}"/>
-		<jar destfile="yalpVlcTelnetOutput.jar" basedir="${build}">
-			<path id="project.class.path">
-				<pathelement location="${lib}"/>
-				<pathelement path="${java.class.path}"/>
-				<pathelement path="${additional.path}"/>
-			</path>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Main-Class" value="YalpOutputs.YalpVlcTelnetOutput.YalpVlcTelnetOutput"/>
-				<attribute name="Class-Path" value="${vlctelnetLibs} ${log4jLibs}"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name ="inputs" description="builds input base files">
-		<javac debug="true" srcdir="${srcInputs}" destdir="${build}"/>
-	</target>
-
-	<target name ="pgsqlinput" depends="interfaces, inputs" description="builds the pgsql input plugin">
-		<javac debug="true" srcdir="${srcPGSqlInput}" destdir="${build}"/>
-		<jar destfile="yalpPGSqlInput.jar" basedir="${build}">
-			<path id="project.class.path">
-				<pathelement location="${lib}"/>
-				<pathelement path="${java.class.path}"/>
-				<pathelement path="${additional.path}"/>
-			</path>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSqlInput"/>
-				<attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="pgsqlindexer" description="indexer for pgsqlinputplugin">
-		<mkdir dir="${build}/indexer"/>
-		<javac debug="true" srcdir="${srcPgSqlInputIndexer}" destdir="${build}/indexer"/>
-		<jar destfile="yalpPGSqlIndexer.jar" basedir="${build}">
-			<path id="project.class.path">
-				<pathelement location="${lib}"/>
-				<pathelement path="${java.class.path}"/>
-				<pathelement path="${additional.path}"/>
-			</path>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSQLIndexer.YalpPGSQLIndexer"/>
-				<attribute name="Class-Path" value="${indexerLibs}"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name ="auth" description="builds auth base files">
-		<javac debug="true" srcdir="${srcAuth}" destdir="${build}"/>
-	</target>
-
-	<target name ="pgsqlauth" depends="interfaces, auth" description="builds the pgsql auth plugin">
-		<javac debug="true" srcdir="${srcPGSqlAuth}" destdir="${build}"/>
-		<jar destfile="yalpPGSqlAuth.jar" basedir="${build}">
-			<path id="project.class.path">
-				<pathelement location="${lib}"/>
-				<pathelement path="${java.class.path}"/>
-				<pathelement path="${additional.path}"/>
-			</path>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}"/>
-				<attribute name="Main-Class" value="YalpAuth.YalpPGSqlAuth.YalpPGSqlAuth"/>
-				<attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
-			</manifest>
-		</jar>
-	</target>
-
-	<target name ="clients" depends="interfaces" description="builds the client bsae files">
-			<javac debug="true" srcdir="${srcClients}" destdir="${build}"/>
-	</target>
-
-	<target name ="swtclient" depends="clients" description="builds SWT GUI">
-			<javac debug="true" srcdir="${srcSwtClient}" destdir="${build}"/>
-			<jar destfile="yalpSWTClient.jar" basedir="${build}">
-				<path id="project.class.path">
-					<pathelement location="${lib}"/>
-					<pathelement path="${java.class.path}"/>
-					<pathelement path="${additional.path}"/>
-				</path>
-				<manifest>
-					<attribute name="Built-By" value="${user.name}"/>
-					<attribute name="Main-Class" value="YalpClients.SwtClient.SwtClient"/>
-					<attribute name="Class-Path" value="${swtLibs}"/>
-				</manifest>
-			</jar>
-	</target>
-
-	<target name="swtgui" depends="swtclient">
-		<javac debug="true" srcdir="${srcSwtGUI}" destdir="${build}">
-			<classpath refid="project.class.path"/>
-		</javac>
-	</target>
-
-	<target name="clean" depends="cleandoc" description="Removes previous build">
-		<delete verbose="true">
-			<fileset dir="${build}"/>
-			<fileset dir="${srcInterfaces}"/>
-		</delete>
-	</target>
-	
-	<target name="runserver" depends="server" description="starts Server">
-		<java jar="server.jar" fork="true"/>
-	</target>
-	
-	<target name="runclient" depends="swtclient" description="starts Client">
-		<java jar="client.jar" fork="true"/>
-	</target>
-
-	<target name="cleandoc" depends="cleandoxydoc, cleansqldoc, cleanjavadoc"/>
-
-	<target name="cleansqldoc" description="Removes previous sqldoc">
-		<delete verbose="true">
-			<fileset dir="${sqldoc}"/>
-		</delete>
-	</target>
-
-	<target name="cleandoxydoc" description="Removes previous doxygen">
-		<delete verbose="true">
-			<fileset dir="${doxydoc}"/>
-		</delete>
-	</target>
-
-	<target name="cleanjavadoc" description="Removes previous javadoc">
-		<delete verbose="true">
-			<fileset dir="${javadoc}"/>
-		</delete>
-	</target>
-	
-	<target name="doc" depends="cleandoc" description="generates javadoc">
-		<javadoc packagenames="org.umlgraph.doclet.*, YalpAuth.*, YalpServer, YalpClients.*, YalpInterfaces, YalpOutputs.*, YalpInputs.*" sourcepath="src" author="true" version="true" private="true" use="true" destdir="${javadoc}">
-			<doclet name="org.umlgraph.doclet.UmlGraphDoc" path="./build-tools/UmlGraph-5.2.jar">
-				<param name="-inferrel"/>
-				<param name="-inferdep"/>
-				<param name="-hide" value="java.*"/>
-				<param name="-collpackages" value="java.util.*"/>
-				<param name="-qualify"/>
-				<param name="-postfixpackage"/>
-				<param name="-nodefontsize" value="9"/>
-				<param name="-nodefontpackagesize" value="7"/>
-				<param name="-link" value="http://java.sun.com/javase/6/docs/guide/javadoc/doclet/spec"/>
-				<param name="-link" value="http://java.sun.com/javase/6/docs/api"/>
-			</doclet>
-		</javadoc>
-		<exec dir="." executable="${psqldoc}">
-			<arg line="-d yalp -f ${sqldoc}/yalp -h localhost -u yalp -p 5432 --password=yalp -l ./postgresql_autodoc"/>
-		</exec>
-		<exec dir="." executable="/usr/bin/doxygen">
-			<arg line="yalp.doxy"/>
-		</exec>
-	</target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="yalp" default="all" basedir=".">
+	<property name="srcInterfaces" value="src/YalpInterfaces"/>
+
+	<property name="srcInputs" value="src/YalpInputs"/>
+	<property name="srcOutputs" value="src/YalpOutputs"/>
+	<property name="srcAuth" value="src/YalpAuth"/>
+	<property name="srcServer" value="src/YalpServer"/>
+	<property name="srcClients" value="src/YalpClients"/>
+	<property name="srcPgSqlInputIndexer" value="${srcInputs}/YalpPGSqlInput/YalpPGSQLIndexer"/>
+	<property name="srcVlcTelnetOutput" value="${srcOutputs}/YalpVlcTelnetOutput"/>
+	<property name="srcPGSqlInput" value="${srcInputs}/YalpPGSqlInput"/>
+	<property name="srcPGSqlAuth" value="${srcAuth}/YalpPGSqlAuth"/>
+
+	<property name="srcSwtClient" value="${srcClients}/SwtClient"/>
+	<property name="srcSwtClientGUI" value="${srcSwtClient}/GUI"/>
+
+	<property name="src" value="src/"/>
+	<property name="doc" value="doc/"/>
+	<property name="sqldoc" value="${doc}/sql"/>
+	<property name="javadoc" value="${doc}/java"/>
+	<property name="doxydoc" value="${doc}/doxygen"/>
+	<property name="build" value="build/"/>
+	<property name="lib" value="lib/"/>
+
+	<property name="log4jLibs" value="lib/log4j-1.2.15.jar"/>
+	<property name="vlctelnetLibs" value="lib/commons-net-1.4.1.jar"/>
+	<property name="swtLibs" value="/usr/share/swt-3/lib/swt.jar /usr/lib/java/swt.jar /usr/share/java/swt.jar"/>
+	<property name="indexerLibs" value="lib/yajil-0.3.3.jar"/>
+	<property name="dbLibs" value="lib/postgresql-8.1-404.jdbc3.jar"/>
+
+	<property name="idlj" value="../idlj.sh"/>
+	<property name="psqldoc" value="./postgresql_autodoc/postgresql_autodoc"/>
+
+	<path id="project.class.path">
+		<pathelement location="{lib}"/>
+		<pathelement path="${java.class.path}"/>
+		<pathelement path="${additional.path}"/>
+	</path>
+	
+	<target name="all" depends="vlctelnetoutput, pgsqlinput, pgsqlindexer, pgsqlauth, server, swtclient" description="builds server and client">
+		<echo>Doing all</echo>
+	</target>
+
+	<target name="interfaces" description="Create stubs/skeletons from idl">
+		<mkdir dir="${build}"/>
+		<exec dir="${src}" executable="${idlj}">
+			<arg value="yalp.idl"/>
+		</exec>
+		<javac srcdir="${srcInterfaces}" destdir="${build}"/>
+	</target>
+
+	<target name ="server" depends="interfaces" description="builds the Server">
+		<javac debug="true" srcdir="${srcServer}" destdir="${build}"/>
+		<jar destfile="yalpServer.jar" basedir="${build}">
+			<path id="project.class.path">
+				<pathelement location="${lib}"/>
+				<pathelement path="${java.class.path}"/>
+				<pathelement path="${additional.path}"/>
+			</path>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="YalpServer.YalpServer"/>
+				<attribute name="Class-Path" value="${log4jLibs}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name ="outputs" description="builds output base files">
+		<javac debug="true" srcdir="${srcOutputs}" destdir="${build}"/>
+	</target>
+
+	<target name ="vlctelnetoutput" depends="interfaces, outputs" description="builds the vlctelnetoutput">
+		<javac debug="true" srcdir="${srcVlcTelnetOutput}" destdir="${build}"/>
+		<jar destfile="yalpVlcTelnetOutput.jar" basedir="${build}">
+			<path id="project.class.path">
+				<pathelement location="${lib}"/>
+				<pathelement path="${java.class.path}"/>
+				<pathelement path="${additional.path}"/>
+			</path>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="YalpOutputs.YalpVlcTelnetOutput.YalpVlcTelnetOutput"/>
+				<attribute name="Class-Path" value="${vlctelnetLibs} ${log4jLibs}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name ="inputs" description="builds input base files">
+		<javac debug="true" srcdir="${srcInputs}" destdir="${build}"/>
+	</target>
+
+	<target name ="pgsqlinput" depends="interfaces, inputs" description="builds the pgsql input plugin">
+		<javac debug="true" srcdir="${srcPGSqlInput}" destdir="${build}"/>
+		<jar destfile="yalpPGSqlInput.jar" basedir="${build}">
+			<path id="project.class.path">
+				<pathelement location="${lib}"/>
+				<pathelement path="${java.class.path}"/>
+				<pathelement path="${additional.path}"/>
+			</path>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSqlInput"/>
+				<attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name="pgsqlindexer" description="indexer for pgsqlinputplugin">
+		<mkdir dir="${build}/indexer"/>
+		<javac debug="true" srcdir="${srcPgSqlInputIndexer}" destdir="${build}/indexer"/>
+		<jar destfile="yalpPGSqlIndexer.jar" basedir="${build}">
+			<path id="project.class.path">
+				<pathelement location="${lib}"/>
+				<pathelement path="${java.class.path}"/>
+				<pathelement path="${additional.path}"/>
+			</path>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="YalpInputs.YalpPGSqlInput.YalpPGSQLIndexer.YalpPGSQLIndexer"/>
+				<attribute name="Class-Path" value="${indexerLibs}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name ="auth" description="builds auth base files">
+		<javac debug="true" srcdir="${srcAuth}" destdir="${build}"/>
+	</target>
+
+	<target name ="pgsqlauth" depends="interfaces, auth" description="builds the pgsql auth plugin">
+		<javac debug="true" srcdir="${srcPGSqlAuth}" destdir="${build}"/>
+		<jar destfile="yalpPGSqlAuth.jar" basedir="${build}">
+			<path id="project.class.path">
+				<pathelement location="${lib}"/>
+				<pathelement path="${java.class.path}"/>
+				<pathelement path="${additional.path}"/>
+			</path>
+			<manifest>
+				<attribute name="Built-By" value="${user.name}"/>
+				<attribute name="Main-Class" value="YalpAuth.YalpPGSqlAuth.YalpPGSqlAuth"/>
+				<attribute name="Class-Path" value="${dbLibs} ${log4jLibs}"/>
+			</manifest>
+		</jar>
+	</target>
+
+	<target name ="clients" depends="interfaces" description="builds the client bsae files">
+			<javac debug="true" srcdir="${srcClients}" destdir="${build}"/>
+	</target>
+
+	<target name ="swtclient" depends="clients" description="builds SWT GUI">
+			<javac debug="true" srcdir="${srcSwtClient}" destdir="${build}"/>
+			<jar destfile="yalpSWTClient.jar" basedir="${build}">
+				<path id="project.class.path">
+					<pathelement location="${lib}"/>
+					<pathelement path="${java.class.path}"/>
+					<pathelement path="${additional.path}"/>
+				</path>
+				<manifest>
+					<attribute name="Built-By" value="${user.name}"/>
+					<attribute name="Main-Class" value="YalpClients.SwtClient.SwtClient"/>
+					<attribute name="Class-Path" value="${swtLibs}"/>
+				</manifest>
+			</jar>
+	</target>
+
+	<target name="swtgui" depends="swtclient">
+		<javac debug="true" srcdir="${srcSwtGUI}" destdir="${build}">
+			<classpath refid="project.class.path"/>
+		</javac>
+	</target>
+
+	<target name="clean" depends="cleandoc" description="Removes previous build">
+		<delete verbose="true">
+			<fileset dir="${build}"/>
+			<fileset dir="${srcInterfaces}"/>
+		</delete>
+	</target>
+	
+	<target name="runserver" depends="server" description="starts Server">
+		<java jar="server.jar" fork="true"/>
+	</target>
+	
+	<target name="runclient" depends="swtclient" description="starts Client">
+		<java jar="client.jar" fork="true"/>
+	</target>
+
+	<target name="cleandoc" depends="cleandoxydoc, cleansqldoc, cleanjavadoc"/>
+
+	<target name="cleansqldoc" description="Removes previous sqldoc">
+		<delete verbose="true">
+			<fileset dir="${sqldoc}"/>
+		</delete>
+	</target>
+
+	<target name="cleandoxydoc" description="Removes previous doxygen">
+		<delete verbose="true">
+			<fileset dir="${doxydoc}"/>
+		</delete>
+	</target>
+
+	<target name="cleanjavadoc" description="Removes previous javadoc">
+		<delete verbose="true">
+			<fileset dir="${javadoc}"/>
+		</delete>
+	</target>
+	
+	<target name="doc" depends="cleandoc" description="generates javadoc">
+		<javadoc packagenames="org.umlgraph.doclet.*, YalpAuth.*, YalpServer, YalpClients.*, YalpInterfaces, YalpOutputs.*, YalpInputs.*" sourcepath="src" author="true" version="true" private="true" use="true" destdir="${javadoc}">
+			<doclet name="org.umlgraph.doclet.UmlGraphDoc" path="./build-tools/UmlGraph-5.2.jar">
+				<param name="-inferrel"/>
+				<param name="-inferdep"/>
+				<param name="-hide" value="java.*"/>
+				<param name="-collpackages" value="java.util.*"/>
+				<param name="-qualify"/>
+				<param name="-postfixpackage"/>
+				<param name="-nodefontsize" value="9"/>
+				<param name="-nodefontpackagesize" value="7"/>
+				<param name="-link" value="http://java.sun.com/javase/6/docs/guide/javadoc/doclet/spec"/>
+				<param name="-link" value="http://java.sun.com/javase/6/docs/api"/>
+			</doclet>
+		</javadoc>
+		<exec dir="." executable="${psqldoc}">
+			<arg line="-d yalp -f ${sqldoc}/yalp -h localhost -u yalp -p 5432 --password=yalp -l ./postgresql_autodoc"/>
+		</exec>
+		<exec dir="." executable="/usr/bin/doxygen">
+			<arg line="yalp.doxy"/>
+		</exec>
+	</target>
+
+</project>
 =======
 <?xml version="1.0" encoding="UTF-8"?>
 
@@ -462,4 +461,3 @@
 	</target>
 
 </project>
->>>>>>> c62ff958823168d7622b397609220db8b67fa731
-- 
cgit v1.2.3