diff --git a/.dockerignore b/.dockerignore index b850273f0d9..5d75ce0bf04 100644 --- a/.dockerignore +++ b/.dockerignore @@ -10,7 +10,8 @@ README.md .dub/ build/ docs/ -source/scpp/build/ +source/scpp/build/*.o +source/scpp/build/*.obj # Dependency build files submodules/*/.dub/ diff --git a/README.md b/README.md index c70c044f38f..1a8e704e3f5 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ and make the port locally accessible (See http://127.0.0.1:4000/) . ## Dependencies -You need a recent C++ compiler (g++ with N4387 fixed), a recent (>=1.25.0) version of the LDC compiler, and `dub`. +You need a recent C++ compiler (g++ with N4387 fixed), a recent (>=1.26.0) version of the LDC compiler, and `dub`. On Linux, we recommend gcc-9. On OSX, the latest `llvm` package available on Homebrew. Additionally, the following are dependencies: diff --git a/dub.json b/dub.json index ab417e98bf9..839c700183d 100644 --- a/dub.json +++ b/dub.json @@ -15,57 +15,10 @@ "$DUB --verbose --single source/scpp/build.d || (sleep 5s && $DUB --verbose --single source/scpp/build.d)" ], "sourceFiles-posix": [ - "source/scpp/build/BallotProtocol.o", - "source/scpp/build/cbitset.o", - "source/scpp/build/DSCPUtils.o", - "source/scpp/build/DUtils.o", - "source/scpp/build/HashOfHash.o", - "source/scpp/build/Hex.o", - "source/scpp/build/KeyUtils.o", - "source/scpp/build/LocalNode.o", - "source/scpp/build/Logging.o", - "source/scpp/build/Math.o", - "source/scpp/build/NominationProtocol.o", - "source/scpp/build/QuorumSetUtils.o", - "source/scpp/build/ShortHash.o", - "source/scpp/build/siphash.o", - "source/scpp/build/SCP.o", - "source/scpp/build/SCPDriver.o", - "source/scpp/build/SecretKey.o", - "source/scpp/build/Slot.o", - "source/scpp/build/StrKey.o", - "source/scpp/build/crc16.o", - "source/scpp/build/jsoncpp.o", - "source/scpp/build/marshal.o", - "source/scpp/build/numeric.o", - "source/scpp/build/QuorumIntersectionCheckerImpl.o", - "source/scpp/build/QuorumTracker.o", - "source/scpp/build/uint128_t.o" + "source/scpp/build/*.o" ], "sourceFiles-windows": [ - "source/scpp/build/BallotProtocol.obj", - "source/scpp/build/DSCPUtils.obj", - "source/scpp/build/DUtils.obj", - "source/scpp/build/HashOfHash.obj", - "source/scpp/build/Hex.obj", - "source/scpp/build/KeyUtils.obj", - "source/scpp/build/LocalNode.obj", - "source/scpp/build/Logging.obj", - "source/scpp/build/Math.obj", - "source/scpp/build/NominationProtocol.obj", - "source/scpp/build/QuorumSetUtils.obj", - "source/scpp/build/ShortHash.obj", - "source/scpp/build/SCP.obj", - "source/scpp/build/siphash.obj", - "source/scpp/build/SCPDriver.obj", - "source/scpp/build/SecretKey.obj", - "source/scpp/build/Slot.obj", - "source/scpp/build/StrKey.obj", - "source/scpp/build/crc16.obj", - "source/scpp/build/jsoncpp.obj", - "source/scpp/build/marshal.obj", - "source/scpp/build/numeric.obj", - "source/scpp/build/uint128_t.obj" + "source/scpp/build/*.obj" ], "dflags": [ "-extern-std=c++14", "-preview=in", "-revert=dtorfields" ], @@ -77,10 +30,10 @@ "buildRequirements": [ "allowWarnings" ], "toolchainRequirements": { - "dub": "~>1.24", + "dub": "~>1.25", "dmd": "no", "gdc": "no", - "ldc": "~>1.25" + "ldc": "~>1.26" }, "configurations": [ diff --git a/source/scpp/build/.gitkeep b/source/scpp/build/.gitkeep new file mode 100644 index 00000000000..87987c71497 --- /dev/null +++ b/source/scpp/build/.gitkeep @@ -0,0 +1 @@ +https://github.com/dlang/dub/issues/2142