new build script

Author: ladnir

.gitignore

@@ -24,6 +24,7 @@ frontend_cryptoTools/certs/*
 
 .DS_Store
 */.DS_Store
+__pycache__/
 
 # Build results
 [Dd]ebug/

CMakeLists.txt

@@ -3,7 +3,7 @@ if (POLICY CMP0048)
   cmake_policy(SET CMP0048 NEW)
 endif (POLICY CMP0048)
 
-project(cryptoTools VERSION 1.6.0)
+project(cryptoTools VERSION 1.7.0)
 
 
 

CMakeSettings.json

@@ -0,0 +1,61 @@
+import os
+import platform
+import sys
+from .thirdparty import getBoost
+from .thirdparty import getRelic
+#import thirdparty
+
+def Setup():
+	dir_path = os.path.dirname(os.path.realpath(__file__))
+	os.chdir(dir_path + "/thirdparty")
+
+	if "boost" in sys.argv:
+		getBoost.getBoost()
+	if "relic" in sys.argv:
+		getRelic.getRelic()
+
+
+def Build():
+
+	osStr = (platform.system())
+	buildDir = ""
+	args = sys.argv[1:]
+	config = ""
+	buildType = ""
+	if len(args) > 0 and args[0] == "Debug":
+		buildType = "Debug"
+		args = args[1:]
+	else:
+		buildType = "Release"
+
+
+	if osStr == "Windows":
+		buildDir = "out/build/x64-{0}".format(buildType)
+		config = "--config {0}".format(buildType)
+		args.append("-DCOMMON_FLAGS=/MP /Qpar")
+	else:
+		buildDir = "out/build/linux"
+
+
+	args.append("-DCMAKE_BUILD_TYPE={0}".format(buildType))
+
+	argStr = ""
+	for a in args:
+		argStr = argStr + " " + a
+
+	mkDirCmd = "mkdir -p {0}".format(buildDir); 
+	CMakeCmd = "cmake -S . -B {0} {1}".format(buildDir, argStr)
+	BuildCmd = "cmake --build {0} {1} --parallel ".format(buildDir, config)
+
+	print("Build Cmd:\n  {0}\n  {1}\n  {2}\n\n".format(mkDirCmd, CMakeCmd, BuildCmd))
+
+	os.system(mkDirCmd)
+	os.system(CMakeCmd)
+	os.system(BuildCmd)
+
+
+if __name__ == "__main__":
+	if(len(sys.argv) > 1 and sys.argv[1] == "setup"):
+		Setup()
+	else:
+		Build()

__init__.py

@@ -68,7 +68,7 @@ if(ENABLE_BOOST)
 
     if(NOT BOOST_ROOT OR NOT EXISTS "${BOOST_ROOT}")
         if(MSVC)
-            set(BOOST_ROOT_local "${CMAKE_CURRENT_LIST_DIR}/../cryptoTools/thirdparty/win/boost/")
+            set(BOOST_ROOT_local "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/boost/")
             set(BOOST_ROOT_install "c:/libs/boost/")
 
 
@@ -80,7 +80,7 @@ if(ENABLE_BOOST)
                 set(BOOST_ROOT "${BOOST_ROOT_install}")
             endif()
         else()
-            set(BOOST_ROOT "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/linux/boost/")
+            set(BOOST_ROOT "${CMAKE_CURRENT_LIST_DIR}/../thirdparty/boost/")
 
             set(BOOST_SEARCH_PATHS "${BOOST_SEARCH_PATHS} ${BOOST_ROOT}")
         endif()
@@ -98,9 +98,9 @@ if(ENABLE_BOOST)
 
     macro(findBoost)
         if(MSVC)
-            find_package(Boost 1.69 COMPONENTS system thread regex)
+            find_package(Boost 1.75 COMPONENTS system thread regex)
         else()
-            find_package(Boost 1.69 COMPONENTS system thread)
+            find_package(Boost 1.75 COMPONENTS system thread)
         endif()
     endmacro()
 
@@ -110,7 +110,7 @@ if(ENABLE_BOOST)
     endif()
 
     if(NOT Boost_FOUND)
-        message(FATAL_ERROR "Failed to find boost 1.69+ at ${BOOST_SEARCH_PATHS} or at system install")
+        message(FATAL_ERROR "Failed to find boost 1.75+ at ${BOOST_ROOT} or at system install")
     endif()
 
     message(STATUS "Boost_LIB: ${Boost_LIBRARIES}" )

build.py

@@ -2,8 +2,8 @@
 
 
 #define CRYPTO_TOOLS_VERSION_MAJOR 1
-#define CRYPTO_TOOLS_VERSION_MINOR 6
-#define CRYPTO_TOOLS_VERSION_PATCH 1
+#define CRYPTO_TOOLS_VERSION_MINOR 7
+#define CRYPTO_TOOLS_VERSION_PATCH 0
 
 
 #define CRYPTO_TOOLS_VERSION (CRYPTO_TOOLS_VERSION_MAJOR * 10000 + CRYPTO_TOOLS_VERSION_MINOR * 100 + CRYPTO_TOOLS_VERSION_PATCH)

build.sh

@@ -31,7 +31,7 @@ extern "C" {
 #define RLC_BN_SIZE BN_SIZE
 #endif
 
-#if !defined(MULTI) || ((MULTI != PTHREAD) && (MULTI != OPENMP))
+#if !defined(MULTI) || ((MULTI != PTHREAD) && (MULTI != OPENMP) && (MULTI != MSVCTLS))
 static_assert(0, "Relic must be built with -DMULTI=PTHREAD or -DMULTI=OPENMP");
 #endif
 

cmake/cryptoToolsDepHelper.cmake

@@ -2,68 +2,33 @@
 =====
 
 
-CryptoTools is a portable c++14 library containing a collection of tools for building cryptographic protocols. This include asynchronous networking (Boost Asio), several fast primitives such as AES (AES-NI), Blake2, SHA1 (assembly), and eliptic curve crypto (Relic-Toolkit). There are also several other utilities tailered for implementing protocols.
+CryptoTools is a portable c++14 library containing a collection of tools for building cryptographic protocols. This include asynchronous networking (Boost Asio), several fast primitives such as AES (AES-NI), Blake2 (assembly), and eliptic curve crypto (Relic-Toolkit). There are also several other utilities tailored for implementing protocols.
 
 Thirdparty networking is also supported. See `frontend_cryptoTools/tutorial/Network.cpp` for an example.
 
 
 
-## Install
+## Build
 
 The library is *cross platform* and has been tested on both Windows, Linux and Mac. There are two **optional dependencies** including [Boost 1.69](http://www.boost.org/) (networking), and [Relic](https://github.com/relic-toolkit/relic/) for elliptic curves. 
 
-### Windows
-
-In `Powershell`, this will set up the project 
+ 
+ In short, this will build the project
 
 ```
-git clone --recursive https://github.com/ladnir/cryptoTools
-cd cryptoTools/thirdparty/win
-[build boost at c:\libs\boost or thirdparty\win\boost]
-cd ../..
-[build using cmake, eg with visual studio]
+git clone https://github.com/ladnir/cryptoTools
+python build.py setup boost relic
+python build.py -DENABLE_RELIC=ON 
 ```
-The `libOTe` library will be written to `[build_dir]/libOTe/` and the exectable to `[build_dir]/frontend_cryptoTools/`.
-
- * See `cmake .` for build options.
-
-**Enable elliptic curves using:**
- * `cmake .  -DENABLE_RELIC=ON`: Build the library with integration to the 
-      [Relic](https://github.com/relic-toolkit/relic/) library. Requires that
-      relic is built with `cmake . -DMULTI=OPENMP` and installed.
-
-**Boost and visual studio:**  If boost does not build with visual studio 2017+
-follow [these instructions](https://stackoverflow.com/questions/41464356/build-boost-with-msvc-14-1-vs2017-rc). 
-
-### Unix
- 
- In short, this will build the project (without elliptic curves)
+The resulting binaries are written to `out/build/linux` or `out/build/x64-Release` depending on a unix or windows build. The frontend executable is `frontend_cryptoTools/`.
 
+Relic and Boost are not required. In this case `boost`, `relic` can be omitted, e.g.
 ```
-git clone --recursive https://github.com/ladnir/cryptoTools
-cd thirdparty/linux
-bash boost.get
-cd ../..
-cmake .
-make
+python build.py setup 
+python build.py -DENABLE_RELIC=OFF -DENABLE_BOOST=OFF
 ```
-The `libOTe` library will be written to `[build_dir]/libOTe/` and the exectable to `[build_dir]/frontend_cryptoTools/`, where `[build_dir]=.` for in source build.
-
-This will build the minimum version of the library (wihtout elliptic curves).
- To see all the command line options, execute the program 
- 
-`./frontend_libOTe`
-
-
-**Enable elliptic curves using:**
- * `cmake .  -DENABLE_RELIC=ON`: Build the library with integration to the 
-      [Relic](https://github.com/relic-toolkit/relic/) library. Requires that
-      relic is built with `cmake . -DMULTI=PTHREAD` and installed.
-
-**Note:** In the case that miracl or boost is already installed, the steps 
-`cd cryptoTools/thirdparty/linux; bash boost.get` can be skipped and CMake will attempt 
-to find them instead. Boost is found with the CMake findBoost package. 
 
+Several other build options are available. See the output of `python build.py` or `cmake .`
 
  ## License
 This project is dual licensed under MIT and Unlicensed.