Explorar o código

BETA: Builders Changes.

MELERIX %!s(int64=13) %!d(string=hai) anos
pai
achega
8f348c500e

+ 13 - 13
L2J_Server_BETA/.classpath

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="java" />
+	<classpathentry kind="src" path="java" />
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4" />
-	<classpathentry kind="lib" path="lib/c3p0-0.9.2-pre1.jar" />
-	<classpathentry kind="lib" path="lib/javolution-5.5.1.jar" />
-	<classpathentry kind="lib" path="lib/jna.jar" />
-	<classpathentry kind="lib" path="lib/jython.jar" />
-	<classpathentry kind="lib" path="lib/jython-engine-2.2.1.jar" />
-	<classpathentry kind="lib" path="lib/mail.jar" />
-	<classpathentry kind="lib" path="lib/mailapi.jar" />
-	<classpathentry kind="lib" path="lib/mchange-commons-0.2.jar" />
-	<classpathentry kind="lib" path="lib/mmocore.jar" />
-	<classpathentry kind="lib" path="lib/netcon.jar" />
-	<classpathentry kind="lib" path="lib/smtp.jar" />
-	<classpathentry kind="lib" path="lib/trove-3.0.2.jar" />
+	<classpathentry kind="lib" path="dist/lib/c3p0-0.9.2-pre1.jar" />
+	<classpathentry kind="lib" path="dist/lib/javolution-5.5.1.jar" />
+	<classpathentry kind="lib" path="dist/lib/jna.jar" />
+	<classpathentry kind="lib" path="dist/lib/jython.jar" />
+	<classpathentry kind="lib" path="dist/lib/jython-engine-2.2.1.jar" />
+	<classpathentry kind="lib" path="dist/lib/mail.jar" />
+	<classpathentry kind="lib" path="dist/lib/mailapi.jar" />
+	<classpathentry kind="lib" path="dist/lib/mchange-commons-0.2.jar" />
+	<classpathentry kind="lib" path="dist/lib/mmocore.jar" />
+	<classpathentry kind="lib" path="dist/lib/netcon.jar" />
+	<classpathentry kind="lib" path="dist/lib/smtp.jar" />
+	<classpathentry kind="lib" path="dist/lib/trove-3.0.2.jar" />
 	<classpathentry kind="output" path="bin" />
 </classpath>

+ 19 - 26
L2J_Server_BETA/build.xml

@@ -22,7 +22,7 @@
 	</description>
 
 	<property name="src" location="java" />
-	<property name="lib" location="lib" />
+	<property name="lib" location="dist/lib" />
 	<property name="build" location="build" />
 	<property name="build.classes" location="${build}/classes" />
 	<property name="build.dist" location="${build}/dist" />
@@ -48,12 +48,26 @@
 		</mapper>
 	</pathconvert>
 
-	<target name="init" depends="clean,checkRequirements,getChangelogDateVersion" description="Create the output directories.">
+	<target name="init" depends="checkRequirements,getChangelogDateVersion" description="Create the output directories.">
 		<mkdir dir="${build}" />
 		<mkdir dir="${build.classes}" />
 	</target>
 
-	<target name="compile" depends="init" description="Compile the source.">
+	<target name="dist" depends="init">
+		<sync todir="${build.dist}">
+			<fileset dir="dist" />
+		</sync>
+		<concat destfile="${build.dist.doc}/L2J_Server_CHANGELOG.txt">${l2j.changelog}</concat>
+		<copy todir="${build.dist.game}">
+			<fileset dir="misc" />
+		</copy>
+		<concat destfile="${build.dist.game}/config/l2j-version.properties">version=${l2j.version}${line.separator}builddate=${build.tstamp}</concat>
+		<copy todir="${build.dist.login}">
+			<fileset dir="misc" />
+		</copy>
+	</target>
+	
+	<target name="compile" depends="dist" description="Compile the source.">
 		<javac srcdir="${src}" classpathref="classpath" destdir="${build.classes}" compiler="javac1.7" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="1.7" target="1.7" />
 	</target>
 
@@ -140,30 +154,9 @@
 			</manifest>
 		</jar>
 	</target>
-
-	<target name="dist" depends="jar">
-		<copy todir="${build.dist}">
-			<fileset dir="dist" />
-		</copy>
-		<concat destfile="${build.dist.doc}/L2J_Server_CHANGELOG.txt">${l2j.changelog}</concat>
-		<copy todir="${build.dist.game}">
-			<fileset dir="misc" />
-		</copy>
-		<concat destfile="${build.dist.game}/config/l2j-version.properties">version=${l2j.version}${line.separator}builddate=${build.tstamp}</concat>
-		<copy todir="${build.dist.libs}">
-			<fileset dir="lib" />
-		</copy>
-		<copy todir="${build.dist.login}">
-			<fileset dir="misc" />
-		</copy>
-	</target>
 	
-	<target name="build" depends="dist">
-		<zip destfile="${build}/L2J_Server_BETA.zip" basedir="${build.dist}" level="9" />
-	</target>
-
-	<target name="clean" description="Remove the output directories">
-		<delete dir="${build}" />
+	<target name="build" depends="jar">
+		<zip destfile="${build}/L2J_Server_BETA.zip" basedir="${build.dist}" level="9" update="true" />
 	</target>
 
 	<target name="checkRequirements" description="Check Requirements">

+ 0 - 0
L2J_Server_BETA/lib/bsh-2.0b5.jar → L2J_Server_BETA/dist/lib/bsh-2.0b5.jar


+ 0 - 0
L2J_Server_BETA/lib/bsh-engine.jar → L2J_Server_BETA/dist/lib/bsh-engine.jar


+ 0 - 0
L2J_Server_BETA/lib/c3p0-0.9.2-pre1.jar → L2J_Server_BETA/dist/lib/c3p0-0.9.2-pre1.jar


+ 0 - 0
L2J_Server_BETA/lib/ecj-3.7.2.jar → L2J_Server_BETA/dist/lib/ecj-3.7.2.jar


+ 0 - 0
L2J_Server_BETA/lib/java-engine-1.7.jar → L2J_Server_BETA/dist/lib/java-engine-1.7.jar


+ 0 - 0
L2J_Server_BETA/lib/javolution-5.5.1.jar → L2J_Server_BETA/dist/lib/javolution-5.5.1.jar


+ 0 - 0
L2J_Server_BETA/lib/jna.jar → L2J_Server_BETA/dist/lib/jna.jar


+ 0 - 0
L2J_Server_BETA/lib/jython-engine-2.2.1.jar → L2J_Server_BETA/dist/lib/jython-engine-2.2.1.jar


+ 0 - 0
L2J_Server_BETA/lib/jython.jar → L2J_Server_BETA/dist/lib/jython.jar


+ 0 - 0
L2J_Server_BETA/lib/mail.jar → L2J_Server_BETA/dist/lib/mail.jar


+ 0 - 0
L2J_Server_BETA/lib/mailapi.jar → L2J_Server_BETA/dist/lib/mailapi.jar


+ 0 - 0
L2J_Server_BETA/lib/mchange-commons-0.2.jar → L2J_Server_BETA/dist/lib/mchange-commons-0.2.jar


+ 0 - 0
L2J_Server_BETA/lib/mmocore.jar → L2J_Server_BETA/dist/lib/mmocore.jar


+ 0 - 0
L2J_Server_BETA/lib/mysql-connector-java-5.1.20-bin.jar → L2J_Server_BETA/dist/lib/mysql-connector-java-5.1.20-bin.jar


+ 0 - 0
L2J_Server_BETA/lib/netcon.jar → L2J_Server_BETA/dist/lib/netcon.jar


+ 0 - 0
L2J_Server_BETA/lib/smtp.jar → L2J_Server_BETA/dist/lib/smtp.jar


+ 0 - 0
L2J_Server_BETA/lib/trove-3.0.2.jar → L2J_Server_BETA/dist/lib/trove-3.0.2.jar