From dbfdeba8f4ae1eba2d9de10397064bde2aec349b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 20 Dec 2023 21:47:03 -0600 Subject: [PATCH] build-from-source: don't build beta openssl, add capnproto which doesn't build shared yet --- .../build-from-source.factor | 14 ++++++++++++-- .../build-from-source/windows/windows.factor | 19 +++++++++++++++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/extra/build-from-source/build-from-source.factor b/extra/build-from-source/build-from-source.factor index f4edeba881..9986cafba7 100644 --- a/extra/build-from-source/build-from-source.factor +++ b/extra/build-from-source/build-from-source.factor @@ -293,8 +293,12 @@ ERROR: no-output-file path ; "grpc" "grpc" "v" list-repository-tags-matching tag-refs human-sort ; +: capnproto-versions ( -- seq ) + "capnproto" "capnproto" "v" list-repository-tags-matching + tag-refs human-sort ; + : pcre2-versions ( -- seq ) - "PCRE2Project" "pcre2" "" list-repository-tags-matching + "PCRE2Project" "pcre2" "pcre2-" list-repository-tags-matching tag-refs human-sort ; : lz4-versions ( -- seq ) @@ -307,7 +311,13 @@ ERROR: no-output-file path ; [ [ digit-or-dot? ] all? ] filter human-sort ; -: openssl-versions ( -- seq ) +: openssl-release-versions ( -- seq ) + "openssl" "openssl" "openssl-" list-repository-tags-matching + tag-refs + [ [ CHAR: - = ] count 1 = ] filter + human-sort ; + +: openssl-dev-versions ( -- seq ) "openssl" "openssl" "openssl-" list-repository-tags-matching tag-refs human-sort ; diff --git a/extra/build-from-source/windows/windows.factor b/extra/build-from-source/windows/windows.factor index 7cd6a5dd85..2ab606de33 100644 --- a/extra/build-from-source/windows/windows.factor +++ b/extra/build-from-source/windows/windows.factor @@ -61,8 +61,23 @@ IN: build-from-source.windows ] with-build-directory ] with-github-worktree-tag ; +: build-capnproto-dll ( -- ) + "capnproto" "capnproto" capnproto-versions last [ + [ + 32-bit? [ + qw{ cmake -A Win32 -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .. } try-process + { "msbuild" "Cap'n Proto Root.sln" "/m" "/property:Configuration=Release" "/p:Platform=Win32" } try-process + ] [ + qw{ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON .. } try-process + { "msbuild" "Cap'n Proto Root.sln" "/m" "/property:Configuration=Release" } try-process + ] if + ! "raylib/Release/raylib.dll" copy-output-file + ] with-build-directory + ] with-github-worktree-tag ; + + : build-openssl-32-dlls ( -- ) - "openssl" "openssl" openssl-versions last [ + "openssl" "openssl" openssl-release-versions last [ check-perl "ProgramW6432" os-env program-files or "NASM/nasm.exe" append-path "nasm.exe" prepend-current-path copy-file @@ -74,7 +89,7 @@ IN: build-from-source.windows ] with-github-worktree-tag ; : build-openssl-64-dlls ( -- ) - "openssl" "openssl" openssl-versions last [ + "openssl" "openssl" openssl-release-versions last [ check-perl program-files "NASM/nasm.exe" append-path "nasm.exe" prepend-current-path copy-file check-nasm -- 2.34.1