Fixed build.py

scripts/build.py

@@ -101,47 +101,44 @@ subprocess.call(["ln", "-s", AUTOMAKE_DIR + "/compile", "compile"])
 
 
 
-os.chdir(SSL_DIR);
-
 
-print "===>>> Downloading vanilla openssl source package"
+os.chdir(GMP_DIR);
 
-os.chdir(SSL_SOURCE_DIR);
 
+assert subprocess.call(["bash", "-c", "./configure --prefix=" + TGMP_BUILD_DIR + " --disable-shared " +
+                        " --enable-static --with-pic --enable-sgx  --with-sgxsdk=" + SDK_DIR + "/sgxsdk"]) == 0
 
-assert subprocess.call(["wget", "https://www.openssl.org/source/openssl-1.1.1b.tar.gz"]) == 0
 
-print "===>>> Making SSL  project"
+assert subprocess.call(["make", "install"]) == 0
+assert subprocess.call(["make", "clean"]) == 0
 
-os.chdir(SSL_MAKE_DIR);
 
-assert subprocess.call("make",  "SGX_SDK=" + SGX_SDK_DIR_SSL, "all",  "test") == 0
+assert subprocess.call(["bash", "-c", "./configure --prefix=" + GMP_BUILD_DIR + " --disable-shared " +
+                        " --enable-static  --with-pic --with-sgxsdk=" + SDK_DIR + "/sgxsdk"]) == 0
+assert subprocess.call(["make", "install"]) == 0
+assert subprocess.call(["make", "clean"]) == 0
 
 os.chdir(topDir)
 
-assert subprocess.call(["cp", "configure.gmp", GMP_DIR + "/configure"]) == 0
+assert subprocess.call(["cp", "sgx_tgmp.h", TGMP_BUILD_DIR + "/include/sgx_tgmp.h"]) == 0
 
-assert subprocess.call(["scripts/sgx_linux_x64_sdk_2.5.100.49891.bin", "--prefix=" + SDK_DIR]) == 0
+os.chdir(SSL_DIR);
 
-os.chdir(GMP_DIR);
 
+print "===>>> Downloading vanilla openssl source package"
 
-assert subprocess.call(["bash", "-c", "./configure --prefix=" + TGMP_BUILD_DIR + " --disable-shared " +
-                        " --enable-static --with-pic --enable-sgx  --with-sgxsdk=" + SDK_DIR + "/sgxsdk"]) == 0
+os.chdir(SSL_SOURCE_DIR);
 
 
-assert subprocess.call(["make", "install"]) == 0
-assert subprocess.call(["make", "clean"]) == 0
+assert subprocess.call(["wget", "https://www.openssl.org/source/openssl-1.1.1b.tar.gz"]) == 0
 
+print "===>>> Making SSL  project"
 
-assert subprocess.call(["bash", "-c", "./configure --prefix=" + GMP_BUILD_DIR + " --disable-shared " +
-                        " --enable-static  --with-pic --with-sgxsdk=" + SDK_DIR + "/sgxsdk"]) == 0
-assert subprocess.call(["make", "install"]) == 0
-assert subprocess.call(["make", "clean"]) == 0
+os.chdir(SSL_MAKE_DIR);
 
-os.chdir("..")
+assert subprocess.call("make",  "SGX_SDK=" + SGX_SDK_DIR_SSL, "all",  "test") == 0
 
-assert subprocess.call(["cp", "sgx_tgmp.h", TGMP_BUILD_DIR + "/include/sgx_tgmp.h"]) == 0
+os.chdir(topDir)