Procházet zdrojové kódy

Fixing build.xml:
Fixed time stamp.
Added Class-Path to manifest.
Added Main-Class to manifest.
Removed invalid exclude.
Minor cleanup.

Zoey76 před 10 roky
rodič
revize
e96f10153d

+ 27 - 21
L2J_Server/build.xml

@@ -47,6 +47,18 @@
 		</mapper>
 	</pathconvert>
 
+	<target name="checkRequirements" description="Check Requirements.">
+		<fail message="Ant 1.9.1 is required. But your version is ${ant.version} and if you are using Eclipse probably is outdated.">
+			<condition>
+				<not>
+					<antversion atleast="1.9.1" />
+				</not>
+			</condition>
+		</fail>
+		<available classname="java.util.stream.Stream" property="JDK8.present" />
+		<fail unless="JDK8.present" message="Java 1.8 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
+	</target>
+
 	<target name="init" depends="checkRequirements" description="Create the output directories.">
 		<delete dir="${build.bin}" quiet="true" />
 		<mkdir dir="${build.bin}" />
@@ -63,6 +75,10 @@
 	</target>
 
 	<target name="jar" depends="compile" description="Create the jar files.">
+		<tstamp>
+			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
+		</tstamp>
+
 		<jar destfile="${build.dist.login}/l2jlogin.jar" level="9">
 			<fileset dir="${build.bin}">
 				<exclude name="**/dbinstaller/**" />
@@ -70,8 +86,10 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
+				<attribute name="Class-Path" value="../libs/c3p0-0.9.5-pre10.jar ../libs/javolution-5.5.1.jar ../libs/mail-1.5.2.jar ../libs/mmocore.jar ../libs/mysql-connector-java-5.1.31-bin.jar ../libs/weupnp-0.1.3.jar" />
+				<attribute name="Main-Class" value="com.l2jserver.loginserver.L2LoginServer" />
 			</manifest>
 		</jar>
 		<jar destfile="${build.dist.login}/L2J_Configurator.jar" level="9">
@@ -85,7 +103,6 @@
 				<exclude name="**/gsregistering/**" />
 				<exclude name="**/log/**" />
 				<exclude name="**/loginserver/**" />
-				<exclude name="**/ngl/**" />
 				<exclude name="**/status/**" />
 				<exclude name="**/util/**" />
 				<exclude name="**/Config/**" />
@@ -94,7 +111,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 				<attribute name="Main-Class" value="com.l2jserver.tools.configurator.ConfigUserInterface" />
@@ -109,8 +126,10 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
+				<attribute name="Class-Path" value="${manifest.libs}" />
+				<attribute name="Main-Class" value="com.l2jserver.gameserver.GameServer" />
 			</manifest>
 		</jar>
 		<jar destfile="${build.dist.game}/L2J_Configurator.jar" level="9">
@@ -124,7 +143,6 @@
 				<exclude name="**/gsregistering/**" />
 				<exclude name="**/log/**" />
 				<exclude name="**/loginserver/**" />
-				<exclude name="**/ngl/**" />
 				<exclude name="**/status/**" />
 				<exclude name="**/util/**" />
 				<exclude name="**/Config/**" />
@@ -133,7 +151,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 				<attribute name="Main-Class" value="com.l2jserver.tools.configurator.ConfigUserInterface" />
@@ -150,7 +168,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 				<attribute name="Main-Class" value="com.l2jserver.tools.dbinstaller.LauncherCS" />
@@ -167,7 +185,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 				<attribute name="Main-Class" value="com.l2jserver.tools.dbinstaller.LauncherGS" />
@@ -184,7 +202,7 @@
 			</fileset>
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${build.tstamp}" />
+				<attribute name="Built-Date" value="${time.stamp}" />
 				<attribute name="Class-Path" value="${manifest.libs}" />
 				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
 				<attribute name="Main-Class" value="com.l2jserver.tools.dbinstaller.LauncherLS" />
@@ -195,16 +213,4 @@
 	<target name="build" depends="jar" description="Create the Zip file.">
 		<zip destfile="${build}/L2J_Server_BETA.zip" basedir="${build.dist}" level="9" />
 	</target>
-
-	<target name="checkRequirements" description="Check Requirements.">
-		<fail message="Ant 1.9.1 is required. But your version is ${ant.version} and if you are using Eclipse probably is outdated.">
-			<condition>
-				<not>
-					<antversion atleast="1.9.1" />
-				</not>
-			</condition>
-		</fail>
-		<available classname="java.util.stream.Stream" property="JDK8.present" />
-		<fail unless="JDK8.present" message="Java 1.8 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
-	</target>
 </project>

+ 1 - 1
L2J_Server/dist/game/GameServer_loop.sh

@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Djava.util.logging.manager=com.l2jserver.util.L2LogManager -Xms1024m -Xmx1536m -cp ./../libs/*:l2jserver.jar com.l2jserver.gameserver.GameServer > log/stdout.log 2>&1
+	java -Djava.util.logging.manager=com.l2jserver.util.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar l2jserver.jar > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10

+ 1 - 1
L2J_Server/dist/game/startGameServer.bat

@@ -5,7 +5,7 @@ title Game Server Console
 echo Starting L2J Game Server.
 echo.
 
-java -Djava.util.logging.manager=com.l2jserver.util.L2LogManager -Xms1024m -Xmx1536m -cp ./../libs/*;l2jserver.jar com.l2jserver.gameserver.GameServer
+java -Djava.util.logging.manager=com.l2jserver.util.L2LogManager -Dpython.cachedir=../cachedir -Xms1024m -Xmx1536m -jar l2jserver.jar
 
 REM NOTE: If you have a powerful machine, you could modify/add some extra parameters for performance, like:
 REM -Xms1536m

+ 1 - 1
L2J_Server/dist/login/LoginServer_loop.sh

@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms128m -Xmx256m -cp ./../libs/*:l2jlogin.jar com.l2jserver.loginserver.L2LoginServer > log/stdout.log 2>&1
+	java -Xms128m -Xmx256m -jar l2jlogin.jar > log/stdout.log 2>&1
 	err=$?
 	sleep 10;
 done

+ 1 - 1
L2J_Server/dist/login/startLoginServer.bat

@@ -5,7 +5,7 @@ title Login Server Console
 echo Starting L2J Login Server.
 echo.
 
-java -Xms128m -Xmx256m -cp ./../libs/*;l2jlogin.jar com.l2jserver.loginserver.L2LoginServer
+java -Xms128m -Xmx256m -jar l2jlogin.jar
 
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error

+ 1 - 1
L2J_Server/java/com/l2jserver/Config.java

@@ -73,7 +73,7 @@ public final class Config
 	// --------------------------------------------------
 	// Constants
 	// --------------------------------------------------
-	public static final String EOL = System.getProperty("line.separator");
+	public static final String EOL = System.lineSeparator();
 	
 	// --------------------------------------------------
 	// L2J Property File Definitions

+ 4 - 15
L2J_Server/java/com/l2jserver/util/StringUtil.java

@@ -18,8 +18,6 @@
  */
 package com.l2jserver.util;
 
-import javolution.text.TextBuilder;
-
 import com.l2jserver.Config;
 
 /**
@@ -199,16 +197,12 @@ public final class StringUtil
 	 */
 	public static String concat(final String... strings)
 	{
-		final TextBuilder sbString = TextBuilder.newInstance();
-		
+		final StringBuilder sbString = new StringBuilder();
 		for (final String string : strings)
 		{
 			sbString.append(string);
 		}
-		
-		String result = sbString.toString();
-		TextBuilder.recycle(sbString);
-		return result;
+		return sbString.toString();
 	}
 	
 	/**
@@ -221,12 +215,10 @@ public final class StringUtil
 	{
 		final int length = getLength(strings);
 		final StringBuilder sbString = new StringBuilder(sizeHint > length ? sizeHint : length);
-		
 		for (final String string : strings)
 		{
 			sbString.append(string);
 		}
-		
 		return sbString;
 	}
 	
@@ -272,14 +264,11 @@ public final class StringUtil
 	
 	public static String getTraceString(StackTraceElement[] trace)
 	{
-		final TextBuilder sbString = TextBuilder.newInstance();
+		final StringBuilder sbString = new StringBuilder();
 		for (final StackTraceElement element : trace)
 		{
 			sbString.append(element.toString()).append(Config.EOL);
 		}
-		
-		String result = sbString.toString();
-		TextBuilder.recycle(sbString);
-		return result;
+		return sbString.toString();
 	}
 }