summaryrefslogtreecommitdiff
path: root/branding
diff options
context:
space:
mode:
authorkali kaneko (leap communications) <kali@leap.se>2020-10-13 20:42:36 +0200
committerkali kaneko (leap communications) <kali@leap.se>2020-10-23 23:21:58 +0200
commit9664ba2ddcdfe587355acd1d5b87f06a9849d8cb (patch)
tree654d8075955204e1483976c778204b45eac6cdd5 /branding
parente9c95064992bffb331be71a89152bb3f4de763f5 (diff)
[pkg] no need to build helper or openvpn for snap
Diffstat (limited to 'branding')
-rw-r--r--branding/templates/snap/snapcraft-template.yaml9
1 files changed, 7 insertions, 2 deletions
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