Update Windows packaging script.

[CarlosAlbertoEnciso]

Summary

Update the Windows packaging script.

As discussed here:
https://discourse.llvm.org/t/build-llvm-release-bat-script-options/63146/6

These are the changes in this patch:

• Add command line options to select specific tasks:
  • Specify output directory.
  • Build 32 and/or 64 binaries.
  • Run the tests
  • Package the binaries.
• In stage-1 use lld-link.
• Split the build/test/package into separate functions.
• Added some trace statements.
• Include llvm-lib and llvm-windres in stage1.

The added command line options are:

--version [<number>]  Version number (i.e. 14.0.4)
--base-dir <name>     Build base directory
--log-file <name>     Log filename

--build-32            Build 32-bit binaries
--build-64            Build 64-bit binaries
--test-32             Run 32-bits tests
--test-64             Run 64-bits tests

--pack-32             Create 32-bits binary package
--pack-64             Create 64-bits binary package
--repack-32           Repack 32-bits binary package
--repack-64           Repack 64-bits binary package

--trace               Debugging trace

[thieta]

A bunch of questions and comments. I think there are some really nice cleanups here, but also some features / behaviors that change that we need to understand.

llvm/utils/release/build_llvm_release.bat

38

This can't realistically be anything but ninja right? is there a point of this indirection?

55

I think you can default to a output directory instead of failing.

60

Hmm. Instead of hardcoding main here - I think maybe we should take this opportunity to support building any random branch/sha/tag here. Then it will be more flexible instead of build main or released version.

61

Revision and version seems to be used interchangeable here - I would call it version when it's dealing with versions and revision if you extract the Git sha.

241

maybe we should use other LLVM tools here as well? CMAKE_AR=llvm-lib CMAKE_RC=llvm-windres etc.

252

The retry logic from the old script was lost here - should we at least attempt to test if it fails? I am guessing this was in the original script because there are some transitional errors that can happen?

261

why is the exe zipped after created?

in another suggestion (doesn't need to be addressed here) I think we probably should upload a zip file in addition to the .exe so that people that repack the binaries doesn't have to install it to unpack it.

278

Why not check-all here?

I also think that output from the testing should be saved to a logfile - similar to our release-test script. That makes it possible to check which tests that failed when running from a CI or similar without having to search the output.

[hans]

llvm/utils/release/build_llvm_release.bat

6

Wait, what? This seems undesirable.

22

Unrelated to this patch, but since we no longer build the clang-format plugin, this SDK is no longer needed.

48

"output" isn't a great variable name. How about something like "build_dir_base"?

61

+1, "version" should be what gets fed to the PACKAGE_VERSION cmake variable, and "revision" should be the git revision.

63

I haven't seen batch syntax like this before. I guess it's new?

112

What's this for?

113

Any reason for reordering the projects here?

115

This is a good idea. We may want to drop the 32-bit packages from releases eventually.

125

Maybe we should move this closer to the top, and do PATH=%original_path% at the start of build_32 and build_64 instead? That seems less brittle.

145

As Tobias mentioned already, please keep the re-tries for all build steps and test invocations. Build environments are sometimes unreliable due to antivirus software etc. and retrying individual steps is much faster than retrying the whole script.

184

Since it takes quite a while to run, can this repackaging step be put behind a flag?

261

The old script did produce .zip files for a while, but I never uploaded them and eventually removed it because the files were very large, it made the script slower, and people who want to repack the binaries can already extract from the installer with 7zip without running it.

278

I'm pretty sure check-lldb wouldn't pass. I'm not even sure all these tests pass, note that some of them were commented out for 32-bit builds previously.

[CarlosAlbertoEnciso]

llvm/utils/release/build_llvm_release.bat

6

Running the script from a standard DOS prompt, I get the following errors:

...
7-Zip 21.06 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-11-24

Scanning the drive for archives:
1 file, 223803667 bytes (214 MiB)

Extracting archive: src.zip
--
Path = src.zip
Type = zip
...
ERROR: Cannot create symbolic link : A required privilege is not held by the client. : .\llvm-project-main\libclc\clspv64
ERROR: Cannot create symbolic link : A required privilege is not held by the client. : .\llvm-project-main\libcxx\test\std\pstl
ERROR: Cannot create symbolic link : A required privilege is not held by the client. : .\llvm-project-main\openmp\tools\analyzer\llvm-openmp-analyzer++

Sub items Errors: 17

Archives with Errors: 1

Sub items Errors: 17

May be the configuration we use is incorrect.

22

Removed that comment.

38

You are right.
In our case we have an internal tool based on ninja, that uses a different name.
May be use something like:

REM Specify building tool and CMake generator
set build_tool=ninja
set cmake_generator=Ninja

The cmake_generator to be used with cmake -G option. That gives the option to use different systems for building.

48

In the way the command line parsing works, I will keep output as the option and build_dir_base in the script. Somthing like:

set "output="
...
call :parse_args %*

set build_dir_base=%output%

55

May be use the user temporal directory as default value.

60

That is a good idea. It gives more flexibility.

Can we put this feature on hold for the next patch, once the basic patch (this one) is done.

61

I will update it.

63

For what I know it was introduced back in Windows NT.
But if you prefer, i can use the explicit checks:

if not "%version%"==""

112

The LLVM_LIT_ARGS are the arguments for the Integreted tester.

https://releases.llvm.org/11.0.0/docs/CommandGuide/lit.html

and we use '-s' to reduce the amount of information generated during testing.

113

No reason.
Put back the original order.

-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;compiler-rt;lldb;openmp"

115

In our case we build only 64-bits.

145

Putting it back the re-tries for all build steps and test invocations.

184

Any specific name for the flag?

241

Added those tools.

252

Restored the retry logic.

278

I have created specific functions for the tests:

:: Run 32-bits tests.
:test_32
  %build_tool% check || %build_tool% check || %build_tool% check || exit /b 1
  ...
exit /b 0

:: Run 64-bits tests.
:test_64
  %build_tool% check || %build_tool% check || %build_tool% check || exit /b 1
  ...
exit /b 0

278

In relation to the log creation:

• Do you want a command line option?
• Any specific name?

[thieta]

llvm/utils/release/build_llvm_release.bat

6

symlinks requires admin rights on windows unfortunately. But I have never seen this - so it has to be some place where it conditions the symlinking?

55

yeah that works.

60

sounds good to me.

184

CompressInstaller maybe?

278

LogPath or TestLogPath?

[CarlosAlbertoEnciso]

llvm/utils/release/build_llvm_release.bat

6

Removed the administrator check. I am assumming it is my local configuration.

125

Done.

184

I am proposing to use long option names to accomodate the CompressInstaller, build_dir_base and LogPath or TestLogPath cases:

--build-32    --build-64     # build step
--test-32     --test-64      # test step
--pack-32     --pack-64      # package step
--repack-32   --repack-64    # repackagin step

--trace                      # debugging trace
--base-dir                   # build directory base
--log-file                   # log filename (in the same build directory)

[CarlosAlbertoEnciso]

llvm/utils/release/build_llvm_release.bat

184

Usage test:

Script for building the LLVM installer on Windows, used for
the releases at https://github.com/llvm/llvm-project/releases

Usage: build_llvm_release.bat <options>

options:
--version [<number>]  Version number (i.e. 14.0.4)
--base-dir <name>     Build base directory
--log-file <name>     Log filename

--build-32            Build 32-bit binaries
--build-64            Build 64-bit binaries
--test-32             Run 32-bits tests
--test-64             Run 64-bits tests

--pack-32             Create 32-bits binary package
--pack-64             Create 64-bits binary package
--repack-32           Repack 32-bits binary package
--repack-64           Repack 64-bits binary package

--trace               Debugging trace

[CarlosAlbertoEnciso]

Update patch to address the feedback received.

[hans]

Taking a step back, at this point the patch is almost a rewrite of the current script. It's doing a lot of different things, and I'm not sure I agree with all of them. Perhaps we need to discuss a bit more what are the goals of these changes, and whether they can be done as a series of incremental patches rather than a rewrite.

llvm/utils/release/build_llvm_release.bat

6

Some searching suggests this may be to due to 7zip's behaviour having changed in recent versions. I'm using 18.05 which is probably old by now, but doesn't seem to have this problem.

55

Using the current working directory seems like the more natural choice.

69

"location" isn't very descriptive, how about "source_location" or "source_url"?

76

This doesn't seem right. The version number should match the checked in version number. If that's not possible, perhaps it should be passed as a flag.

112

I don't think the current amount of information is too noisy.

[CarlosAlbertoEnciso]

In D127938#3595669, @hans wrote:

Taking a step back, at this point the patch is almost a rewrite of the current script. It's doing a lot of different things, and I'm not sure I agree with all of them. Perhaps we need to discuss a bit more what are the goals of these changes, and whether they can be done as a series of incremental patches rather than a rewrite.

I am having the same feeling. I think most of the "new things" are useful but may be incremental pacthes. I would suggest to define what we can add on each patch.

llvm/utils/release/build_llvm_release.bat

6

I am using 7-Zip 21.06 (x64).

[CarlosAlbertoEnciso]

llvm/utils/release/build_llvm_release.bat

55

Changed to use current directory as default.

69

Changed to "source_location".

112

Removed -DLLVM_LIT_ARGS="-s"

[CarlosAlbertoEnciso]

What I would suggest is to have the following incremental patches:

1) Use the existing script but restoring the deleted packaging step.
   Including a solution for the admin permissions.
2) Refactor the build and test steps into functions.
   Using current directory as output location. No additional command lines.
3) Add cmdline options to select the build, test and package steps.
4) Add cmdline options to select output directory, log filename.
5) Add cmdline options to extend the input branch to include any random branch/sha/tag.

[hans]

1. Use the existing script but restoring the deleted packaging step.

Do you mean the repackaging? If so, I'd prefer that to be behind a flag, which means we'd need flag processing first.

Including a solution for the admin permissions.

I've added a comment about that above.

2. Refactor the build and test steps into functions. Using current directory as output location. No additional command lines.
3. Add cmdline options to select the build, test and package steps.
4. Add cmdline options to select output directory, log filename.
5. Add cmdline options to extend the input branch to include any random branch/sha/tag.

llvm/utils/release/build_llvm_release.bat

6

The behaviour that changed is that older 7zip seems to simply not handle symlinks in zip archives (at least on Windows). If there's a symlink foo -> bar in the archive, it will just create a file "foo" with the contents "bar". And it seems the symlinks were not important enough to break the tests.

I haven't bisected the exact 7zip version where this changed.

These are the symlinks currently in the repository:

$ wget https://github.com/llvm/llvm-project/archive/refs/heads/main.zip
$ zipinfo main.zip | grep '^l'
lrwxrwxrwx  2.3 unx       24 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/CUDA-symlinks/usr/bin/ptxas
lrwxrwxrwx  2.3 unx       30 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/bin/i386-unknown-linux-gnu-ld
lrwxrwxrwx  2.3 unx       32 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/bin/x86_64-unknown-linux-gnu-ld
lrwxrwxrwx  2.3 unx        7 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/i386-unknown-linux-gnu/bin/ld
lrwxrwxrwx  2.3 unx        7 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/basic_cross_linux_tree/usr/x86_64-unknown-linux-gnu/bin/ld
lrwxrwxrwx  2.3 unx       25 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_32bit_linux_tree/usr/bin/as
lrwxrwxrwx  2.3 unx       25 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_32bit_linux_tree/usr/bin/ld
lrwxrwxrwx  2.3 unx       35 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_32bit_linux_tree/usr/i386-unknown-linux/bin/as
lrwxrwxrwx  2.3 unx       35 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_32bit_linux_tree/usr/i386-unknown-linux/bin/ld
lrwxrwxrwx  2.3 unx       27 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_64bit_linux_tree/usr/bin/as
lrwxrwxrwx  2.3 unx       27 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_64bit_linux_tree/usr/bin/ld
lrwxrwxrwx  2.3 unx       37 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/bin/as
lrwxrwxrwx  2.3 unx       37 tx stor 22-Jun-21 14:24 llvm-project-main/clang/test/Driver/Inputs/multilib_64bit_linux_tree/usr/x86_64-unknown-linux/bin/ld
lrwxrwxrwx  2.3 unx       13 tx stor 22-Jun-21 14:24 llvm-project-main/libclc/amdgcn-mesa3d
lrwxrwxrwx  2.3 unx        5 tx stor 22-Jun-21 14:24 llvm-project-main/libclc/clspv64
lrwxrwxrwx  2.3 unx       22 tx stor 22-Jun-21 14:24 llvm-project-main/libcxx/test/std/pstl
lrwxrwxrwx  2.3 unx       20 tx stor 22-Jun-21 14:24 llvm-project-main/openmp/tools/analyzer/llvm-openmp-analyzer++

Perhaps we should ask users of this script to use the old 7zip version, or point out that users of newer versions will need to run as administrator? Perhaps only the 7zip part could be run as admin?

[CarlosAlbertoEnciso]

llvm/utils/release/build_llvm_release.bat

6

In relation to the 7zip versions with the symbolic links issue:
19.00 works
20.02 works
21.07 Fails
22.00 Fails

Perhaps this should be the first patch and decide on:

1. Check the 7zip version and ask the user to use an older version or run the script as administrator

or

2. Run the 7zip part as administrator.

[hans]

llvm/utils/release/build_llvm_release.bat

6

Thanks for investigating. We already require pretty specific versions of tools in this script, so maybe we could suggest a specific version of 7zip (and tell people to run the script as admin otherwise).

[CarlosAlbertoEnciso]

I have created https://reviews.llvm.org/D129263
That patch address only the symbolic link creation issue. (Administrator permissions and/or 7-zip version).

[dyung]

Just a general comment, but when writing batch scripts, I tend to avoid using parenthesis with if blocks like you are proposing here. I've found that in the past they can lead to some obscure issues that I think were impossible to work around if something either in the same line or contained within it expanded to include parenthesis (such as "Program Files (x86)".

So instead of something like this:

if not defined base-dir (
  set "base-dir=%TMP%"
)

I would write it using a goto like this:

if defined base-dir goto :BaseDirDefined
  set "base-dir=%TMP%"
:BaseDirDefined

This way you avoid using potentially problematic parenthesis.

[dyung]

llvm/utils/release/build_llvm_release.bat

2

I know you didn't change this, but when I write batch files, I generally reverse these two options, because I believe in this order, the @echo off would persist after the script exits which I don't like scripts changing my environment unecessarily.

56

I've not really seen this method of using set before (with the double quotes at the beginning and the end) and I'm not sure that it would handle paths with spaces correctly. For example, I wrote the following test script:

set TEST1="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe"
set "TEST2=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe"

echo TEST1=%TEST1%
echo TEST2=%TEST2%

Both set a variable to the path to cl.exe and then I print out the value. The output looks like this:

TEST1="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe"
TEST2=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe

The difference is significant because later on in the script you use %base-dir% without enclosing it in double quotes, so if there are spaces or parenthesis in the path, it could potentially cause problems with the script.

62

Is this missing the return value you intend to exit with?

66

I recommend always enclosing variables that could contain a path in double quotes to deal with possible spaces or parenthesis in the path.

72

For string comparisons in batch files, unless you need to check for cases of the arguments, I generally recommend adding /I to make it case insensitive.

162

Will this handle the case where %build_dir% contains a space or parenthesis?

166

For consistency, is there a reason why CMAKE_AR and CMAKE_RC do not specify the tool with .exe at the end?

340

Instead of hardcoding the script name here, I think we should just use %0 or %~0 (in case it may have double quotes around it).

[thieta]

Clear my queue.

llvm/utils/release/build_llvm_release.bat

 @echo off
 setlocal
 
-if "%1"=="" goto usage
-goto begin
-
-:usage
-echo Script for building the LLVM installer on Windows,
-echo used for the releases at https://github.com/llvm/llvm-project/releases
-echo.
-echo Usage: build_llvm_release.bat ^<version^>
-echo.
-echo Example: build_llvm_release.bat 14.0.4
-echo.
+REM Script for building the LLVM installer on Windows.
+REM
+REM Run the script with administrator permissions.
+if not exist %SYSTEMROOT%\SYSTEM32\WDI\LOGFILES (
+  echo The script requires administrator permissions.
   exit /b
+)
 
-:begin
+REM Check number of arguments.
+if "%1" == "" (
+  call :print_usage
+  exit /b
+)
 
 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
+REM   Visual Studio 2019 SDK
+REM   Perl (for the OpenMP run-time), 7-Zip.
 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 Having VSSDKINSTALL set makes devenv *not* find the SDK for some reason.
+set VSSDKINSTALL=
 
 REM You need to modify the paths below:
 set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsDevCmd.bat
 
 set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python310-32
 set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python310
 
-set revision=llvmorg-%1
-set package_version=%1
-set build_dir=llvm_package_%package_version%
+REM Specify building tool.
+set build_tool=ninja
+
+REM Holders for command line options.
+set "version="
+set "b32="
+set "b64="
+set "t32="
+set "t64="
+set "p32="
+set "p64="
+set "output="
+set "trace="
+
+REM Parse arguments.
+call :parse_args %*
+
+REM Validate command line options.
+if not defined output (
+  echo Missing output directory.
+  exit /b
+)
+
+set location=https://github.com/llvm/llvm-project/archive/refs/heads/main.zip
+set "revision=99.9.9"
+
+if defined version (
+  if not "%version%"=="true" (
+    set location=https://github.com/llvm/llvm-project/archive/llvmorg-%version%.zip
+    set "revision=%version%"
+  )
+)
+
+set "package_version=%revision%"
+set "build_dir=%output%\llvm_package_%revision%"
 
-echo Revision: %revision%
+echo Revision:        %revision%
+echo Location:        %location%
 echo Package version: %package_version%
-echo Build dir: %build_dir%
+echo.
+echo Build dir:       %build_dir%
+echo Python 32:       %python32_dir%
+echo Python 64:       %python64_dir%
+echo Build Tool:      %build_tool%
+echo.
+echo Build 32-bits:   %b32%
+echo Build 64-bits:   %b64%
+echo Test 32-bits:    %t32%
+echo Test 64-bits:    %t64%
+echo Package 32-bits: %p32%
+echo Package 64-bits: %p64%
 echo.
 pause
 
+if exist %build_dir% rd /s /q %build_dir%
 mkdir %build_dir%
 cd %build_dir%
 
-echo Checking out %revision%
-curl -L https://github.com/llvm/llvm-project/archive/%revision%.zip -o src.zip || exit /b
-7z x src.zip || exit /b
+call :print_trace_message Checking out %location%
+
+curl -L %location% -o src.zip || exit /b
+7z x -y src.zip || exit /b
 mv llvm-project-* llvm-project || exit /b
 
 REM Setting CMAKE_CL_SHOWINCLUDES_PREFIX to work around PR27226.
-set cmake_flags=^
+set common_cmake_flags=^
   -DCMAKE_BUILD_TYPE=Release ^
   -DLLVM_ENABLE_ASSERTIONS=OFF ^
   -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON ^
   -DLLVM_BUILD_LLVM_C_DYLIB=ON ^
   -DCMAKE_INSTALL_UCRT_LIBRARIES=ON ^
   -DPython3_FIND_REGISTRY=NEVER ^
   -DPACKAGE_VERSION=%package_version% ^
   -DLLDB_RELOCATABLE_PYTHON=1 ^
-  -DLLDB_EMBED_PYTHON_HOME=OFF ^
-  -DLLDB_TEST_COMPILER=%cd%\build32_stage0\bin\clang.exe ^
   -DCMAKE_CL_SHOWINCLUDES_PREFIX="Note: including file: " ^
-  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;compiler-rt;lldb;openmp"
+  -DLLVM_LIT_ARGS="-s" ^
+  -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;lld;compiler-rt;openmp;lldb"
 
-REM TODO: Run the "check-all" tests.
+REM Build the 32-bits and/or 64-bits binaries.
+if defined b32 call :build_32
+if defined b64 call :build_64
+goto :eof
+
+::==============================================================================
+:: Build 32-bits binaries.
+::==============================================================================
+:build_32
+REM Preserve original path
+set original_path=%PATH%
+
+REM Set Python environment
+set PYTHONHOME=%python32_dir%
+set PYTHONPATH=%PYTHONHOME%\lib
+set PATH=%PATH%;%PYTHONHOME%
 
-set OLDPATH=%PATH%
+set cmake_flags=^
+  %common_cmake_flags% ^
+  -DLLDB_TEST_COMPILER=%build_dir%\build32_stage0\bin\clang.exe ^
+  -DPYTHON_HOME=%python32_dir% ^
+  -DPYTHON_EXECUTABLE=%python32_dir%\python.exe
+
+call :print_trace_message Build32 - Stage0
 
-set "VSCMD_START_DIR=%CD%"
+set "VSCMD_START_DIR=%build_dir%"
 call "%vsdevcmd%" -arch=x86
-set PATH=%python32_dir%;%PATH%
-set CC=
-set CXX=
 mkdir build32_stage0
 cd build32_stage0
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPython3_ROOT_DIR=%python32_dir% ..\llvm-project\llvm || exit /b
-ninja || ninja || ninja || exit /b
-REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b
-REM 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
-REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
+cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
+%build_tool% all || exit /b 1
+
+REM Run all the available tests.
+if defined t32 (
+  call :print_trace_message Build32 Stage0 - Testing
+  call :run_tests
+)
 cd..
 
+call :print_trace_message Build32 - Stage1
+
+REM CMake expects the paths that specifies the compiler and linker to be
+REM with forward slash.
+set all_cmake_flags=^
+  %cmake_flags% ^
+  -DCMAKE_C_FLAGS="-Wno-nonportable-include-path" ^
+  -DCMAKE_CXX_FLAGS="-Wno-nonportable-include-path" ^
+  -DCMAKE_C_COMPILER=%build_dir%/build32_stage0/bin/clang-cl.exe ^
+  -DCMAKE_CXX_COMPILER=%build_dir%/build32_stage0/bin/clang-cl.exe ^
+  -DCMAKE_LINKER=%build_dir%/build32_stage0/bin/lld-link.exe
+set cmake_flags=%all_cmake_flags:\=/%
+
 mkdir build32
 cd build32
-set CC=..\build32_stage0\bin\clang-cl
-set CXX=..\build32_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python32_dir% -DPython3_ROOT_DIR=%python32_dir% ..\llvm-project\llvm || exit /b
-ninja || ninja || ninja || exit /b
-REM ninja check-llvm || ninja check-llvm || ninja check-llvm || exit /b
-REM 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
-REM ninja check-clang-tools || ninja check-clang-tools || ninja check-clang-tools || exit /b
-ninja package || exit /b
+cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
+%build_tool% all || exit /b 1
+
+REM Run all the available tests.
+if defined t32 (
+  call :print_trace_message Build32 Stage1 - Testing
+  call :run_tests
+)
+
+REM Create the binary package.
+if defined p32 (
+  call :print_trace_message Build32 - Packaging
+
+  %build_tool% package || exit /b 1
+
+  7z x -y 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 ..
 
-set "VSCMD_START_DIR=%CD%"
-set PATH=%OLDPATH%
+REM Restore original path
+set PATH=%original_path%
+
+exit /b 0
+::==============================================================================
+
+::==============================================================================
+:: Build 64-bits binaries.
+::==============================================================================
+:build_64
+REM Preserve original path
+set original_path=%PATH%
+
+REM Set Python environment
+set PYTHONHOME=%python64_dir%
+set PYTHONPATH=%PYTHONHOME%\lib
+set PATH=%PATH%;%PYTHONHOME%
+
+set cmake_flags=^
+  %common_cmake_flags% ^
+  -DLLDB_TEST_COMPILER=%build_dir%\build64_stage0\bin\clang.exe ^
+  -DPYTHON_HOME=%python64_dir% ^
+  -DPYTHON_EXECUTABLE=%python64_dir%\python.exe
+
+call :print_trace_message Build64 - Stage0
+
+set "VSCMD_START_DIR=%build_dir%"
 call "%vsdevcmd%" -arch=amd64
-set PATH=%python64_dir%;%PATH%
-set CC=
-set CXX=
 mkdir build64_stage0
 cd build64_stage0
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPython3_ROOT_DIR=%python64_dir% ..\llvm-project\llvm || exit /b
-ninja || ninja || ninja || exit /b
-ninja check-llvm || ninja check-llvm || ninja check-llvm || 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
+cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
+%build_tool% all || exit /b 1
+
+REM Run all the available tests.
+if defined t64 (
+  call :print_trace_message Build64 Stage0 - Testing
+  call :run_tests
+)
 cd..
 
+call :print_trace_message Build64 - Stage1
+
+REM CMake expects the paths that specifies the compiler and linker to be
+REM with forward slash.
+set all_cmake_flags=^
+  %cmake_flags% ^
+  -DCMAKE_C_FLAGS="-Wno-nonportable-include-path" ^
+  -DCMAKE_CXX_FLAGS="-Wno-nonportable-include-path" ^
+  -DCMAKE_C_COMPILER=%build_dir%/build64_stage0/bin/clang-cl.exe ^
+  -DCMAKE_CXX_COMPILER=%build_dir%/build64_stage0/bin/clang-cl.exe ^
+  -DCMAKE_LINKER=%build_dir%/build64_stage0/bin/lld-link.exe
+set cmake_flags=%all_cmake_flags:\=/%
+
 mkdir build64
 cd build64
-set CC=..\build64_stage0\bin\clang-cl
-set CXX=..\build64_stage0\bin\clang-cl
-cmake -GNinja %cmake_flags% -DPYTHON_HOME=%python64_dir% -DPython3_ROOT_DIR=%python64_dir% ..\llvm-project\llvm || exit /b
-ninja || ninja || ninja || exit /b
-ninja check-llvm || ninja check-llvm || ninja check-llvm || 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
+cmake -GNinja %cmake_flags% ..\llvm-project\llvm || exit /b 1
+%build_tool% all || exit /b 1
+
+REM Run all the available tests.
+if defined t64 (
+  call :print_trace_message Build64 Stage1 - Testing
+  call :run_tests
+)
+
+REM Create the binary package.
+if defined p64 (
+  call :print_trace_message Build64 - Packaging
+
+  %build_tool% package || exit /b 1
+
+  7z x -y 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 ..
+
+REM Restore original path
+set PATH=%original_path%
+
+exit /b 0
+::==============================================================================
+
+::=============================================================================
+:: Run all the available tests.
+::=============================================================================
+:run_tests
+  %build_tool% check
+  %build_tool% check-clang
+  %build_tool% check-llvm
+  %build_tool% check-lld
+  %build_tool% check-sanitizer
+  %build_tool% check-clang-tools
+  %build_tool% check-clangd
+
+exit /b 0
+::==============================================================================
+
+::=============================================================================
+:: Parse command line arguments.
+::=============================================================================
+:parse_args
+  set "arg_name="
+  :parse_args_start
+  if "%1" == "" (
+    :: Set a seen boolean argument.
+    if "%arg_name%" neq "" (
+      set "%arg_name%=true"
+    )
+    goto :parse_args_done
+  )
+  set aux=%1
+  if "%aux:~0,2%" == "--" (
+    :: Set a seen boolean argument.
+    if "%arg_name%" neq "" (
+      set "%arg_name%=true"
+    )
+    set "arg_name=%aux:~2,250%"
+  ) else (
+    set "%arg_name%=%1"
+    set "arg_name="
+  )
+  shift
+  goto :parse_args_start
+
+:parse_args_done
+exit /b 0
+::==============================================================================
+
+::==============================================================================
+:: Print usage.
+::==============================================================================
+:print_usage
+  echo.
+  echo Script for building the LLVM installer on Windows, used for
+  echo the releases at https://github.com/llvm/llvm-project/releases
+  echo.
+  echo Usage: build_llvm_release.bat ^<options^>
+  echo.
+  echo options:
+  echo   --version [^<number^>]  Version number (i.e. 14.0.4)
+  echo   --output ^<name^>       Output directory
+  echo.
+  echo   --b32                 build 32-bit binaries
+  echo   --b64                 build 64-bit binaries
+  echo   --t32                 run 32-bits tests
+  echo   --t64                 run 64-bits tests
+  echo   --p32                 create 32-bits binary package
+  echo   --p64                 create 64-bits binary package
+  echo.
+  echo   --trace               Debugging trace
+exit /b 0
+::==============================================================================
+
+::==============================================================================
+:: Print a trace message.
+::==============================================================================
+:print_trace_message
+  if defined trace (
+    echo.
+    echo ================================
+    echo %*
+    echo ================================
+  )
+exit /b 0
+::==============================================================================