diff options
| author | Hans Wennborg <hans@chromium.org> | 2020-02-25 12:13:09 +0100 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2020-02-25 12:14:44 +0100 |
| commit | bbfdf4b81d60e352224c0c928eb3fa9fbfb7858c (patch) | |
| tree | e86e19c86cbfff73fb7719deeec39f9ff6235da7 | |
| parent | 3a11c86849c27e1e21d5e8cdf55cfa724164db57 (diff) | |
| download | bcm5719-llvm-bbfdf4b81d60e352224c0c928eb3fa9fbfb7858c.tar.gz bcm5719-llvm-bbfdf4b81d60e352224c0c928eb3fa9fbfb7858c.zip | |
build_llvm_package.bat: Produce zip files in addition to the installers
Now that the Windows installer no longer does anything besides
self-extract, maybe it would make sense to distribute the toolchain as a
plain zip file in addition to the current installer.
Differential revision: https://reviews.llvm.org/D74896
(cherry picked from commit 4486aa03c5f431ba33a1d1ac9991da912e3decd9)
| -rwxr-xr-x | llvm/utils/release/build_llvm_package.bat | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/llvm/utils/release/build_llvm_package.bat b/llvm/utils/release/build_llvm_package.bat index 7556bfa854e..a54fd1f0e62 100755 --- a/llvm/utils/release/build_llvm_package.bat +++ b/llvm/utils/release/build_llvm_package.bat @@ -11,7 +11,7 @@ REM REM Visual Studio 2019, CMake, Ninja, GNUWin32, SWIG, Python 3,
REM NSIS with the strlen_8192 patch,
REM Visual Studio 2019 SDK and Nuget (for the clang-format plugin),
-REM Perl (for the OpenMP run-time).
+REM Perl (for the OpenMP run-time), 7Zip.
REM
REM
REM For LLDB, SWIG version <= 3.0.8 needs to be used to work around
@@ -91,8 +91,14 @@ ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
ninja package || exit /b
+
+7z x LLVM-%package_version%-win32.exe -orepack
+rmdir /s /q repack\$PLUGINSDIR
+del repack\Uninstall.exe
+7z a LLVM-%package_version%-win32.zip .\repack\* -mx9
cd ..
+
REM The plug-in is built separately as it uses a statically linked clang-format.exe.
mkdir build_vsix
cd build_vsix
@@ -135,4 +141,9 @@ ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
ninja package || exit /b
+
+7z x LLVM-%package_version%-win64.exe -orepack
+rmdir /s /q repack\$PLUGINSDIR
+del repack\Uninstall.exe
+7z a LLVM-%package_version%-win64.zip .\repack\* -mx9
cd ..
|
