mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 09:54:10 -04:00
5d5e35fb9b
## Problem Windows builds break with a current local toolchain (Scoop LLVM 22.1.8, CMake 4.4.0, VS 2026), in two independent ways: 1. The build stops at curl's deliberate guard: `#error "no non-blocking method was found/used/set"` in `third-party/curl/lib/nonblock.c`. 2. From the second configure onward, `cmake --build` re-runs CMake in an endless loop (observed 42 consecutive reconfigure cycles in a single build). Likely the same mechanism behind the "endlessly building" VS 2026 note in `docs/setup/dev/vs.md`. ## Root cause 1. `third-party/curl/CMake/CurlTests.c` passes `int *` to `ioctlsocket()`, whose third parameter is `u_long *`. Clang 22 promotes `-Wincompatible-pointer-types` to a hard error in C, so the `HAVE_IOCTLSOCKET_FIONBIO` try_compile silently fails and `curl_config.h` never defines it. Upstream CI does not see this because the windows-2022 runner image ships an older LLVM. GCC 14 promotes the same warning to a hard error, which is very likely the `CurlTests.c.obj` failure reported from MSYS2 in open-goal/jak-project#3551. Upstream curl hit the identical problem with GCC 14 and fixed the probe in curl 8.8.0 (curl/curl#13578). 2. The root CMakeLists copies the build tree's `compile_commands.json` into `<src>/build/` for clangd using `configure_file()`, which registers its input as a configure dependency. CMake rewrites `compile_commands.json` late in every generation, after `CTestTestfile.cmake` and `cmake_install.cmake` (outputs of the same Ninja regen rule), so once the dependency is registered the rule is deterministically dirty and every `ninja` invocation re-runs CMake. A pristine first configure is safe (the file does not exist yet, so the `if(EXISTS ...)` guard skips the copy), which is why the loop looks machine- or IDE-specific. ## Fix 1. Per review, re-vendor `third-party/curl` at the `curl-8_21_0` tag (previously `curl-8_3_0`), which carries the upstream probe fix plus two years of upstream development; `vendor.yaml` updated to match. Adjustments the version jump forced: - curl 8.15 removed the native macOS Secure Transport backend (`CURL_USE_SECTRANSP`), so macOS now builds curl against OpenSSL like Linux. The two macOS workflows install Homebrew `openssl@3` and export `OPENSSL_ROOT_DIR` (keg-only), and the macOS setup docs gained the same two lines. - `CURL_BROTLI` / `CURL_ZSTD` switched to AUTO-detection in curl 8.10; pinned OFF to keep the previous no-compression behavior and avoid silently linking whatever the CI images happen to have. - curl's new top-level `BUILD_EXAMPLES` cache option (default ON) leaked into discord-rpc's identically named option and broke configure at a nonexistent `examples/send-presence` directory; pinned OFF ahead of the third-party subdirectories. The diff is dominated by the mechanical tag-tree swap under `third-party/curl` (linguist-vendored, collapsed in review). The hand-written changes are `CMakeLists.txt`, the two macOS workflows, `docs/setup/system/macos.md`, and `vendor.yaml`. 2. Swap `configure_file()` for `file(COPY ...)`: the same clangd copy with no configure dependency registered. (`file(COPY_FILE ... ONLY_IF_DIFFERENT)` would be cleaner still but requires CMake 3.21, above the declared `cmake_minimum_required(VERSION 3.10)`.) ## Test plan - [x] Fresh `cmake --preset Release-windows-clang` (LLVM 22, no cache seeding) completes and logs `Enabled SSL backends: Schannel`; the FIONBIO probe passes without the previous `#error` - [x] Full Windows Release build from scratch in the branch worktree (all 1422 targets) - [x] goalc-test suite: 1509 passed, 0 failed - [x] Second consecutive configure with `compile_commands.json` present: the regen rule in `build.ninja` has no `compile_commands.json` input; `<src>/build/compile_commands.json` is still refreshed for clangd - [x] Repeated `ninja` invocations after a full build no longer re-run CMake - [x] macOS Intel and ARM CI green (first exercise of the OpenSSL backend switch) --- I work off a self-hosted forge, so this GitHub account is quiet; the configure logs and ninja dirty-node traces from the investigation are available if anyone wants the raw data. (AI-assisted)
278 lines
6.9 KiB
Perl
Vendored
Generated
278 lines
6.9 KiB
Perl
Vendored
Generated
#!/usr/bin/env perl
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
|
|
###############################################
|
|
#
|
|
# ==== How to use this script ====
|
|
#
|
|
# 1. Get recent commits added to RELEASE-NOTES:
|
|
#
|
|
# $ ./scripts/release-notes.pl
|
|
#
|
|
# 2. Edit RELEASE-NOTES and remove all entries that do not belong. Unused
|
|
# references below are cleaned up in the next step. Make sure to move
|
|
# "changes" up to the changes section. All entries are by default listed
|
|
# under bug-fixes as this script cannot know where to put them.
|
|
#
|
|
# 3. Run the cleanup script and let it sort the entries and remove unused
|
|
# references from lines you removed in step (2):
|
|
#
|
|
# $ ./scripts/release-notes.pl cleanup
|
|
#
|
|
# 4. Reload RELEASE-NOTES and verify that things look okay. The cleanup
|
|
# procedure can and should be re-run when lines are removed or rephrased.
|
|
#
|
|
# 5. Run ./scripts/contributors.sh and update the contributor list of names
|
|
# The list can also be extended or edited manually.
|
|
#
|
|
# 6. Run ./scripts/delta and update the contributor count at the top, and
|
|
# double-check/update the other counters.
|
|
#
|
|
# 7. Commit the file using "RELEASE-NOTES: synced" as commit message.
|
|
#
|
|
################################################
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
my $cleanup = (@ARGV && $ARGV[0] eq "cleanup");
|
|
my @gitlog = qx(git log @^{/RELEASE-NOTES:.synced}..) if(!$cleanup);
|
|
my @releasenotes = qx(cat RELEASE-NOTES);
|
|
|
|
my @o; # the entire new RELEASE-NOTES
|
|
my @refused; # [num] = [2 bits of use info]
|
|
my @refs; # [number] = [URL]
|
|
my %dupe;
|
|
for my $l (@releasenotes) {
|
|
if($l =~ /^ o .*\[(\d+)\]/) {
|
|
# referenced, set bit 0
|
|
$refused[$1] = 1;
|
|
my $m = $l;
|
|
chomp $m;
|
|
$m =~ s/^ o //;
|
|
$m =~ s/ \[\d+\]$//;
|
|
$dupe{$m} = 1; # mark this as present
|
|
}
|
|
elsif($l =~ /^ \[(\d+)\] = (.*)/) {
|
|
# listed in a reference, set bit 1
|
|
$refused[$1] |= 2;
|
|
$refs[$1] = $2;
|
|
}
|
|
# mention without reference
|
|
elsif($l =~ /^ o (.*)/) {
|
|
my $m = $l;
|
|
chomp $m;
|
|
$m =~ s/^ o //;
|
|
$dupe{$m} = 1; # mark this as present
|
|
}
|
|
}
|
|
|
|
# Return a new fresh reference number
|
|
sub getref {
|
|
for my $r (1 .. $#refs) {
|
|
if(!$refused[$r] & 1) {
|
|
return $r;
|
|
}
|
|
}
|
|
# add at the end
|
|
return $#refs + 1;
|
|
}
|
|
|
|
# '#num'
|
|
# 'num'
|
|
# 'https://github.com/curl/curl/issues/6939'
|
|
# 'https://github.com/curl/curl-www/issues/69'
|
|
# 'https://elsewhere.example.com/discussion'
|
|
|
|
sub extract {
|
|
my ($ref) = @_;
|
|
if($ref =~ /^(\#|)(\d+)/) {
|
|
# return the plain number
|
|
return $2;
|
|
}
|
|
elsif($ref =~ /^https:\/\/github.com\/curl\/curl\/.*\/(\d+)/) {
|
|
# return the plain number
|
|
return $1;
|
|
}
|
|
elsif($ref =~ /:\/\//) {
|
|
# contains a '://', return the URL
|
|
return $ref;
|
|
}
|
|
# false alarm, not a valid line
|
|
}
|
|
|
|
my @fixes;
|
|
my @closes;
|
|
my @bug;
|
|
my @line;
|
|
my %moreinfo;
|
|
|
|
my $short;
|
|
my $first;
|
|
for my $l (@gitlog) {
|
|
chomp $l;
|
|
if($l =~ /^commit/) {
|
|
if($first) {
|
|
onecommit($short);
|
|
}
|
|
# starts a new commit
|
|
undef @fixes;
|
|
undef @closes;
|
|
undef @bug;
|
|
$short = "";
|
|
$first = 0;
|
|
}
|
|
elsif(($l =~ /^ (.*)/) && !$first) {
|
|
# first line
|
|
$short = $1;
|
|
$short =~ s/ ?\[(ci skip|skip ci)\]//g;
|
|
$first = 1;
|
|
push @line, $short;
|
|
}
|
|
elsif(($l =~ /^ (.*)/) && $first) {
|
|
# not the first
|
|
my $line = $1;
|
|
|
|
if($line =~ /^Fixes(:|) *(.*)/i) {
|
|
my $ref = extract($2);
|
|
push @fixes, $ref if($ref);
|
|
}
|
|
elsif($line =~ /^Cl([os]+)es(:|) *(.*)/i) {
|
|
my $ref = extract($3);
|
|
push @closes, $ref if($ref);
|
|
}
|
|
elsif($line =~ /^Bug: (.*)/i) {
|
|
my $ref = extract($1);
|
|
push @bug, $ref if($ref);
|
|
}
|
|
}
|
|
}
|
|
if($first) {
|
|
onecommit($short);
|
|
}
|
|
|
|
# call at the end of a parsed commit
|
|
sub onecommit {
|
|
my ($short) = @_;
|
|
my $ref = '';
|
|
|
|
if($dupe{$short}) {
|
|
# this git commit message was found in the file
|
|
return;
|
|
}
|
|
|
|
if($bug[0]) {
|
|
$ref = $bug[0];
|
|
}
|
|
elsif($fixes[0]) {
|
|
$ref = $fixes[0];
|
|
}
|
|
elsif($closes[0]) {
|
|
$ref = $closes[0];
|
|
}
|
|
|
|
if($ref =~ /^#?(\d+)/) {
|
|
$ref = "https://curl.se/bug/?i=$1"
|
|
}
|
|
if($ref) {
|
|
my $r = getref();
|
|
$refs[$r] = $ref;
|
|
$moreinfo{$short} = $r;
|
|
$refused[$r] |= 1;
|
|
}
|
|
}
|
|
|
|
#### Output the new RELEASE-NOTES
|
|
|
|
my @bullets;
|
|
for my $l (@releasenotes) {
|
|
if(($l =~ /^This release includes the following bugfixes:/) && !$cleanup) {
|
|
push @o, $l;
|
|
push @o, "\n";
|
|
for my $f (@line) {
|
|
if($dupe{$f}) {
|
|
# this item is already listed
|
|
next;
|
|
}
|
|
|
|
push @o, sprintf " o %s%s\n", $f,
|
|
$moreinfo{$f}? sprintf(" [%d]", $moreinfo{$f}): "";
|
|
if($moreinfo{$f}) {
|
|
$refused[$moreinfo{$f}] = 3;
|
|
}
|
|
}
|
|
push @o, " --- new entries are listed above this ---";
|
|
next;
|
|
}
|
|
elsif($cleanup) {
|
|
if($l =~ /^ --- new entries are listed/) {
|
|
# ignore this if still around
|
|
next;
|
|
}
|
|
elsif($l =~ /^ o .*/) {
|
|
push @bullets, $l;
|
|
next;
|
|
}
|
|
elsif($bullets[0]) {
|
|
# output them case insensitively
|
|
for my $b (sort { "\L$a" cmp "\L$b" } @bullets) {
|
|
push @o, $b;
|
|
}
|
|
undef @bullets;
|
|
}
|
|
}
|
|
if($l =~ /^ \[(\d+)\] = /) {
|
|
# stop now
|
|
last;
|
|
}
|
|
else {
|
|
push @o, $l;
|
|
}
|
|
}
|
|
|
|
my @srefs;
|
|
my $ln;
|
|
for my $n (1 .. $#refs) {
|
|
my $r = $refs[$n];
|
|
if($r && ($refused[$n] & 1)) {
|
|
push @o, sprintf " [%d] = %s\n", $n, $r;
|
|
}
|
|
}
|
|
|
|
open(O, ">RELEASE-NOTES");
|
|
for my $l (@o) {
|
|
print O $l;
|
|
}
|
|
close(O);
|
|
|
|
exit;
|
|
|
|
# Debug: show unused references
|
|
for my $r (1 .. $#refs) {
|
|
if($refused[$r] != 3) {
|
|
printf "%s is %d!\n", $r, $refused[$r];
|
|
}
|
|
}
|