Unverified Commit f2218515 authored by kladko's avatar kladko

Merge branch 'develop' of https://github.com/skalenetwork/sgxwallet into develop

parents 263eae9f 93a17b57
...@@ -7,5 +7,7 @@ jhid -d ...@@ -7,5 +7,7 @@ jhid -d
/opt/intel/sgxpsw/aesm/aesm_service & /opt/intel/sgxpsw/aesm/aesm_service &
pid=$! pid=$!
sgxwallet sleep 3
/usr/src/sdk/sgxwallet/sgxwallet
...@@ -91,10 +91,7 @@ if not os.path.isdir(AUTOMAKE_DIR): ...@@ -91,10 +91,7 @@ if not os.path.isdir(AUTOMAKE_DIR):
subprocess.call(["git", "submodule", "update", "--init"]) subprocess.call(["git", "submodule", "update", "--init"])
subprocess.call(["rm", "-f", "install-sh"])
subprocess.call(["rm", "-f", "compile"])
subprocess.call(["rm", "-f", "missing"])
subprocess.call(["rm", "-f", "depcomp"])
subprocess.call(["rm", "-rf", GMP_BUILD_DIR]) subprocess.call(["rm", "-rf", GMP_BUILD_DIR])
subprocess.call(["rm", "-rf", TGMP_BUILD_DIR]) subprocess.call(["rm", "-rf", TGMP_BUILD_DIR])
...@@ -102,11 +99,6 @@ subprocess.call(["rm", "-rf", SDK_DIR]) ...@@ -102,11 +99,6 @@ subprocess.call(["rm", "-rf", SDK_DIR])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/install-sh", "install-sh"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/depcomp", "depcomp"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/missing", "missing"])
subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/compile", "compile"])
assert subprocess.call(["cp", "configure.gmp", GMP_DIR + "/configure"]) == 0 assert subprocess.call(["cp", "configure.gmp", GMP_DIR + "/configure"]) == 0
os.chdir(LEVELDB_DIR); os.chdir(LEVELDB_DIR);
...@@ -119,11 +111,11 @@ assert subprocess.call(["bash","-c", "cmake -DCMAKE_BUILD_TYPE=Release .. && cma ...@@ -119,11 +111,11 @@ assert subprocess.call(["bash","-c", "cmake -DCMAKE_BUILD_TYPE=Release .. && cma
os.chdir(BLS_DIR); os.chdir(BLS_DIR);
assert subprocess.call(["bash","-c", "cmake -H. -Bbuild"]) == 0 # assert subprocess.call(["bash","-c", "cmake -H. -Bbuild"]) == 0
os.chdir(BLS_BUILD_DIR); #os.chdir(BLS_BUILD_DIR);
assert subprocess.call(["bash","-c", "make"]) == 0 # assert subprocess.call(["bash","-c", "make"]) == 0
os.chdir(SCRIPTS_DIR) os.chdir(SCRIPTS_DIR)
...@@ -166,7 +158,7 @@ print "===>>> Making SSL project" ...@@ -166,7 +158,7 @@ print "===>>> Making SSL project"
os.chdir(SSL_MAKE_DIR); os.chdir(SSL_MAKE_DIR);
assert subprocess.call(["make", "SGX_SDK=" + SGX_SDK_DIR_SSL, "all", "test"]) == 0 assert subprocess.call(["make", "SGX_SDK=" + SGX_SDK_DIR_SSL, "all"]) == 0
os.chdir(topDir) os.chdir(topDir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment