From 430caadad2a8f5a4239d63ab1dbc87c4fc47502b Mon Sep 17 00:00:00 2001
From: UnAfraid <unafraid89@gmail.com>
Date: Fri, 31 Oct 2014 01:25:42 +0200
Subject: [PATCH] Adding ignores to bin, build folders Removing old svn way of
versioning now it won't work like that soon will be implemented for git.
---
L2J_DataPack_BETA/.gitignore | 2 ++
L2J_DataPack_BETA/build.xml | 19 +------------------
.../handlers/telnethandlers/DebugHandler.java | 3 ---
3 files changed, 3 insertions(+), 21 deletions(-)
create mode 100644 L2J_DataPack_BETA/.gitignore
diff --git a/L2J_DataPack_BETA/.gitignore b/L2J_DataPack_BETA/.gitignore
new file mode 100644
index 0000000000..4a95481e61
--- /dev/null
+++ b/L2J_DataPack_BETA/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/build/
diff --git a/L2J_DataPack_BETA/build.xml b/L2J_DataPack_BETA/build.xml
index 7b99424c73..a630550340 100644
--- a/L2J_DataPack_BETA/build.xml
+++ b/L2J_DataPack_BETA/build.xml
@@ -25,7 +25,7 @@
<property name="build.dist.game" location="${build.dist}/game" />
<property name="build.dist.login" location="${build.dist}/login" />
- <target name="init" depends="checkRequirements,getDateAndVersion" description="Create the output directories.">
+ <target name="init" depends="checkRequirements" description="Create the output directories.">
<mkdir dir="${build}" />
</target>
@@ -33,7 +33,6 @@
<sync todir="${build.dist}" includeemptydirs="true">
<fileset dir="dist" />
</sync>
- <concat destfile="${build.dist.game}/config/l2jdp-version.properties">version=${l2j.version}${line.separator}builddate=${build.tstamp}</concat>
</target>
<target name="build" depends="dist">
@@ -49,20 +48,4 @@
</condition>
</fail>
</target>
-
- <target name="getDateAndVersion" description="Get Date and Version.">
- <tstamp>
- <format property="build.tstamp" pattern="dd/MM/yyyy HH:mm" />
- </tstamp>
- <exec dir="${basedir}" executable="svnversion" outputproperty="l2j.version">
- <arg value="-c" />
- <redirector>
- <outputfilterchain>
- <tokenfilter>
- <replaceregex pattern="[0-9]+\:" replace="" />
- </tokenfilter>
- </outputfilterchain>
- </redirector>
- </exec>
- </target>
</project>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
index 9dd03c5c70..3a4d9ab129 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java
@@ -35,7 +35,6 @@ import java.util.StringTokenizer;
import javolution.util.FastComparator;
import javolution.util.FastTable;
-import com.l2jserver.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.LoginServerThread;
import com.l2jserver.gameserver.ThreadPoolManager;
@@ -167,8 +166,6 @@ public class DebugHandler implements ITelnetHandler
StringBuilder sb = new StringBuilder();
sb.append(sdf.format(cal.getTime()));
- sb.append("\n\nL2J Server Version: " + Config.SERVER_VERSION);
- sb.append("\nDP Revision: " + Config.DATAPACK_VERSION);
sb.append("\n\n");
uptime = _uptime;
sb.append(getServerStatus());
--
GitLab