From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 2 Dec 2014 00:51:54 +0000 (+0100)
Subject: UPD: add scrypt to buildpath
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=619c91d5d17b0a467c252198d42bf53e71b6522f;ds=sidebyside

UPD: add scrypt to buildpath
---

diff --git a/.classpath b/.classpath
index 544601d0..cab9630e 100644
--- a/.classpath
+++ b/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" path="lib/servlet-api"/>
 	<classpathentry kind="src" path="lib/jetty"/>
 	<classpathentry kind="src" path="lib/jtar"/>
+	<classpathentry kind="src" path="lib/scrypt"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="util"/>
 	<classpathentry kind="src" path="tests"/>
diff --git a/build.xml b/build.xml
index 71a2d371..7a6cc5a0 100644
--- a/build.xml
+++ b/build.xml
@@ -41,20 +41,14 @@
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="lib/jetty">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="src">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
 			</fileset>
-		</copy>
-		<copy includeemptydirs="false" todir="bin">
 			<fileset dir="util">
 				<exclude name="**/*.launch" />
 				<exclude name="**/*.java" />
@@ -91,6 +85,7 @@
 			<src path="lib/servlet-api" />
 			<src path="lib/jetty" />
 			<src path="lib/jtar" />
+			<src path="lib/scrypt" />
 			<src path="src" />
 			<classpath refid="cacert-gigi.classpath" />
 		</javac>
@@ -208,6 +203,7 @@
 				<fileset dir="tests">
 					<include name="**/*.java" />
 					<exclude name="**/testUtils/**" />
+					<exclude name="**/com/lambdaworks/crypto/test/CryptoTestUtil.java"/>
 				</fileset>
 			</batchtest>
 			<classpath refid="cacert-gigi.test.classpath" />