update

jingjingxyk · May 24, 2024 · 18bcfa7 · 18bcfa7
1 parent c265651
commit 18bcfa7
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 1 deletion.
diff --git a/.github/workflows/windows-native-vs2019.yml b/.github/workflows/windows-native-vs2019.yml
@@ -32,6 +32,10 @@ jobs:
           uname -a
           pwd
           ipconfig /all
+          :: 显示逻辑cpu 个数
+          wmic cpu get NumberOfLogicalProcessors /value
+          echo %NUMBER_OF_PROCESSORS%
+          systeminfo
           echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $Env:GITHUB_ENV
 
       - uses: msys2/setup-msys2@v2

diff --git a/sapi/quickstart/windows/native-build/library/brotli.bat b/sapi/quickstart/windows/native-build/library/brotli.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\brotli
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/curl.bat b/sapi/quickstart/windows/native-build/library/curl.bat
@@ -9,6 +9,7 @@ cd %__PROJECT__%
 mkdir  build
 
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
 
 cd thirdparty\curl
 dir

diff --git a/sapi/quickstart/windows/native-build/library/freetype.bat b/sapi/quickstart/windows/native-build/library/freetype.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\freetype
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/libexpat.bat b/sapi/quickstart/windows/native-build/library/libexpat.bat
@@ -8,6 +8,9 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libexpat\expat\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/liblz4.bat b/sapi/quickstart/windows/native-build/library/liblz4.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\liblz4\build\cmake\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/liblzma.bat b/sapi/quickstart/windows/native-build/library/liblzma.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\liblzma\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/libpng.bat b/sapi/quickstart/windows/native-build/library/libpng.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libpng
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/libssh2.bat b/sapi/quickstart/windows/native-build/library/libssh2.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libssh2
 dir
 mkdir  build

diff --git a/sapi/quickstart/windows/native-build/library/libwebp.bat b/sapi/quickstart/windows/native-build/library/libwebp.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libwebp
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/libyaml.bat b/sapi/quickstart/windows/native-build/library/libyaml.bat
@@ -8,6 +8,7 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
 
 cd thirdparty\libyaml
 dir

diff --git a/sapi/quickstart/windows/native-build/library/libzip.bat b/sapi/quickstart/windows/native-build/library/libzip.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libzip\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/libzstd.bat b/sapi/quickstart/windows/native-build/library/libzstd.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\libzstd\build\cmake\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/nghttp2.bat b/sapi/quickstart/windows/native-build/library/nghttp2.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\nghttp2\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/nghttp3.bat b/sapi/quickstart/windows/native-build/library/nghttp3.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\nghttp3\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/ngtcp2.bat b/sapi/quickstart/windows/native-build/library/ngtcp2.bat
@@ -8,6 +8,8 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
+
 cd thirdparty\ngtcp2\
 dir
 mkdir  build-dir

diff --git a/sapi/quickstart/windows/native-build/library/openssl.bat b/sapi/quickstart/windows/native-build/library/openssl.bat
@@ -11,14 +11,16 @@ mkdir  build
 
 set "PATH=%__PROJECT__%\nasm\;%PATH%"
 
+
+
 cd %__PROJECT__%\thirdparty\openssl
 dir
 echo %cd%
 perl -v
 
 perl Configure VC-WIN64A threads no-shared  no-tests --release --prefix="%__PROJECT__%\build\openssl"  --openssldir="%__PROJECT__%\build\openssl\ssl"
 
-nmake
+set CL=/MP
 
 rem document
 rem openssl\Configurations\windows-makefile.tmpl

diff --git a/sapi/quickstart/windows/native-build/library/zlib.bat b/sapi/quickstart/windows/native-build/library/zlib.bat
@@ -8,6 +8,7 @@ set __PROJECT__=%cd%
 cd %__PROJECT__%
 mkdir  build
 
+set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
 
 cd %__PROJECT__%\thirdparty\zlib
 dir
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ cd %__PROJECT__% @@
     mkdir  build
+    set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_PROCESSORS%
     cd thirdparty\curl
     dir
@@ Expand Down @@