From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 21 Dec 2023 03:47:03 +0000 (-0600)
Subject: build-from-source: don't build beta openssl, add capnproto which doesn't
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=dbfdeba8f4ae1eba2d9de10397064bde2aec349b

build-from-source: don't build beta openssl, add capnproto which doesn't
build shared yet
---

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