ETM-Schurig
/
nymea-app
mirror of https://github.com/nymea/nymea-app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from guh/mingw 

switch from msvc to mingw for windows builds
pull/1/head
Michael Zanetti 2018-06-04 12:18:16 +02:00 committed by GitHub
parent 3536204961 1e60791d1c
commit cbae70d3f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mea.pro
View File

@ -14,19 +14,23 @@ withtests: {
# Use QtCreator to create a release build, make sure to *disable* shadow build.
# After building, run "make wininstaller"
wininstaller.depends = mea
BR=$$BRANDING
equals(BR, "") {
equals(BRANDING, "") {
APP_NAME = mea
PACKAGE_DIR = packaging\windows
PACKAGE_NAME = mea-win-installer
} else {
APP_NAME = $${BR}
PACKAGE_NAME = $${BR}-win-installer
APP_NAME = $${BRANDING}
PACKAGE_NAME = $${BRANDING}-win-installer
PACKAGE_DIR = packaging\windows_$${APP_NAME}
}
wininstaller.commands += rmdir /S /Q $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data & mkdir $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
wininstaller.commands += copy $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\meta\logo.ico $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\logo.ico &&
wininstaller.commands += copy mea\release\mea.exe $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\\$${APP_NAME}.exe &&
!equals(SSL_LIBS, "") {
message("Deploying SSL libs from $${SSL_LIBS} to package.")
wininstaller.commands += copy $${SSL_LIBS}\libeay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
wininstaller.commands += copy $${SSL_LIBS}\ssleay32.dll $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data &&
}
wininstaller.commands += windeployqt --compiler-runtime --qmldir mea\ui $${PACKAGE_DIR}\packages\io.guh.$${APP_NAME}\data\ &&
wininstaller.commands += binarycreator -c $${PACKAGE_DIR}\config\config.xml -p $${PACKAGE_DIR}\packages\ $${PACKAGE_NAME}

2
packaging/windows/packages/io.guh.mea/meta/installscript.qs
View File

@ -18,7 +18,5 @@ Component.prototype.createOperations = function()
component.addOperation("CreateShortcut", "@TargetDir@/mea.exe", "@StartMenuDir@/Mea.lnk",
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",
"description=mea - The nymea frontend");
component.addOperation("Execute", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
}
}

2
packaging/windows_maveo/packages/io.guh.maveo/meta/installscript.qs
View File

@ -18,7 +18,5 @@ Component.prototype.createOperations = function()
component.addOperation("CreateShortcut", "@TargetDir@/maveo.exe", "@StartMenuDir@/Maveo Pro Box Dashboard.lnk",
"workingDirectory=@TargetDir@", "iconPath=@TargetDir@/logo.ico",
"description=Maveo Pro Box Dashboard");
component.addOperation("Execute", "@TargetDir@/vc_redist.x64.exe", "/quiet", "/norestart");
}
}