From 9664ba2ddcdfe587355acd1d5b87f06a9849d8cb Mon Sep 17 00:00:00 2001 From: "kali kaneko (leap communications)" Date: Tue, 13 Oct 2020 20:42:36 +0200 Subject: [pkg] no need to build helper or openvpn for snap --- branding/templates/snap/snapcraft-template.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'branding/templates/snap') diff --git a/branding/templates/snap/snapcraft-template.yaml b/branding/templates/snap/snapcraft-template.yaml index c4f3afe..4a6bd89 100644 --- a/branding/templates/snap/snapcraft-template.yaml +++ b/branding/templates/snap/snapcraft-template.yaml @@ -35,12 +35,17 @@ parts: stage: - bin/${binaryName} override-build: | + # TODO - this still has some round corners for vendoring. + # Maybe we just need to put the providers.json in the VENDOR_PATH + # and pass it to gui/providers from some path that snap can access. + # Same for the vendor.qrc mkdir -p $SNAPCRAFT_PART_INSTALL/snap/ mkdir -p $SNAPCRAFT_PRIME/snap/ echo ${version} > $SNAPCRAFT_PRIME/snap/version.txt - QT_SELECT=5 XBUILD=no TARGET=${binaryName} make build + make build_golib + QT_SELECT=5 XBUILD=no TARGET=${binaryName} make build_gui mkdir -p $SNAPCRAFT_PART_INSTALL/bin - mv qtbuild/release/${binaryName} $SNAPCRAFT_PART_INSTALL/bin/ + mv build/qt/release/${binaryName} $SNAPCRAFT_PART_INSTALL/bin/ override-prime: | rm -rf $SNAPCRAFT_PROJECT_DIR/snap/hooks/.mypy_cache snapcraftctl prime -- cgit v1.2.3