Do you need more assistance with testing the S3_0 patch/script ? No
hurry, just making sure we aren't both just waiting for the other one
to do something.
- ML
On Mon, 18 Apr 2022 at 09:46, Marko Lindqvist <cazfi74@xxxxxxxxx> wrote:
Well, you haven't tested it yet (nor has the review period passed),
so can't push it in the repo yet.
You won't need git, as we now have the nightly tarballs :-)
Also, you might have a hard time testing the master/S3_1 version
anyway. At least before I get
https://osdn.net/projects/freeciv/ticket/44412 implemented.
So at this point you may test S3_0 version (can apply the patch to a
nightly tarball, or 3.0.1 release tarball. Either should work)
Applying patches is discussed in
http://www.freeciv.org/wiki/How_to_Contribute#How_to_use_the_patch_command
In short: "patch -u -p1 -d freeciv-3.0-src <
0026-macOS-Add-hbinstall.sh-script.patch", where freeciv-3.0-src is
the source directory extracted from the tarball.
To remove it, use '-R' (reverse):
"patch -u -p1 -d freeciv-3.0-src -R <
0026-macOS-Add-hbinstall.sh-script.patch"
- ML
On Mon, 18 Apr 2022 at 03:17, Dean <ddeanbrown@xxxxxxxxxxx> wrote:
I can't find hbinstall.sh in the repo
https://github.com/freeciv/freeciv/tree/master
Looking at the patch file I see macOS/homebrew/hbinstall.sh but I don't
see a macOS directory in the repo. Also, looking at the patch file with
my scant knowledge of script files, it looks like it could work.
Maybe that patch isn't yet in the repo? Could you just email the file to
me (off list)? Wish I knew git ;-(
On 4/17/22 12:37 PM, Marko Lindqvist wrote:
Can you test if hbinstall.sh from
https://osdn.net/projects/freeciv/ticket/44400 produces homebrew
installation suitable to be used in your process? If we're going to
include that in a release, there's sort of assumption that the build
made from the release has been using it.
Just be careful not to destroy your working environments when testing
building a new one. Now that I wrote that, I realize that I should add
a check to that script that it would refuse to work if the target
directory exist already.
At this point the S3_0 version is probably the most important to test
- stable release 3.0.2 is going to come from that branch. Also, the
S3_1/master version has been at least somehow tested by running it
through CI, whereas changes made to S3_0 one have not yet been tested
at all.
The homebrew installation also contains stuff needed only by the
sdl2-client. On the other hand it would make sense to trim it to match
what you build (only gtk3.22- and qt-clients), but those libraries are
unlikely (even with their dependencies) to add much to the size of the
installation, and I kind of like to keep sdl2-client build supported
at that level. What do you think?
- ML
