BETA/STABLE: Fixes & Cleanup in builders.

L2J_Server_BETA/build.xml

@@ -26,13 +26,13 @@
 	<property name="build" location="build" />
 	<property name="build.classes" location="${build}/classes" />
 	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.login" location="${build.dist}/login" />
+	<property name="build.dist.doc" location="${build.dist}/doc" />
 	<property name="build.dist.game" location="${build.dist}/gameserver" />
-	<property name="build.dist.libs" location="${build.dist}/libs" />
+	<property name="build.dist.images" location="${build.dist}/images" />
 	<property name="build.dist.languages" location="${build.dist}/languages" />
+	<property name="build.dist.libs" location="${build.dist}/libs" />
+	<property name="build.dist.login" location="${build.dist}/login" />
 	<property name="build.dist.tools" location="${build.dist}/tools" />
-	<property name="build.dist.images" location="${build.dist}/images" />
-	<property name="build.dist.doc" location="${build.dist}/doc" />
 
 	<path id="classpath">
 		<fileset dir="${lib}">
@@ -62,10 +62,6 @@
 	<target name="init" depends="clean, verifyRequirements" description="Create the output directories.">
 		<mkdir dir="${build}" />
 		<mkdir dir="${build.classes}" />
-		<mkdir dir="${build.dist}" />
-		<mkdir dir="${build.dist.login}" />
-		<mkdir dir="${build.dist.game}" />
-		<mkdir dir="${build.dist.tools}" />
 	</target>
 
 	<target name="compile" depends="version" description="Compile the source.">
@@ -75,31 +71,27 @@
 		</javac>
 	</target>
 
-	<target name="jar" depends="compile" description="Create the jar file">
-		<jar destfile="${build.dist.game}/l2jserver.jar">
+	<target name="jar" depends="compile" description="Create the jar files">
+		<jar destfile="${build.dist.login}/l2jlogin.jar">
 			<fileset dir="${build.classes}">
 				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/loginserver/**" />
-				<exclude name="**/accountmanager/**" />
-				<exclude name="**/gsregistering/**" />
+				<exclude name="**/gameserver/**" />
 			</fileset>
 			<manifest>
-				<attribute name="Main-Class" value="com.l2jserver.gameserver.GameServer" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-Date" value="${build.tstamp}" />
 				<attribute name="Implementation-Version" value="${l2j.revision}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.login}/l2jlogin.jar">
+		<jar destfile="${build.dist.game}/l2jserver.jar">
 			<fileset dir="${build.classes}">
 				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/gameserver/**" />
+				<exclude name="**/loginserver/**" />
+				<exclude name="**/accountmanager/**" />
+				<exclude name="**/gsregistering/**" />
 			</fileset>
 			<manifest>
-				<attribute name="Main-Class" value="com.l2jserver.loginserver.L2LoginServer" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-Date" value="${build.tstamp}" />
 				<attribute name="Implementation-Version" value="${l2j.revision}" />
@@ -107,16 +99,16 @@
 			</manifest>
 		</jar>
 		<!-- Tools -->
-		<jar destfile="${build.dist.tools}/dbinst_gs.jar">
+		<jar destfile="${build.dist.tools}/dbinst_cs.jar">
 			<fileset dir="${build.classes}">
 				<include name="**/dbinstaller/**" />
 				<include name="**/images/**" />
 				<include name="**/util/swing/**" />
-				<exclude name="**/LauncherCS*" />
+				<exclude name="**/LauncherGS*" />
 				<exclude name="**/LauncherLS*" />
 			</fileset>
 			<manifest>
-				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherGS" />
+				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherCS" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-Date" value="${build.tstamp}" />
@@ -124,16 +116,16 @@
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.tools}/dbinst_ls.jar">
+		<jar destfile="${build.dist.tools}/dbinst_gs.jar">
 			<fileset dir="${build.classes}">
 				<include name="**/dbinstaller/**" />
 				<include name="**/images/**" />
 				<include name="**/util/swing/**" />
 				<exclude name="**/LauncherCS*" />
-				<exclude name="**/LauncherGS*" />
+				<exclude name="**/LauncherLS*" />
 			</fileset>
 			<manifest>
-				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherLS" />
+				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherGS" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-Date" value="${build.tstamp}" />
@@ -141,16 +133,16 @@
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 			</manifest>
 		</jar>
-		<jar destfile="${build.dist.tools}/dbinst_cs.jar">
+		<jar destfile="${build.dist.tools}/dbinst_ls.jar">
 			<fileset dir="${build.classes}">
 				<include name="**/dbinstaller/**" />
 				<include name="**/images/**" />
 				<include name="**/util/swing/**" />
+				<exclude name="**/LauncherCS*" />
 				<exclude name="**/LauncherGS*" />
-				<exclude name="**/LauncherLS*" />
 			</fileset>
 			<manifest>
-				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherCS" />
+				<attribute name="Main-Class" value="com.l2jserver.dbinstaller.LauncherLS" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Built-Date" value="${build.tstamp}" />
@@ -161,7 +153,6 @@
 	</target>
 
 	<target name="jarsrc" depends="jar">
-		<mkdir dir="${build.dist.libs}" />
 		<jar destfile="${build.dist.libs}/l2jserver-src.jar">
 			<fileset dir="${src}">
 				<exclude name="/config/**" />
@@ -171,54 +162,16 @@
 	</target>
 
 	<target name="dist" depends="jarsrc">
-		<copy todir="${build.dist.login}">
-			<fileset dir="${src}">
-				<include name="log.cfg" />
-				<include name="banned_ip.cfg" />
-				<include name="console.cfg" />
-			</fileset>
-		</copy>
-		<copy todir="${build.dist.game}">
-			<fileset dir="${src}">
-				<include name="log.cfg" />
-				<include name="console.cfg" />
-			</fileset>
-		</copy>
-		<copy todir="${build.dist.libs}">
-			<fileset dir="${src}/../lib">
-				<include name="*.jar" />
-			</fileset>
-		</copy>
-		<copy todir="${build.dist.languages}">
-			<fileset dir="${src}/../languages" />
-		</copy>
-		<copy todir="${build.dist.images}">
-			<fileset dir="${src}/../images" />
-		</copy>
 		<copy todir="${build.dist.doc}">
 			<fileset dir="${basedir}">
 				<include name="changes.txt" />
 				<include name="LICENSE.txt" />
 				<include name="README.txt" />
 			</fileset>
-		</copy>
-		<copy todir="${build.dist.doc}">
-			<fileset dir="${src}/../lib">
+			<fileset dir="lib">
 				<include name="*LICENSE*" />
 			</fileset>
 		</copy>
-		<copy todir="${build.dist.login}">
-			<fileset dir="dist">
-				<include name="startAccountManager.*" />
-				<include name="startSQLAccountManager.*" />
-				<include name="LoginServer_loop.sh" />
-				<include name="startLoginServer.*" />
-				<include name="RegisterGameServer.*" />
-				<include name="GSRegister.exe" />
-				<include name="L2JConfig.exe" />
-				<include name="L2JConfig.sh" />
-			</fileset>
-		</copy>
 		<copy todir="${build.dist.game}">
 			<fileset dir="dist">
 				<include name="GameServer_loop.sh" />
@@ -227,17 +180,13 @@
 				<include name="L2JConfig.sh" />
 				<include name="hibernate.cfg.xml" />
 			</fileset>
+			<fileset dir="${src}">
+				<include name="log.cfg" />
+				<include name="console.cfg" />
+			</fileset>
 		</copy>
-		<fixcrlf srcdir="${build.dist.game}" eol="lf" eof="remove" includes="**/*.sh" />
-		<fixcrlf srcdir="${build.dist.login}" eol="lf" eof="remove" includes="**/*.sh" />
-		<fixcrlf srcdir="${build.dist.game}" eol="crlf" eof="remove" includes="**/*.bat" />
-		<fixcrlf srcdir="${build.dist.login}" eol="crlf" eof="remove" includes="**/*.bat" />
-		<mkdir dir="${build.dist.game}/log" />
-		<mkdir dir="${build.dist.login}/log" />
-		<mkdir dir="${build.dist.game}/config" />
-		<mkdir dir="${build.dist.login}/config" />
 		<copy todir="${build.dist.game}/config">
-			<fileset dir="java/config">
+			<fileset dir="${src}/config">
 				<include name="*.properties" />
 				<include name="*.xml" />
 				<include name="*.xsd" />
@@ -246,35 +195,64 @@
 				<exclude name="email.properties" />
 			</fileset>
 		</copy>
-		<copy todir="${build.dist.login}/config">
-			<fileset dir="java/config">
-				<include name="loginserver.properties" />
-				<include name="mmo.properties" />
-				<include name="telnet.properties" />
-				<include name="email.properties" />
-			</fileset>
-		</copy>
-		<mkdir dir="${build.dist.game}/data" />
 		<copy todir="${build.dist.game}/data">
 			<fileset dir="data">
 				<include name="*.csv" />
 				<include name="*.txt" />
 			</fileset>
 		</copy>
-		<mkdir dir="${build.dist.game}/data/geodata" />
 		<copy todir="${build.dist.game}/data/geodata">
 			<fileset dir="data/geodata">
 				<include name="*.txt" />
 				<include name="*.l2j" />
 			</fileset>
 		</copy>
-		<mkdir dir="${build.dist.game}/data/pathnode" />
 		<copy todir="${build.dist.game}/data/pathnode">
 			<fileset dir="data/pathnode">
 				<include name="*.txt" />
 				<include name="*.pn" />
 			</fileset>
 		</copy>
+		<copy todir="${build.dist.images}">
+			<fileset dir="images" />
+		</copy>
+		<copy todir="${build.dist.languages}">
+			<fileset dir="languages" />
+		</copy>
+		<copy todir="${build.dist.libs}">
+			<fileset dir="lib">
+				<include name="*.jar" />
+			</fileset>
+		</copy>
+		<copy todir="${build.dist.login}">
+			<fileset dir="dist">
+				<include name="startAccountManager.*" />
+				<include name="startSQLAccountManager.*" />
+				<include name="LoginServer_loop.sh" />
+				<include name="startLoginServer.*" />
+				<include name="RegisterGameServer.*" />
+				<include name="GSRegister.exe" />
+				<include name="L2JConfig.exe" />
+				<include name="L2JConfig.sh" />
+			</fileset>
+			<fileset dir="${src}">
+				<include name="log.cfg" />
+				<include name="banned_ip.cfg" />
+				<include name="console.cfg" />
+			</fileset>
+		</copy>
+		<copy todir="${build.dist.login}/config">
+			<fileset dir="${src}/config">
+				<include name="loginserver.properties" />
+				<include name="mmo.properties" />
+				<include name="telnet.properties" />
+				<include name="email.properties" />
+			</fileset>
+		</copy>
+		<fixcrlf srcdir="${build.dist.game}" eol="crlf" eof="remove" includes="**/*.bat" />
+		<fixcrlf srcdir="${build.dist.game}" eol="lf" eof="remove" includes="**/*.sh" />
+		<fixcrlf srcdir="${build.dist.login}" eol="crlf" eof="remove" includes="**/*.bat" />
+		<fixcrlf srcdir="${build.dist.login}" eol="lf" eof="remove" includes="**/*.sh" />
 		<zip destfile="${build}/L2J_Server_BETA.zip" basedir="${build.dist}" />
 	</target>