Skip to content

Commit 4486aa0

Browse files
committed
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
1 parent e4e122a commit 4486aa0

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

llvm/utils/release/build_llvm_package.bat

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ REM
1111
REM Visual Studio 2019, CMake, Ninja, GNUWin32, SWIG, Python 3,
1212
REM NSIS with the strlen_8192 patch,
1313
REM Visual Studio 2019 SDK and Nuget (for the clang-format plugin),
14-
REM Perl (for the OpenMP run-time).
14+
REM Perl (for the OpenMP run-time), 7Zip.
1515
REM
1616
REM
1717
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
9191
ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
9292
ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
9393
ninja package || exit /b
94+
95+
7z x LLVM-%package_version%-win32.exe -orepack
96+
rmdir /s /q repack\$PLUGINSDIR
97+
del repack\Uninstall.exe
98+
7z a LLVM-%package_version%-win32.zip .\repack\* -mx9
9499
cd ..
95100

101+
96102
REM The plug-in is built separately as it uses a statically linked clang-format.exe.
97103
mkdir build_vsix
98104
cd build_vsix
@@ -135,4 +141,9 @@ ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit
135141
ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
136142
ninja check-clangd || ninja check-clangd || ninja check-clangd || exit /b
137143
ninja package || exit /b
144+
145+
7z x LLVM-%package_version%-win64.exe -orepack
146+
rmdir /s /q repack\$PLUGINSDIR
147+
del repack\Uninstall.exe
148+
7z a LLVM-%package_version%-win64.zip .\repack\* -mx9
138149
cd ..

0 commit comments

Comments
 (0)