Detect errors in Windows packaging script

[pbo-linaro]

Summary

• Detect VS devcmd error (missing VS)
• Detect missing python install
• Show commands executed
• Removed pause (blocking CI usage)

[hans]

lgtm

llvm/utils/release/build_llvm_release.bat

69

I liked this, but I can see how it doesn't make sense for everyone.

[mstorsjo]

llvm/utils/release/build_llvm_release.bat

128

Why this added @echo on here? Does call "%vsdevcmd%" affect the echo mode of this surrounding script?

[pbo-linaro]

llvm/utils/release/build_llvm_release.bat

69

I'm open to discuss this.
We are using a pre-script that downloads dependencies, and having this one to stop after some time, is not so handy.

128

Alas yes. Any script called with call "pollutes" current environment, including for echoing commands.
So, an @echo off will disable echo in parent script.
It's equivalent to a "source" in bash, which can be counter intuitive.

[hans]

llvm/utils/release/build_llvm_release.bat

69

I think dropping it is fine.

[mstorsjo]

llvm/utils/release/build_llvm_release.bat

69

FWIW, if there's an easy way to check if the current terminal is interactive or not (it's fairly easy to do this for unix shell scripts at least), it could be kept conditionally for such cases I think.

128

Ah, right - it's been a couple decades since I spent more time thinking about the intricacies of bat scripts... Then this sounds reasonable to me.

[pbo-linaro]

llvm/utils/release/build_llvm_release.bat

69

It probably exists for batch indeed. But when used really interactively (like use case I was talking about), the fact it stops is not handy.

[pbo-linaro]

@hans It seems build failed because of a sporadic issues (not related to this patch).

How are we suppose to deal with this? Do you have rights to trigger it again?
Once built, is it automatically rebase/merged on trunk, or do you do trigger this by clicking somewhere?

That's my first submission using phabricator, so sorry if the question is naive (didn't find answer in llvm documentation).

[hans]

In D135138#3833078, @pbo-linaro wrote:

@hans It seems build failed because of a sporadic issues (not related to this patch).

How are we suppose to deal with this? Do you have rights to trigger it again?

Sadly it often fails for unrelated reasons. Ignoring it is fine, especially since it doesn't run this script at all.

Once built, is it automatically rebase/merged on trunk, or do you do trigger this by clicking somewhere?

There is no automatic way to commit/push. Since it's your first patch I assume you don't have commit access, so I will commit it on your behalf (see https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access).

[pbo-linaro]

@hans
Thanks, I thought is was "blocking", like some other review systems.
For commit access, I'll probably request it somewhere in the future (beyond work on this script).
Thanks for submitting it for me.

llvm/utils/release/build_llvm_release.bat

-@echo off
+@echo on
 setlocal enabledelayedexpansion
 
 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

 set revision=llvmorg-%1
 set package_version=%1
 set build_dir=%cd%\llvm_package_%package_version%
 
 echo Revision: %revision%
 echo Package version: %package_version%
 echo Build dir: %build_dir%
 echo.
-pause
 
 if exist %build_dir% (
   echo Build directory already exists: %build_dir%
   exit /b 1
 )
 mkdir %build_dir%
-cd %build_dir%
+cd %build_dir% || exit /b 1
 
 echo Checking out %revision%
 curl -L https://github.com/llvm/llvm-project/archive/%revision%.zip -o src.zip || exit /b 1
 7z x src.zip || exit /b 1
 mv llvm-project-* llvm-project || exit /b 1
 
 curl -O https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.9.12/libxml2-v2.9.12.tar.gz || exit /b 1
 tar zxf libxml2-v2.9.12.tar.gz

 REM Restore original path
 set PATH=%OLDPATH%
 
 REM TODO: Run the "check-all" tests.
 
 REM Set Python environment
 set PYTHONHOME=%python32_dir%
 set PATH=%PYTHONHOME%;%PATH%
+%python32_dir%/python.exe --version || exit /b 1
 
 set "VSCMD_START_DIR=%build_dir%"
-call "%vsdevcmd%" -arch=x86
+call "%vsdevcmd%" -arch=x86 || exit /b 1
+@echo on
 mkdir build32_stage0
 cd build32_stage0
 
 mkdir libxmlbuild
 cd libxmlbuild
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_C14N=OFF -DLIBXML2_WITH_CATALOG=OFF -DLIBXML2_WITH_DEBUG=OFF -DLIBXML2_WITH_DOCB=OFF -DLIBXML2_WITH_FTP=OFF -DLIBXML2_WITH_HTML=OFF -DLIBXML2_WITH_HTTP=OFF -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_ICU=OFF -DLIBXML2_WITH_ISO8859X=OFF -DLIBXML2_WITH_LEGACY=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_MEM_DEBUG=OFF -DLIBXML2_WITH_MODULES=OFF -DLIBXML2_WITH_OUTPUT=ON -DLIBXML2_WITH_PATTERN=OFF -DLIBXML2_WITH_PROGRAMS=OFF -DLIBXML2_WITH_PUSH=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_READER=OFF -DLIBXML2_WITH_REGEXPS=OFF -DLIBXML2_WITH_RUN_DEBUG=OFF -DLIBXML2_WITH_SAX1=OFF -DLIBXML2_WITH_SCHEMAS=OFF -DLIBXML2_WITH_SCHEMATRON=OFF -DLIBXML2_WITH_TESTS=OFF -DLIBXML2_WITH_THREADS=ON -DLIBXML2_WITH_THREAD_ALLOC=OFF -DLIBXML2_WITH_TREE=ON -DLIBXML2_WITH_VALID=OFF -DLIBXML2_WITH_WRITER=OFF -DLIBXML2_WITH_XINCLUDE=OFF -DLIBXML2_WITH_XPATH=OFF -DLIBXML2_WITH_XPTR=OFF -DLIBXML2_WITH_ZLIB=OFF ../../libxml2-v2.9.12 || exit /b 1
 ninja install || exit /b 1
 set libxmldir=%cd%\install

 ::==============================================================================
 :do_build_64
 REM Restore original path
 set PATH=%OLDPATH%
 
 REM Set Python environment
 set PYTHONHOME=%python64_dir%
 set PATH=%PYTHONHOME%;%PATH%
+%python64_dir%/python.exe --version || exit /b 1
 
 set "VSCMD_START_DIR=%build_dir%"
-call "%vsdevcmd%" -arch=amd64
+call "%vsdevcmd%" -arch=amd64 || exit /b 1
+@echo on
 mkdir build64_stage0
 cd build64_stage0
 
 mkdir libxmlbuild
 cd libxmlbuild
 cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_C14N=OFF -DLIBXML2_WITH_CATALOG=OFF -DLIBXML2_WITH_DEBUG=OFF -DLIBXML2_WITH_DOCB=OFF -DLIBXML2_WITH_FTP=OFF -DLIBXML2_WITH_HTML=OFF -DLIBXML2_WITH_HTTP=OFF -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_ICU=OFF -DLIBXML2_WITH_ISO8859X=OFF -DLIBXML2_WITH_LEGACY=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_MEM_DEBUG=OFF -DLIBXML2_WITH_MODULES=OFF -DLIBXML2_WITH_OUTPUT=ON -DLIBXML2_WITH_PATTERN=OFF -DLIBXML2_WITH_PROGRAMS=OFF -DLIBXML2_WITH_PUSH=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_READER=OFF -DLIBXML2_WITH_REGEXPS=OFF -DLIBXML2_WITH_RUN_DEBUG=OFF -DLIBXML2_WITH_SAX1=OFF -DLIBXML2_WITH_SCHEMAS=OFF -DLIBXML2_WITH_SCHEMATRON=OFF -DLIBXML2_WITH_TESTS=OFF -DLIBXML2_WITH_THREADS=ON -DLIBXML2_WITH_THREAD_ALLOC=OFF -DLIBXML2_WITH_TREE=ON -DLIBXML2_WITH_VALID=OFF -DLIBXML2_WITH_WRITER=OFF -DLIBXML2_WITH_XINCLUDE=OFF -DLIBXML2_WITH_XPATH=OFF -DLIBXML2_WITH_XPTR=OFF -DLIBXML2_WITH_ZLIB=OFF ../../libxml2-v2.9.12 || exit /b 1
 ninja install || exit /b 1
 set libxmldir=%cd%\install