UPD: add scrypt to buildpath

diff --git a/.classpath b/.classpath
index 544601d05ee7f4956d0c8d6efa0a77faafd11171..cab9630e50879b23c4ea0c49a44b2121e484d828 100644 (file)
--- 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/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"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="util"/>
        <classpathentry kind="src" path="tests"/>

diff --git a/build.xml b/build.xml
index 71a2d37107807b8be6a47584caf22cfb25a79aab..7a6cc5a050a94a9435c2d0f845ee36e98324d5dd 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -41,20 +41,14 @@
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>

-               </copy>
-               <copy includeemptydirs="false" todir="bin">

                        <fileset dir="lib/jetty">
                                <exclude name="**/*.launch" />
                                <exclude name="**/*.java" />
                        </fileset>
                        <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>
                        <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" />
                        <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/servlet-api" />
                        <src path="lib/jetty" />
                        <src path="lib/jtar" />

+                       <src path="lib/scrypt" />

                        <src path="src" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>
                        <src path="src" />
                        <classpath refid="cacert-gigi.classpath" />
                </javac>


@@ -208,6 +203,7 @@
                                <fileset dir="tests">
                                        <include name="**/*.java" />
                                        <exclude name="**/testUtils/**" />
                                <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" />
                                </fileset>
                        </batchtest>
                        <classpath refid="cacert-gigi.test.classpath" />