Page MenuHomeWildfire Games

Small changes to the macOS scripts
ClosedPublic

Authored by Itms on Aug 10 2018, 3:43 PM.

Details

Reviewers
Stan
elexis
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Commits
rP21931: Small changes to the macOS build scripts.
Summary

Currently it displays 2015 in the installer, and sometimes things fail depending on the dev environment.

Test Plan

/

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

Stan created this revision.Aug 10 2018, 3:43 PM
Vulcan added a subscriber: Vulcan.Aug 10 2018, 3:44 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/differential/715/display/redirect

smiley added a subscriber: smiley.Oct 16 2018, 8:30 PM
smiley added inline comments.
build/workspaces/build-osx-bundle.sh
214 ↗(On Diff #6851)

$(date +%Y)
2018 almost over anyway ;)

Itms commandeered this revision.Nov 9 2018, 8:40 PM
Itms added a reviewer: Stan.
Itms added a subscriber: Itms.

@Stan If you don't mind, I'm commandeering this one to have all the small changes to macOS scripts in one diff! :slight_smile:

Itms updated this revision to Diff 6977.Nov 9 2018, 8:46 PM
Itms retitled this revision from Update OSX bundle copyright version to Small changes to the macOS scripts.
Itms edited the summary of this revision. (Show Details)

Small changes to the macOS scripts.

  • date update based on previous patch
  • the --enable-64bit flag is needed for nspr when developing on recent versions (we are already building 64bit only)
  • the --without-libpsl precision is needed to avoid issues when libpsl is installed and detected
Vulcan added a comment.Nov 9 2018, 9:08 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/differential/775/

Stan added a comment.Nov 9 2018, 11:35 PM

Thanks for commandeering

elexis accepted this revision.Nov 10 2018, 2:57 PM
elexis added a subscriber: elexis.
In D1609#66039, @Itms wrote:
  • the --enable-64bit flag is needed for nspr when developing on recent versions (we are already building 64bit only)

That:?

The --enable-64bit parameter is required on an x86_64 system to prevent configure failing with a claim that this is a system without pthread support. The [ $(uname -m) = x86_64 ] test ensures it has no effect on a 32 bit system.

http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html
(Anyway, if it's our policy to build for 64bit only, then the technical background is irrelevant.)

In D1609#66039, @Itms wrote:
  • the --without-libpsl precision is needed to avoid issues when libpsl is installed and detected

https://ec.haxx.se/building-deps.html

When you build curl with support for libpsl, the cookie parser will know about the Public Suffix List and thus handle such cookies appropriately.

So Public Suffix List is used to enforce privacy rules on cookies afaics.
Since neither mod.io nor UserReporter use cookies (proven by the absence of the word COOKIE in the files, https://ec.haxx.se/libcurl-http-cookies.html), it seems safe to build without libPSL (and it would yield a smaller footprint in comparison to including it needlessly).

So no clue if the diff is necessary or complete for some technical issues, but the diff is not adding anything wrong for any platform.

build/workspaces/build-osx-bundle.sh
214 ↗(On Diff #6851)

(ah, you're already in the contributors list)

This revision is now accepted and ready to land.Nov 10 2018, 2:57 PM

Tested by Tobbi: He had to compile with this NSPR flag too on macOS 10.13.6, but could also compile without the PSL one (presumably as he didnt install it).

This revision was automatically updated to reflect the committed changes.