Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DUB: Require most recent compiler / dub, simplify #2160

Merged
merged 2 commits into from
Jun 10, 2021
Merged

DUB: Require most recent compiler / dub, simplify #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc8925
Require the latest LDC / DUB
Geod24 Jun 7, 2021
e9d8b8e
dub: Do not list all object files, just use a wildcard
Geod24 Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ README.md
.dub/
build/
docs/
source/scpp/build/
source/scpp/build/*.o
source/scpp/build/*.obj
Comment on lines +13 to +14
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also a workaround for the DUB issue.


# Dependency build files
submodules/*/.dub/
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
55 changes: 4 additions & 51 deletions dub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand All @@ -77,10 +30,10 @@
"buildRequirements": [ "allowWarnings" ],

"toolchainRequirements": {
"dub": "~>1.24",
"dub": "~>1.25",
"dmd": "no",
"gdc": "no",
"ldc": "~>1.25"
"ldc": "~>1.26"
},

"configurations": [
Expand Down
1 change: 1 addition & 0 deletions source/scpp/build/.gitkeep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://github.com/dlang/dub/issues/2142