build_llvm_package.bat: Produce zip files in addition to the installers

[hans]

Summary

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 instead, or in addition to the current installer?

[thakis]

llvm/utils/release/build_llvm_package.bat

98

I'm not familiar with this script, but rather than "create installer, then unpack it, remove some stuff, repack" would it make more sense to have "create archive with just the stuff we want to be in the archive, then unpack that and add files we need for installer" as the overall flow?

Then you could also use the "7za" executable, which I believe has fewer deps (at least it was easier to use in chromium/win cross builds).

[hans]

llvm/utils/release/build_llvm_package.bat

98

I think there's no easy way to do the "add files we need for installer" step though. The installer is generated with a lot of cmake, so it's easier to do it in this order.

[hans]

Any other comments?

[rnk]

lgtm

Getting CMake to make the zip archive would be nice, but it's not a requirement.

[hans]

Getting CMake to make the zip archive would be nice, but it's not a requirement.

I think it could, but not in the same build where it's configured to create the nsis installer. Repacking like this saves a lot of time.

llvm/utils/release/build_llvm_package.bat

 @echo off
 setlocal
 
 REM Script for building the LLVM installer on Windows,
 REM used for the the weekly snapshots at http://www.llvm.org/builds.
 REM
 REM Usage: build_llvm_package.bat <revision>
 
 REM Prerequisites:
 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
 REM   https://github.com/swig/swig/issues/769
 
 
 REM You need to modify the paths below:
 set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsDevCmd.bat

 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
 ninja check-clang || ninja check-clang || ninja check-clang || exit /b
 ninja check-lld || ninja check-lld || ninja check-lld || exit /b
 ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 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
 REM Having VSSDKINSTALL set makes devenv *not* find the SDK for some reason.
 set VSSDKINSTALL=
 set CC=..\build32_stage0\bin\clang-cl
 set CXX=..\build32_stage0\bin\clang-cl
 cmake -GNinja %cmake_flags% -DLLVM_USE_CRT_RELEASE=MT -DBUILD_CLANG_FORMAT_VS_PLUGIN=ON -DPYTHON_HOME=%python32_dir% -DPYTHON_EXECUTABLE=%python32_dir%\python.exe ..\llvm-project\llvm || exit /b

 ninja all || ninja all || ninja all || exit /b
 ninja check || ninja check || ninja check || exit /b
 ninja check-clang || ninja check-clang || ninja check-clang || exit /b
 ninja check-lld || ninja check-lld || ninja check-lld || exit /b
 ninja check-sanitizer || ninja check-sanitizer || ninja check-sanitizer || exit /b
 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 ..