From fa59ca6064ce9400adb1765deeb960bfe51c2f6f Mon Sep 17 00:00:00 2001 From: yum Date: Sat, 25 Feb 2023 12:09:53 -0800 Subject: Begin work on custom webserver oatpp was a crashy mess. Begin making a simple web server from scratch. * Add Designs/ folder to document nontrivial things like the webserver design --- GUI/Libraries/fetch.ps1 | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) (limited to 'GUI/Libraries') diff --git a/GUI/Libraries/fetch.ps1 b/GUI/Libraries/fetch.ps1 index 1495cc9..22b088b 100644 --- a/GUI/Libraries/fetch.ps1 +++ b/GUI/Libraries/fetch.ps1 @@ -16,15 +16,6 @@ $WHISPER_1_7_0_URL = "https://github.com/Const-me/Whisper/releases/download/1.7. $WHISPER_URL = $WHISPER_1_7_0_URL $WHISPER_FILE = $(Split-Path -Path $WHISPER_URL -Leaf) -$OATPP_1_3_0_URL = "https://github.com/oatpp/oatpp/archive/refs/tags/1.3.0.zip" -$OATPP_URL = $OATPP_1_3_0_URL -$OATPP_FILE = $(Split-Path -Path $OATPP_URL -Leaf) -$OATPP_VER = $OATPP_FILE -replace '\.[a-z\.]*$' -$OATPP_DIR = "oatpp-$OATPP_VER" - -$NPROC = $(Get-CimInstance Win32_Processor).NumberOfCores -echo "nproc: $NPROC" - pushd $PSScriptRoot # WX @@ -53,6 +44,7 @@ if (-Not (Test-Path rapidyaml)) { python3 tools/amalgamate.py ryml.h cp ryml.h ../../GUI/GUI/ryml.h + popd } if ((Test-Path whisper) -And ($overwrite)) { @@ -74,35 +66,5 @@ if (-Not (Test-Path whisper)) { popd > $null } -if ((Test-Path oatpp) -And ($overwrite)) { - rm -Recurse oatpp -} - -if (-Not (Test-Path oatpp)) { - mkdir oatpp - pushd oatpp > $null - Invoke-WebRequest $OATPP_URL -OutFile $OATPP_FILE - Expand-Archive $OATPP_FILE -DestinationPath . - if (Test-Path ../../GUI/GUI/oatpp/) { - rm -Recurse ../../GUI/GUI/oatpp/ - } - mkdir ../../GUI/GUI/oatpp/ - pushd $OATPP_DIR > $null - mkdir build - pushd build > $null - cmake.exe .. ` - -DCMAKE_BUILD_TYPE=$release ` - -DBUILD_SHARED_LIBS=OFF ` - -DOATPP_MSVC_LINK_STATIC_RUNTIME=ON ` - -DOATPP_BUILD_TESTS=OFF - cmake.exe --build . -j $NPROC --config $release - cp src/$release/oatpp.lib ../../../../GUI/GUI/oatpp/ - cp -Recurse ../src/oatpp/* ../../../../GUI/GUI/oatpp/ - popd > $null - popd > $null -} - -popd > $null # rapidyaml - popd > $null # $PSScriptRoot -- cgit v1.2.3