From bd2c6175c81d77c07441b1da55c808f7696b67db Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 22 Aug 2017 12:12:34 -0700 Subject: Docker/Windows: use a simpler workaround for UNC paths in release script This should make release builds faster since all of the source files don't need to be copied to a temporary directory. Qbs is also updated to 1.9 since another bug was fixed in that version which prevented from building when the Qbs sources were located in the root of a drive. Change-Id: I9d333dd0e0bf1fafc72cff093c90f8d0111162b3 Reviewed-by: Joerg Bornemann --- scripts/make-release-archives.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat index 19e06bcec..865efb2fd 100644 --- a/scripts/make-release-archives.bat +++ b/scripts/make-release-archives.bat @@ -63,10 +63,10 @@ if exist "%QTDIR64%" ( REM Work around QBS-1142, where symlinks to UNC named paths aren't resolved REM properly, for example if this command is being run in a Docker container REM where the current directory is a symlink -(robocopy "%CD%" "%builddir%\source" /e /njh /njs /ndl /nc /ns /xd .git) ^& IF %ERRORLEVEL% GTR 1 exit %ERRORLEVEL% +subst Q: "%CD%" && Q: qbs build --settings-dir "%builddir%\.settings"^ - -f "%builddir%\source" -d "%builddir%\build"^ + -f qbs.qbs -d "%builddir%\build"^ -p dist qbs.buildVariant:release "products.qbs archive.includeTopLevelDir:true"^ release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^ release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b -- cgit v1.2.3