diff options
| author | Victor Tran <vicr12345@gmail.com> | 2018-12-20 00:45:22 +1100 |
|---|---|---|
| committer | Victor Tran <vicr12345@gmail.com> | 2018-12-20 00:45:22 +1100 |
| commit | 8a5b13e73a1ade01eb4ecc5f32de0f18026c46a6 (patch) | |
| tree | 38edaf9e036158631fb5e5134faf342cabbeb8e5 | |
| parent | 7f72871b9000e846a5e9b5d42207a137515996fa (diff) | |
| download | theInstaller-8a5b13e73a1ade01eb4ecc5f32de0f18026c46a6.tar.gz theInstaller-8a5b13e73a1ade01eb4ecc5f32de0f18026c46a6.tar.bz2 theInstaller-8a5b13e73a1ade01eb4ecc5f32de0f18026c46a6.zip | |
Fix build
| -rw-r--r-- | appveyor/build.bat | 8 | ||||
| -rw-r--r-- | installer/installer.pro | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/appveyor/build.bat b/appveyor/build.bat index 36d4cee..3bfd0a9 100644 --- a/appveyor/build.bat +++ b/appveyor/build.bat @@ -23,13 +23,13 @@ echo Prefix=.. >> %QTDIR%\bin\qt.conf GOTO buildversions :build -echo ********************************************* +echo *********************************************************** echo BUILDING %~1 -echo URL: %~2 -echo ********************************************* +echo URL: %~2 +echo *********************************************************** if not exist "deploy" mkdir deploy set DEPLOY=%cd%\deploy -echo %~2 > metadata.txt +echo %~2 > installer\metadata.txt mkdir %~1 pushd %~1 qmake ..\theInstaller.pro "LIBS += -L\"%ZLIBDIR%\"" "INCLUDEPATH += \"%ZLIBINCLUDEDIR%\"" diff --git a/installer/installer.pro b/installer/installer.pro index 57cd84b..8d9171f 100644 --- a/installer/installer.pro +++ b/installer/installer.pro @@ -30,11 +30,13 @@ DEFINES += QT_DEPRECATED_WARNINGS #This will create an installer for theSlate. Change this URL to a different one to change what is installed. #Also change the branding files. -if (!exists($$_PRO_FILE_PWD_/metadata.txt)) { - error(Metadata file not found. Create a metadata.txt file in the same directory as installer.pro containing the URL of a metadata file.) -} +if (isEmpty(METADATA_URL)) { + if (!exists($$_PRO_FILE_PWD_/metadata.txt)) { + error(Metadata file not found. Create a metadata.txt file in the same directory as installer.pro containing the URL of a metadata file.) + } -METADATA_URL = "$$cat($$_PRO_FILE_PWD_/metadata.txt)" + METADATA_URL = "$$cat($$_PRO_FILE_PWD_/metadata.txt)" +} message(Configuring theInstaller for metadata URL $$METADATA_URL) DEFINES += INSTALLER_METADATA_URL=\\\"$$METADATA_URL\\\" |