mirror of
https://github.com/open-goal/jak-project
synced 2026-08-06 01:49:17 -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)
179 lines
5.7 KiB
Perl
Vendored
Generated
179 lines
5.7 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
|
|
#
|
|
###########################################################################
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Getopt::Long();
|
|
use Pod::Usage();
|
|
|
|
my $opts_dir = '../docs/cmdline-opts';
|
|
my $shell = 'zsh';
|
|
my $help = 0;
|
|
Getopt::Long::GetOptions(
|
|
'opts-dir=s' => \$opts_dir,
|
|
'shell=s' => \$shell,
|
|
'help' => \$help,
|
|
) or Pod::Usage::pod2usage();
|
|
Pod::Usage::pod2usage() if $help;
|
|
|
|
my @opts = parse_main_opts($opts_dir);
|
|
|
|
if($shell eq 'fish') {
|
|
print "# curl fish completion\n\n";
|
|
print "# Complete file paths after @\n";
|
|
print q(complete -c curl -n 'string match -qr "^@" -- (commandline -ct)' -k -xa "(printf '%s\n' -- @(__fish_complete_suffix --complete=(commandline -ct | string replace -r '^@' '') ''))");
|
|
print "\n\n";
|
|
print qq{$_ \n} foreach (@opts);
|
|
} elsif($shell eq 'zsh') {
|
|
my $opts_str;
|
|
|
|
$opts_str .= qq{ $_ \\\n} foreach (@opts);
|
|
chomp $opts_str;
|
|
|
|
my $tmpl = <<"EOS";
|
|
#compdef curl
|
|
|
|
# curl zsh completion
|
|
|
|
local curcontext="\$curcontext" state state_descr line
|
|
typeset -A opt_args
|
|
|
|
local rc=1
|
|
|
|
_arguments -C -S \\
|
|
$opts_str
|
|
'*:URL:_urls' && rc=0
|
|
|
|
return rc
|
|
EOS
|
|
|
|
print $tmpl;
|
|
} else {
|
|
die("Unsupported shell: $shell");
|
|
}
|
|
|
|
sub parse_main_opts {
|
|
my ($opts_dir) = @_;
|
|
|
|
my (@files, @list);
|
|
my ($dir_handle, $file_content);
|
|
|
|
opendir($dir_handle, $opts_dir) or die "Unable to open dir: $opts_dir due to error: $!";
|
|
@files = readdir($dir_handle);
|
|
closedir($dir_handle) or die "Unable to close handle on dir: $opts_dir due to error: $!";
|
|
|
|
# We want regular files that end with .md and do not start with an underscore
|
|
# Edge case: MANPAGE.md does not start with an underscore but also is not documentation for an option
|
|
@files = grep { $_ =~ /\.md$/i && !/^_/ && -f "$opts_dir/$_" && $_ ne "MANPAGE.md" } @files;
|
|
|
|
for my $file (@files) {
|
|
open(my $doc_handle, '<', "$opts_dir/$file") or die "Unable to open file: $file due to error: $!";
|
|
$file_content = join('', <$doc_handle>);
|
|
close($doc_handle) or die "Unable to close file: $file due to error: $!";
|
|
|
|
# Extract the curldown header section demarcated by ---
|
|
$file_content =~ /^---\s*\n(.*?)\n---\s*\n/s or die "Unable to parse file $file";
|
|
|
|
$file_content = $1;
|
|
my ($short, $long, $arg, $desc);
|
|
|
|
if($file_content =~ /^Short:\s+(.*)\s*$/im) {$short = "-$1";}
|
|
if($file_content =~ /^Long:\s+(.*)\s*$/im) {$long = "--$1";}
|
|
if($file_content =~ /^Arg:\s+(.*)\s*$/im) {$arg = $1;}
|
|
if($file_content =~ /^Help:\s+(.*)\s*$/im) {$desc = $1;}
|
|
|
|
$arg =~ s/\:/\\\:/g if defined $arg;
|
|
$desc =~ s/'/'\\''/g if defined $desc;
|
|
$desc =~ s/\[/\\\[/g if defined $desc;
|
|
$desc =~ s/\]/\\\]/g if defined $desc;
|
|
$desc =~ s/\:/\\\:/g if defined $desc;
|
|
|
|
my $option = '';
|
|
|
|
if($shell eq 'fish') {
|
|
$option .= "complete --command curl";
|
|
$option .= " --short-option '" . strip_dash(trim($short)) . "'"
|
|
if defined $short;
|
|
$option .= " --long-option '" . strip_dash(trim($long)) . "'"
|
|
if defined $long;
|
|
$option .= " --description '" . strip_dash(trim($desc)) . "'"
|
|
if defined $desc;
|
|
} elsif($shell eq 'zsh') {
|
|
$option .= '{' . trim($short) . ',' if defined $short;
|
|
$option .= trim($long) if defined $long;
|
|
$option .= '}' if defined $short;
|
|
$option .= '\'[' . trim($desc) . ']\'' if defined $desc;
|
|
|
|
if(defined $arg) {
|
|
$option .= ":'$arg'";
|
|
if($arg =~ /<file ?(name)?>|<path>/) {
|
|
$option .= ':_files';
|
|
} elsif($arg =~ /<dir>/) {
|
|
$option .= ":'_path_files -/'";
|
|
} elsif($arg =~ /<url>/i) {
|
|
$option .= ':_urls';
|
|
} elsif($long =~ /ftp/ && $arg =~ /<method>/) {
|
|
$option .= ":'(multicwd nocwd singlecwd)'";
|
|
} elsif($arg =~ /<method>/) {
|
|
$option .= ":'(DELETE GET HEAD POST PUT)'";
|
|
}
|
|
}
|
|
}
|
|
|
|
push(@list, $option);
|
|
}
|
|
|
|
# Sort longest first, because zsh does not complete an option listed
|
|
# after one that is a prefix of it. When length is equal, fall back
|
|
# to stringwise cmp.
|
|
@list = sort {
|
|
$a =~ /([^=]*)/; my $ma = $1;
|
|
$b =~ /([^=]*)/; my $mb = $1;
|
|
|
|
length($mb) <=> length($ma) || $ma cmp $mb
|
|
} @list;
|
|
|
|
return @list;
|
|
}
|
|
|
|
sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s };
|
|
sub strip_dash { my $s = shift; $s =~ s/^-+//g; return $s };
|
|
|
|
__END__
|
|
|
|
=head1 NAME
|
|
|
|
completion.pl - Generates tab-completion files for various shells
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
completion.pl [options...]
|
|
|
|
--opts-dir path to cmdline-opts directory
|
|
--shell zsh/fish
|
|
--help prints this help
|
|
|
|
=cut
|