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

Fix indent issues with FATJAR and add a NOWINDOWS option #55

Closed
wants to merge 1 commit into from
Closed

Fix indent issues with FATJAR and add a NOWINDOWS option #55

wants to merge 1 commit into from

Conversation

panghy
Copy link
Contributor

@panghy panghy commented Mar 9, 2018

Mainly for testing java builds without windows.

@alecgrieser alecgrieser changed the base branch from master to release-5.1 March 12, 2018 22:24
@alecgrieser alecgrieser changed the base branch from release-5.1 to release-5.2 March 12, 2018 22:24
alecgrieser
alecgrieser reviewed Mar 12, 2018
View reviewed changes
Copy link
Contributor

@alecgrieser alecgrieser left a comment

Choose a reason for hiding this comment

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

The whitespace-related changes look correct to me. I am somewhat concerned that the NOWINDOWS option might lead to others wanting a NOMACOS option that only builds the linux and Windows option or another. Another option might be something like an ALLPLATFORMS option that requires that multi-platform builds have all needed platforms. That would be on by default, and then setting it to false (which is presumably what you and someone who, say, had a linux build box and a Windows one, but not one for macOS) would let you build a fatter-than-usual-but-not-fully-fat jar.

Fix indent issues with FATJAR and add a NOWINDOWS option (mainly for …
b5827d2 
…testing releases without needing a Windows box).
@alecgrieser
Copy link
Contributor

@panghy Is this something y'all still want?

@panghy
Copy link
Contributor Author

panghy commented May 1, 2018

We are currently building our own java libraries and uploading to our own nexus repo and technically we need to wait until 5.2 before we can really move off of it. I can take off the windows changes (and just do it manually ourselves) or are the indenting fixes already in anyways (I don't see how it'd work without it)?

@alecgrieser
Copy link
Contributor

I'd be happy to take the changes making it possible to build jars without the Windows DLL, I'd just want it to also work for people who are trying to build, say, a mixed Windows/Linux Jar and don't have a macOS build machine.

Yeah, I'm not sure how this is working with the current indentation, though.

@alexmiller-apple
Copy link
Contributor

@panghy I'm doing a sweep of old PRs. Is this still a change that's wanted?

@fdb-build
Copy link

Can one of the admins verify this patch?

3 similar comments
@fdb-build
Copy link

Can one of the admins verify this patch?

@fdb-build
Copy link

Can one of the admins verify this patch?

@fdb-build
Copy link

Can one of the admins verify this patch?

@alexmiller-apple
Copy link
Contributor

@fdb-build ok to test

@panghy
Copy link
Contributor Author

panghy commented Jan 15, 2019

I guess it would be helpful for us to have this still (mainly me).

@alexmiller-apple
Copy link
Contributor

#1035 might make this a moot PR.

@panghy
Copy link
Contributor Author

panghy commented Feb 19, 2019

Sure, let me close this for now

@panghy panghy closed this Feb 19, 2019
@sfc-gh-dyoungworth sfc-gh-dyoungworth mentioned this pull request Jul 11, 2019
Merged
atn34 added a commit to atn34/foundationdb that referenced this pull request Dec 3, 2019
@atn34
Fix UBSAN report
47de9d9 
/Users/anoyes/workspace/foundationdb/fdbserver/TLogInterface.h:149:8: runtime error: load of value 232, which is not a valid value for type 'bool'
    #0 0xc608fb in TLogPeekReply::TLogPeekReply(TLogPeekReply const&) /Users/anoyes/workspace/foundationdb/fdbserver/TLogInterface.h:149
    #1 0x242bf87 in ILogSystem::ServerPeekCursor::ServerPeekCursor(TLogPeekReply const&, LogMessageVersion const&, LogMessageVersion const&, int, int, bool, long, Tag) /Users/anoyes/workspace/foundationdb/fdbserver/LogSystemPeekCursor.actor.cpp:35
    #2 0x242da77 in ILogSystem::ServerPeekCursor::cloneNoMore() /Users/anoyes/workspace/foundationdb/fdbserver/LogSystemPeekCursor.actor.cpp:47
    #3 0x24362d5 in ILogSystem::MergedPeekCursor::cloneNoMore() /Users/anoyes/workspace/foundationdb/fdbserver/LogSystemPeekCursor.actor.cpp:325
    apple#4 0x244bf45 in ILogSystem::MultiCursor::cloneNoMore() /Users/anoyes/workspace/foundationdb/fdbserver/LogSystemPeekCursor.actor.cpp:838
    apple#5 0x36b5a36 in a_body1cont5loopBody1 /Users/anoyes/workspace/foundationdb/fdbserver/storageserver.actor.cpp:2621
    apple#6 0x36b3110 in a_body1cont5loopHead1 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8664
    apple#7 0x36b07fe in a_body1cont5 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8576
    apple#8 0x36abda8 in a_body1cont4when1 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8582
    apple#9 0x36a8dc2 in a_body1cont4 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8454
    apple#10 0x36a4bf6 in a_body1cont3break1 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8489
    apple#11 0x36a2c01 in a_body1cont3loopBody1cont1 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8505
    apple#12 0x369fd36 in a_body1cont3loopBody1when1 /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8513
    apple#13 0x3700dcb in a_callback_fire /Users/anoyes/build/foundationdb/fdbserver/storageserver.actor.g.cpp:8528
    apple#14 0x36e5210 in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#15 0x4dfb2a in SAV<Void>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#16 0x2484b07 in a_body1loopBody1cont1 /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:1526
    apple#17 0x24822cf in a_body1loopBody1cont2 /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:1535
    apple#18 0x247e228 in a_body1loopBody1when1 /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:1541
    apple#19 0x249be87 in a_callback_fire /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:1556
    apple#20 0x249668f in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#21 0x4dfb2a in SAV<Void>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#22 0x80557e in a_body1when1 /Users/anoyes/build/foundationdb/flow/genericactors.actor.g.h:11591
    apple#23 0x8916ef in a_callback_fire /Users/anoyes/build/foundationdb/flow/genericactors.actor.g.h:11620
    apple#24 0x8735f5 in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#25 0x4dfb2a in SAV<Void>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#26 0x24820f8 in a_body1cont1loopBody1when1 /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:860
    apple#27 0x249c852 in a_callback_fire /Users/anoyes/build/foundationdb/fdbserver/LogSystemPeekCursor.actor.g.cpp:886
    apple#28 0x249786c in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#29 0xc9d2dc in SAV<TLogPeekReply>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#30 0x248b39f in a_body1cont2 /Users/anoyes/build/foundationdb/flow/genericactors.actor.g.h:11858
    apple#31 0x2489d02 in a_body1when1 /Users/anoyes/build/foundationdb/flow/genericactors.actor.g.h:11865
    apple#32 0x249a150 in a_callback_fire /Users/anoyes/build/foundationdb/flow/genericactors.actor.g.h:11880
    apple#33 0x2492a4f in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#34 0xc9d2dc in SAV<TLogPeekReply>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#35 0x248df9b in a_body1cont2 /Users/anoyes/build/foundationdb/fdbrpc/genericactors.actor.g.h:2762
    apple#36 0x248b7da in a_body1when1 /Users/anoyes/build/foundationdb/fdbrpc/genericactors.actor.g.h:2769
    apple#37 0x2499c88 in a_callback_fire /Users/anoyes/build/foundationdb/fdbrpc/genericactors.actor.g.h:2784
    apple#38 0x2492371 in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#39 0xc9d2dc in SAV<TLogPeekReply>::finishSendAndDelPromiseRef() /Users/anoyes/workspace/foundationdb/flow/flow.h:479
    apple#40 0xc60fb3 in void SAV<TLogPeekReply>::sendAndDelPromiseRef<TLogPeekReply&>(TLogPeekReply&) /Users/anoyes/workspace/foundationdb/flow/flow.h:472
    apple#41 0xc1137a in NetSAV<TLogPeekReply>::receive(ArenaObjectReader&) /Users/anoyes/workspace/foundationdb/fdbrpc/fdbrpc.h:111
    apple#42 0x78eda75 in a_body1cont1 /Users/anoyes/workspace/foundationdb/fdbrpc/FlowTransport.actor.cpp:652
    apple#43 0x78f7967 in a_body1cont2 /Users/anoyes/build/foundationdb/fdbrpc/FlowTransport.actor.g.cpp:2369
    apple#44 0x78ed4d8 in a_body1when1 /Users/anoyes/build/foundationdb/fdbrpc/FlowTransport.actor.g.cpp:2375
    apple#45 0x791af45 in a_callback_fire /Users/anoyes/build/foundationdb/fdbrpc/FlowTransport.actor.g.cpp:2390
    apple#46 0x7914670 in fire /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#47 0x4df0dc in void SAV<Void>::send<Void>(Void&&) /Users/anoyes/workspace/foundationdb/flow/flow.h:447
    apple#48 0x959891 in void Promise<Void>::send<Void>(Void&&) const /Users/anoyes/workspace/foundationdb/flow/flow.h:778
    apple#49 0x7b4b022 in Sim2::execTask(Sim2::Task&) (/Users/anoyes/build/foundationdb/bin/fdbserver+0x7b4b022)
    apple#50 0x7bf9172 in Sim2::RunLoopActorState<Sim2::RunLoopActor>::a_body1loopBody1cont1(Void const&, int) /Users/anoyes/workspace/foundationdb/fdbrpc/sim2.actor.cpp:979
    apple#51 0x7be7b72 in Sim2::RunLoopActorState<Sim2::RunLoopActor>::a_body1loopBody1when1(Void const&, int) /Users/anoyes/build/foundationdb/fdbrpc/sim2.actor.g.cpp:5391
    apple#52 0x7c32a09 in Sim2::RunLoopActorState<Sim2::RunLoopActor>::a_callback_fire(ActorCallback<Sim2::RunLoopActor, 0, Void>*, Void) /Users/anoyes/build/foundationdb/fdbrpc/sim2.actor.g.cpp:5406
    apple#53 0x7c1fc7d in ActorCallback<Sim2::RunLoopActor, 0, Void>::fire(Void const&) /Users/anoyes/workspace/foundationdb/flow/flow.h:998
    apple#54 0x4df0dc in void SAV<Void>::send<Void>(Void&&) /Users/anoyes/workspace/foundationdb/flow/flow.h:447
    apple#55 0x959891 in void Promise<Void>::send<Void>(Void&&) const /Users/anoyes/workspace/foundationdb/flow/flow.h:778
    apple#56 0x7fe74ae in N2::PromiseTask::operator()() /Users/anoyes/workspace/foundationdb/flow/Net2.actor.cpp:481
    apple#57 0x7fb7001 in N2::Net2::run() /Users/anoyes/workspace/foundationdb/flow/Net2.actor.cpp:657
    apple#58 0x7b71bdd in Sim2::_runActorState<Sim2::_runActor>::a_body1(int) /Users/anoyes/workspace/foundationdb/fdbrpc/sim2.actor.cpp:989
    apple#59 0x7b2ee5b in Sim2::_runActor::_runActor(Sim2* const&) /Users/anoyes/build/foundationdb/fdbrpc/sim2.actor.g.cpp:5608
    apple#60 0x7b2f272 in Sim2::_run(Sim2* const&) /Users/anoyes/workspace/foundationdb/fdbrpc/sim2.actor.cpp:987
    apple#61 0x7b2f2d2 in Sim2::run() /Users/anoyes/workspace/foundationdb/fdbrpc/sim2.actor.cpp:996
    apple#62 0x2104064 in main /Users/anoyes/workspace/foundationdb/fdbserver/fdbserver.actor.cpp:1793
    apple#63 0x7fb7c6561504 in __libc_start_main (/lib64/libc.so.6+0x22504)
    apple#64 0x464914  (/Users/anoyes/build/foundationdb/bin/fdbserver+0x464914)
sfc-gh-ljoswiak pushed a commit to sfc-gh-ljoswiak/foundationdb that referenced this pull request Dec 14, 2022
@sfc-gh-vgasiunas
Merge pull request apple#55 from sfc-gh-mpilman/vgasiunas/flow-serial…
812f08b 
…izer

Make generated code compilable with array attributes
vishesh pushed a commit to vishesh/foundationdb that referenced this pull request Apr 6, 2023
@hyp
Merge pull request apple#55 from FoundationDB/modularization-fixes
c387ccc 
Modularization fixes for modularized libstdc++ experiment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alecgrieser alecgrieser alecgrieser left review comments

Assignees

@alecgrieser alecgrieser

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@panghy @alecgrieser @alexmiller-apple @fdb-build