Skip to content
Snippets Groups Projects
Unverified Commit 451f6fef authored by Kali Kaneko's avatar Kali Kaneko Committed by Kali Kaneko
Browse files

[pkg] fix makefile, installer

parent e5885ffb
No related branches found
No related tags found
No related merge requests found
......@@ -206,10 +206,10 @@ ifeq (${PLATFORM}, darwin)
@cp build/bin/${PLATFORM}/bitmask-helper ${INST_DATA}/
ifeq (${RELEASE}, yes)
@echo "[+] Running macdeployqt (release mode)"
@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml ${MACDEPLOYQT_OPTS}
@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components ${MACDEPLOYQT_OPTS}
else
@echo "[+] Running macdeployqt (debug mode)"
@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/qml
@macdeployqt ${QTBUILD}/release/${PROVIDER}-vpn.app -qmldir=gui/components
endif
@cp -r "${QTBUILD}/release/${TARGET}.app"/ ${INST_DATA}/
endif
......
......@@ -8,7 +8,7 @@ import time
from string import Template
from provider import getDefaultProvider
from provider import getDefaultProviders
from provider import getProviderData
OS_CONFIG = {
......@@ -46,7 +46,7 @@ def getData():
provider = os.environ.get('PROVIDER')
if not provider:
provider = getDefaultProvider(config)
provider = getDefaultProviders(config)[0]
return getProviderData(provider, config)
def generateQtInstallerBoilerplate(data, platform, outDir):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment