Refactoring everything into src/ for a little sanity

Author: xcthulhu

CMakeLists.txt

@@ -8,7 +8,7 @@ if (WIN32 AND WANT_CRYPTOPP)
 	add_subdirectory(cryptopp)
 endif()
 
-add_subdirectory(libethash)
-add_subdirectory(libethash-cl EXCLUDE_FROM_ALL)
-add_subdirectory(benchmark EXCLUDE_FROM_ALL)
+add_subdirectory(src/libethash)
+add_subdirectory(src/libethash-cl EXCLUDE_FROM_ALL)
+add_subdirectory(src/benchmark EXCLUDE_FROM_ALL)
 add_subdirectory(test/c EXCLUDE_FROM_ALL)

ethash.go

@@ -2,10 +2,10 @@ package ethash
 
 /*
 #cgo CFLAGS: -std=gnu99 -Wall
-#include "libethash/ethash.h"
-#include "libethash/util.c"
-#include "libethash/internal.c"
-#include "libethash/sha3.c"
+#include "src/libethash/ethash.h"
+#include "src/libethash/util.c"
+#include "src/libethash/internal.c"
+#include "src/libethash/sha3.c"
 */
 import "C"
 

libethash-js/LICENSE js/LICENSE

@@ -3,10 +3,10 @@
 
 pyethash_core = Extension('pyethash.core', 
         sources = [
-            'python-src/core.c', 
-            'libethash/util.c', 
-            'libethash/internal.c',
-            'libethash/sha3.c'
+            'src/python/core.c', 
+            'src/libethash/util.c', 
+            'src/libethash/internal.c',
+            'src/libethash/sha3.c'
             ])
 
 setup (name = 'pyethash',

libethash-js/ethash.js js/ethash.js

@@ -4,7 +4,7 @@ ENDIF()
 
 IF( Boost_FOUND )
     include_directories( ${Boost_INCLUDE_DIR} )
-    include_directories(../..)
+    include_directories(../../src)
 
     link_directories ( ${Boost_LIBRARY_DIRS} )
     file(GLOB HEADERS "*.h")

libethash-js/keccak.js js/keccak.js

@@ -11,7 +11,6 @@ while [ -h "$SOURCE" ]; do
 done
 TEST_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-echo "################# Testing Go ##################"
 rm -rf $TEST_DIR/go-build 
 # TODO: go-ethereum needs to integrate ethash for this to work
 #export GOPATH=$TEST_DIR/../go-build 

libethash-js/makekeccak.js js/makekeccak.js

@@ -13,7 +13,7 @@ TEST_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 echo -e "\n################# Testing JS ##################"
 # TODO: Use mocha and real testing tools instead of rolling our own
-cd $TEST_DIR/../libethash-js 
+cd $TEST_DIR/../js 
 node test.js
 
 echo -e "\n################# Testing Python ##################"
@@ -23,10 +23,4 @@ echo -e "\n################# Testing C ##################"
 $TEST_DIR/c/test.sh
 
 #echo "################# Testing Go ##################"
-#( rm -rf $TEST_DIR/../go-build 
-#  export GOPATH=$TEST_DIR/../go-build 
-#  export PATH=$PATH:$GOPATH/bin 
-#  cd $TEST_DIR/go 
-#  go get -dv 
-#  go get -v github.com/ethereum/ethash 
-#  go test )
+#$TEST_DIR/go/test.sh