Page MenuHomeWildfire Games

Update bundle dist tools
ClosedPublic

Authored by wraitii on Jan 15 2021, 3:33 PM.

Details

Reviewers
None
Commits
rP24763: Update bundle dist tools
Trac Tickets
#5955
Summary

The MacOs script was not exporting the SVN revision properly. Rename the DMG to match the other's conventions.

Test Plan

Run.

Diff Detail

Repository
rP 0 A.D. Public Repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

wraitii created this revision.Jan 15 2021, 3:33 PM

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/2879/display/redirect for more details.

wraitii requested review of this revision.Jan 15 2021, 4:41 PM
wraitii updated this revision to Diff 15388.Jan 16 2021, 4:53 PM

Merge ability to set a revision on the bundle script (probably useful).

Owners added a subscriber: Restricted Owners Package.Jan 16 2021, 4:53 PM
Stan added a subscriber: Stan.Jan 16 2021, 5:09 PM
Stan added inline comments.
source/tools/dist/build-osx-executable.sh
33 ↗(On Diff #15388)

Is it possible to make "release" an option? This way we could have "test", I use "dev" on my local builds.

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgui_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback

See https://jenkins.wildfiregames.com/job/macos-differential/2896/display/redirect for more details.

wraitii added inline comments.Jan 19 2021, 2:08 PM
source/tools/dist/build-osx-executable.sh
33 ↗(On Diff #15388)

I'm not sure there's much point?

wraitii updated this revision to Diff 15556.Jan 20 2021, 8:47 AM

Fix macos script.

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/Cor

See https://jenkins.wildfiregames.com/job/macos-differential/2984/display/redirect for more details.

Stan added inline comments.Jan 20 2021, 9:10 AM
source/tools/dist/build-osx-executable.sh
33 ↗(On Diff #15388)

Well if we use it and somebody gets a rc he shouldn't have access to we'll be able to identify it

wraitii added inline comments.Jan 20 2021, 9:17 AM
source/tools/dist/build-osx-executable.sh
33 ↗(On Diff #15388)

We'd already be able to identify it via the revision though

wraitii updated this revision to Diff 15610.Jan 21 2021, 9:35 PM
wraitii updated the Trac tickets for this revision.

Really fix svn_revision & do #5955

Build is green

builderr-debug-macos.txt
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking.
ld: warning: text-based stu

See https://jenkins.wildfiregames.com/job/macos-differential/3010/display/redirect for more details.

Stan added inline comments.Jan 21 2021, 10:01 PM
source/tools/dist/build-osx-executable.sh
33 ↗(On Diff #15388)

Won't that add extra quotes ?
e.g

"L"string""

instead of

L"string"

I use

L\"${SVN_REV}"-release\"
wraitii added inline comments.Jan 22 2021, 9:42 AM
source/tools/dist/build-unix-win32.sh
11 ↗(On Diff #15610)

No it's actually printing L"XXXX-release" to the .txt, which is what we need.

wraitii updated this revision to Diff 15618.Jan 22 2021, 9:42 AM

logs/ folder under binaries/

Tested on CI tonight, am merging.

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libengine_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to librar

See https://jenkins.wildfiregames.com/job/macos-differential/3015/display/redirect for more details.

This revision was not accepted when it landed; it landed in state Needs Review.Jan 22 2021, 1:54 PM
Closed by commit rP24763: Update bundle dist tools (authored by wraitii). · Explain Why
This revision was automatically updated to reflect the committed changes.