Build curl from curl.se done

Author: halx99

1k/build1.ps1

@@ -93,7 +93,6 @@ if(!(Test-Path $install_dir -PathType Container)) {
 }
 if ($cb_tool -eq 'cmake') {
     $CONFIG_ALL_OPTIONS += "-DCMAKE_INSTALL_PREFIX=$install_dir"
-    Write-Output ("CONFIG_ALL_OPTIONS=$CONFIG_ALL_OPTIONS, Count={0}" -f $CONFIG_ALL_OPTIONS.Count)
     $CMAKE_PATCH="${BUILDWARE_ROOT}\src\${LIB_NAME}\CMakeLists.txt"
     if(Test-Path $CMAKE_PATCH -PathType Leaf) {
         Copy-Item $CMAKE_PATCH .\CMakeLists.txt
@@ -102,11 +101,9 @@ if ($cb_tool -eq 'cmake') {
         $openssl_dir="${BUILDWARE_ROOT}\${INSTALL_ROOT}\openssl\"
         $CONFIG_ALL_OPTIONS += "-DOPENSSL_INCLUDE_DIR=${openssl_dir}\include"
         $CONFIG_ALL_OPTIONS += "-DOPENSSL_LIB_DIR=${openssl_dir}\lib"
-        cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
-    }
-    else {
-        cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
     }
+    
+    cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
     cmake --build build_$BUILD_ARCH --config Release
     cmake --install build_$BUILD_ARCH
 }
@@ -127,6 +124,11 @@ else { # regard a buildscript .bat provide by the library
 
 Set-Location ..\..\
 
+$install_script = "src\${LIB_NAME}\install1.ps1"
+if(Test-Path $install_script -PathType Leaf) {
+    Invoke-Expression -Command "$install_script $install_dir ${BUILDWARE_ROOT}\buildsrc\${LIB_SRC}"
+}
+
 $clean_script = "src\${LIB_NAME}\clean1.ps1"
 if(Test-Path $clean_script -PathType Leaf) {
     Invoke-Expression -Command "$clean_script $install_dir"

1k/build1.sh

@@ -156,17 +156,16 @@ mkdir -p $install_dir
 
 if [ "$cb_tool" = "cmake" ] ; then
     CONFIG_ALL_OPTIONS="$CONFIG_TARGET $CONFIG_OPTIONS -DCMAKE_INSTALL_PREFIX=$install_dir"
-    echo CONFIG_ALL_OPTIONS="$CONFIG_ALL_OPTIONS"
     CMAKE_PATCH="${BUILDWARE_ROOT}/src/${LIB_NAME}/CMakeLists.txt"
     if [ -f "${CMAKE_PATCH}" ] ; then
         cp -f ${CMAKE_PATCH} ./
     fi
     if [ "$LIB_NAME" = "curl" ]; then
         openssl_dir="${BUILDWARE_ROOT}/${INSTALL_ROOT}/openssl/"
-        cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS -DOPENSSL_INCLUDE_DIR=${openssl_dir}include -DOPENSSL_LIB_DIR=${openssl_dir}lib
-    else
-        cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
+        CONFIG_ALL_OPTIONS="$CONFIG_ALL_OPTIONS -DOPENSSL_INCLUDE_DIR=${openssl_dir}include -DOPENSSL_LIB_DIR=${openssl_dir}lib"
     fi
+    echo CONFIG_ALL_OPTIONS="$CONFIG_ALL_OPTIONS"
+    cmake -S . -B build_$BUILD_ARCH $CONFIG_ALL_OPTIONS
     cmake --build build_$BUILD_ARCH --config Release
     cmake --install build_$BUILD_ARCH
 else

src/luajit/clean1.ps1

@@ -1,25 +1,3 @@
 $install_dir = $args[0]
-$buildsrc_dir  = $args[1]
 
-if ((Test-Path $install_dir -PathType Container)) {
-    # copy prebuilt luajit manually
-    mkdir "$install_dir\include"
-    mkdir "$install_dir\lib"
-    mkdir "$install_dir\bin"
-    mkdir "$install_dir\bin\jit"
-
-    Copy-Item "$buildsrc_dir\src\lua51.lib" "$install_dir\lib\lua51.lib"
-    Copy-Item "$buildsrc_dir\src\lua51.dll" "$install_dir\bin\lua51.dll"
-    Copy-Item "$buildsrc_dir\src\luajit.exe" "$install_dir\bin\luajit.exe"
-    Copy-Item -Path "$buildsrc_dir\src\jit\*.lua" -Destination "$install_dir\bin\jit" -Recurse
-
-    Copy-Item "$buildsrc_dir\src\lauxlib.h" "$install_dir\include\lauxlib.h"
-    Copy-Item "$buildsrc_dir\src\lua.h" "$install_dir\include\lua.h"
-    Copy-Item "$buildsrc_dir\src\lua.hpp" "$install_dir\include\lua.hpp"
-    Copy-Item "$buildsrc_dir\src\luaconf.h" "$install_dir\include\luaconf.h"
-    Copy-Item "$buildsrc_dir\src\luajit.h" "$install_dir\include\luajit.h"
-    Copy-Item "$buildsrc_dir\src\lualib.h" "$install_dir\include\lualib.h"
-
-    echo "[windows] list ${install_dir}..."
-    ls -R "$install_dir"
-}
+Write-Output "Nothing to clean for $install_dir"

src/luajit/install1.ps1

@@ -0,0 +1,25 @@
+$install_dir = $args[0]
+$buildsrc_dir  = $args[1]
+
+if ((Test-Path $install_dir -PathType Container)) {
+    # copy prebuilt luajit manually
+    mkdir "$install_dir\include"
+    mkdir "$install_dir\lib"
+    mkdir "$install_dir\bin"
+    mkdir "$install_dir\bin\jit"
+
+    Copy-Item "$buildsrc_dir\src\lua51.lib" "$install_dir\lib\lua51.lib"
+    Copy-Item "$buildsrc_dir\src\lua51.dll" "$install_dir\bin\lua51.dll"
+    Copy-Item "$buildsrc_dir\src\luajit.exe" "$install_dir\bin\luajit.exe"
+    Copy-Item -Path "$buildsrc_dir\src\jit\*.lua" -Destination "$install_dir\bin\jit" -Recurse
+
+    Copy-Item "$buildsrc_dir\src\lauxlib.h" "$install_dir\include\lauxlib.h"
+    Copy-Item "$buildsrc_dir\src\lua.h" "$install_dir\include\lua.h"
+    Copy-Item "$buildsrc_dir\src\lua.hpp" "$install_dir\include\lua.hpp"
+    Copy-Item "$buildsrc_dir\src\luaconf.h" "$install_dir\include\luaconf.h"
+    Copy-Item "$buildsrc_dir\src\luajit.h" "$install_dir\include\luajit.h"
+    Copy-Item "$buildsrc_dir\src\lualib.h" "$install_dir\include\lualib.h"
+
+    echo "[windows] list ${install_dir}..."
+    ls -R "$install_dir"
+}