Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 53f500d

Browse files
author
Ian Macphail
committed
[[ Prebuilts ]] Implement prebuilt build revision on Windows
1 parent d02c989 commit 53f500d

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

‎prebuilt/scripts/build-curl.bat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@ ECHO Build Curl for %BUILDTRIPLE%
1111
SET CURL_TGZ=%_ROOT_DIR%\curl-%CURL_VERSION%.tar.gz
1212
SET CURL_SRC=%_ROOT_DIR%\curl-%CURL_VERSION%-%BUILDTRIPLE%-src
1313
SET CURL_BIN=%_ROOT_DIR%\curl-%CURL_VERSION%-%BUILDTRIPLE%-bin
14-
SET CURL_TAR=%_PACKAGE_DIR%\Curl-%CURL_VERSION%-%BUILDTRIPLE%.tar
1514
SET CURL_BUILD_LOG=%_ROOT_DIR%\curl-%CURL_VERSION%-%BUILDTRIPLE%.log
1615

16+
IF DEFINED CURL_BUILDREVISION (
17+
SET CURL_TAR=%_PACKAGE_DIR%\Curl-%CURL_VERSION%-%BUILDTRIPLE%-%CURL_BUILDREVISION%.tar
18+
) ELSE (
19+
SET CURL_TAR=%_PACKAGE_DIR%\Curl-%CURL_VERSION%-%BUILDTRIPLE%.tar
20+
)
21+
1722
REM The files (relative to BIN) to include in the tar archive (UNIX path format)
1823
SET CURL_FILES=include lib/libcurl_a.lib lib/libcurl_a.pdb
1924

‎prebuilt/scripts/build-icu.bat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@ SET ICU_TGZ=%_ROOT_DIR%\icu4c-%ICU_VERSION_ALT%-src.tgz
1212
SET ICU_SRC=%_ROOT_DIR%\icu-%ICU_VERSION%-%BUILDTRIPLE%-src
1313
SET ICU_TMP=%_ROOT_DIR%\icu-%ICU_VERSION%-%BUILDTRIPLE%-tmp
1414
SET ICU_BIN=%_ROOT_DIR%\icu-%ICU_VERSION%-%BUILDTRIPLE%-bin
15-
SET ICU_TAR=%_PACKAGE_DIR%\ICU-%ICU_VERSION%-%BUILDTRIPLE%.tar
1615
SET ICU_BUILD_LOG=%_ROOT_DIR%\icu-%ICU_VERSION%-%BUILDTRIPLE%.log
1716

17+
IF DEFINED ICU_BUILDREVISION (
18+
SET ICU_TAR=%_PACKAGE_DIR%\ICU-%ICU_VERSION%-%BUILDTRIPLE%-%ICU_BUILDREVISION%.tar
19+
) ELSE (
20+
SET ICU_TAR=%_PACKAGE_DIR%\ICU-%ICU_VERSION%-%BUILDTRIPLE%.tar
21+
)
22+
1823
FOR /F "usebackq tokens=*" %%x IN (`cygpath.exe -u %ICU_SRC%`) DO SET ICU_SRC_CYG=%%x
1924
FOR /F "usebackq tokens=*" %%x IN (`cygpath.exe -u %ICU_BIN%`) DO SET ICU_BIN_CYG=%%x
2025
FOR /F "usebackq tokens=*" %%x IN (`cygpath.exe -u %ICU_TAR%`) DO SET ICU_TAR_CYG=%%x

‎prebuilt/scripts/build-openssl.bat‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@ ECHO Build OpenSSL for %BUILDTRIPLE%
1111
SET OPENSSL_TGZ=%_ROOT_DIR%\openssl-%OpenSSL_VERSION%.tar.gz
1212
SET OPENSSL_SRC=%_ROOT_DIR%\openssl-%OpenSSL_VERSION%-%BUILDTRIPLE%-src
1313
SET OPENSSL_BIN=%_ROOT_DIR%\openssl-%OpenSSL_VERSION%-%BUILDTRIPLE%-bin
14-
SET OPENSSL_TAR=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%.tar
1514
SET OPENSSL_BUILD_LOG=%_ROOT_DIR%\openssl-%OpenSSL_VERSION%-%BUILDTRIPLE%.log
1615

16+
IF DEFINED OpenSSL_BUILDREVISION (
17+
SET OPENSSL_TAR=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%-%OpenSSL_BUILDREVISION%.tar
18+
) ELSE (
19+
SET OPENSSL_TAR=%_PACKAGE_DIR%\OpenSSL-%OpenSSL_VERSION%-%BUILDTRIPLE%.tar
20+
)
21+
1722
REM The files (relative to BIN) to include in the tar archive (UNIX path format)
1823
SET OPENSSL_FILES=lib/libeay32.lib lib/ssleay32.lib lib/ossl_static.pdb include/openssl
1924

‎prebuilt/scripts/lib_versions.bat‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
REM # This file sets the libraries versions defined in versions/
22

3-
FOR /f %%A IN ('type versions\openssl') DO SET OpenSSL_VERSION=%%A
4-
FOR /f %%A IN ('type versions\icu') DO SET ICU_VERSION=%%A
5-
FOR /f %%A IN ('type versions\icu_major') DO SET ICU_VERSION_MAJOR=%%A
6-
FOR /f %%A IN ('type versions\cef') DO SET CEF_VERSION=%%A
7-
FOR /f %%A IN ('type versions\curl') DO SET Curl_VERSION=%%A
3+
FOR %%L in (OpenSSL ICU CEF Curl) DO (
4+
SET PREBUILT_LIB=%%L
5+
SET /P !PREBUILT_LIB!_VERSION=<versions\!PREBUILT_LIB!
6+
IF EXIST "versions\!PREBUILT_LIB!_buildrevision" (
7+
SET /P !PREBUILT_LIB!_BUILDREVISION=<versions\!PREBUILT_LIB!_buildrevision
8+
)
9+
)

0 commit comments

Comments
 (0)