diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:24 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:55 +0200 |
| commit | 4ba79af3bb8ba4bc21fc857b5f8863f099c88fee (patch) | |
| tree | 86ca07ef43e5cee1f5a013f49d244861dbdc1484 /scripts | |
| parent | 4c5f973ffb3e1cc30d4227df79ec8a69995c6996 (diff) | |
| parent | 520fe8cc897a91a466f97f510db7b0c2343a83f9 (diff) | |
Merge remote-tracking branch 'origin/1.9' into master
Change-Id: Ib18e50ecdc9be5f9deaebf68414c2082ddafcc8b
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make-release-archives.bat | 4 |
1 files changed, 2 insertions, 2 deletions
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 |