From df2aa2d6201e12e97ee155eb65f16491c7ebf105 Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Fri, 5 Apr 2019 11:11:03 +0200 Subject: [PATCH] switch to YAML --- com.visualstudio.code.json | 144 ------------------------------------- com.visualstudio.code.yaml | 104 +++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 144 deletions(-) delete mode 100644 com.visualstudio.code.json create mode 100644 com.visualstudio.code.yaml diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json deleted file mode 100644 index 67f151d..0000000 --- a/com.visualstudio.code.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "app-id": "com.visualstudio.code", - "branch": "stable", - "base": "org.electronjs.Electron2.BaseApp", - "base-version": "18.08", - "runtime": "org.freedesktop.Sdk", - "runtime-version": "18.08", - "sdk": "org.freedesktop.Sdk", - "command": "code", - "tags": ["proprietary"], - "desktop-file-name-suffix": " (Flatpak)", - "separate-locales": false, - "finish-args": [ - "--require-version=0.10.3", - "--share=ipc", - "--socket=x11", - "--socket=pulseaudio", - "--socket=ssh-auth", - "--share=network", - "--device=dri", - "--filesystem=host", - "--allow=devel", - "--talk-name=org.freedesktop.Notifications", - "--talk-name=org.freedesktop.secrets", - "--talk-name=org.freedesktop.Flatpak", - "--env=NPM_CONFIG_GLOBALCONFIG=/app/etc/npmrc", - "--env=LD_LIBRARY_PATH=/app/lib", - "--filesystem=xdg-config/kdeglobals:ro", - "--talk-name=com.canonical.AppMenu.Registrar", - "--talk-name=com.canonical.AppMenu.Registrar.*" - ], - "modules": [ - { - "name": "libsecret", - "config-opts": [ - "--disable-manpages", - "--disable-gtk-doc", - "--disable-static", - "--disable-introspection" - ], - "cleanup": [ - "/bin", - "/include", - "/lib/pkgconfig", - "/share/gtk-doc", - "*.la" - ], - "sources": [ - { - "type": "archive", - "url": "http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.5.tar.xz", - "sha256": "9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3" - }, - { - "type": "shell", - "commands": ["autoreconf -f"] - } - ] - }, - { - "name": "vscode", - "buildsystem": "simple", - "build-commands": [ - "install -D code.sh /app/bin/code", - "install -Dm644 com.visualstudio.code-64.png /app/share/icons/hicolor/64x64/apps/com.visualstudio.code.png", - "install -Dm644 com.visualstudio.code-128.png /app/share/icons/hicolor/128x128/apps/com.visualstudio.code.png", - "install -Dm644 com.visualstudio.code-256.png /app/share/icons/hicolor/256x256/apps/com.visualstudio.code.png", - "install -Dm644 com.visualstudio.code-512.png /app/share/icons/hicolor/512x512/apps/com.visualstudio.code.png", - "install -Dm644 com.visualstudio.code.appdata.xml -t /app/share/metainfo", - "install -Dm644 com.visualstudio.code.desktop -t /app/share/applications", - "install -Dm644 npmrc -t /app/etc", - "install -Dm644 flatpak-warning.txt -t /app/share/vscode", - "install -D apply_extra -t /app/bin", - "cp /usr/bin/ar /app/bin", - "ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so /app/lib", - "ARCH_TRIPLE=$(gcc --print-multiarch) && ln -s /usr/lib/${ARCH_TRIPLE}/libtinfo.so /app/lib/libtinfo.so.5" - ], - "sources": [ - { - "type": "script", - "dest-filename": "apply_extra", - "commands": [ - "ar x code.deb", - "tar xf data.tar.xz", - "mv usr/share/code vscode", - "rm -r code.deb control.tar.gz data.tar.xz debian-binary usr" - ] - }, - { - "type": "file", - "path": "code.sh" - }, - { - "type": "file", - "path": "flatpak-warning.txt" - }, - { - "type": "file", - "path": "npmrc" - }, - { - "type": "file", - "path": "com.visualstudio.code.appdata.xml" - }, - { - "type": "file", - "path": "com.visualstudio.code.desktop" - }, - { - "type": "file", - "path": "com.visualstudio.code-512.png" - }, - { - "type": "file", - "path": "com.visualstudio.code-256.png" - }, - { - "type": "file", - "path": "com.visualstudio.code-128.png" - }, - { - "type": "file", - "path": "com.visualstudio.code-64.png" - }, - { - "type": "extra-data", - "filename": "code.deb", - "only-arches": ["x86_64"], - "url": "https://vscode-update.azurewebsites.net/1.32.3/linux-deb-x64/stable", - "sha256": "3347516c7c657598cf169b404472d5c669346db03c89293e02aeb462e696b4e0", - "size": 47829494 - }, - { - "type": "extra-data", - "filename": "code.deb", - "only-arches": ["i386"], - "url": "https://vscode-update.azurewebsites.net/1.32.3/linux-deb-ia32/stable", - "sha256": "eb717ef0c1e6dab1c0662c74dca9633931bd8aaa8195deddcbc1007416235907", - "size": 48792494 - } - ] - } - ] -} diff --git a/com.visualstudio.code.yaml b/com.visualstudio.code.yaml new file mode 100644 index 0000000..50f2da4 --- /dev/null +++ b/com.visualstudio.code.yaml @@ -0,0 +1,104 @@ +app-id: com.visualstudio.code +branch: stable +base: org.electronjs.Electron2.BaseApp +base-version: '18.08' +runtime: org.freedesktop.Sdk +runtime-version: '18.08' +sdk: org.freedesktop.Sdk +command: code +tags: [proprietary] +desktop-file-name-suffix: ' (Flatpak)' +separate-locales: false +finish-args: + - --require-version=0.10.3 + - --share=ipc + - --socket=x11 + - --socket=pulseaudio + - --socket=ssh-auth + - --share=network + - --device=dri + - --filesystem=host + - --allow=devel + - --talk-name=org.freedesktop.Notifications + - --talk-name=org.freedesktop.secrets + - --talk-name=org.freedesktop.Flatpak + - --env=NPM_CONFIG_GLOBALCONFIG=/app/etc/npmrc + - --env=LD_LIBRARY_PATH=/app/lib + - --filesystem=xdg-config/kdeglobals:ro + - --talk-name=com.canonical.AppMenu.Registrar + - --talk-name=com.canonical.AppMenu.Registrar.* +cleanup: + - /include + - /lib/pkgconfig + - /share/gtk-doc + - '*.la' +modules: + + - name: libsecret + config-opts: + - --disable-manpages + - --disable-gtk-doc + - --disable-static + - --disable-introspection + cleanup: [/bin] + sources: + - type: archive + url: http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.5.tar.xz + sha256: 9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3 + - type: shell + commands: [autoreconf -f] + + - name: vscode + buildsystem: simple + build-commands: + - install -D code.sh /app/bin/code + - install -Dm644 com.visualstudio.code-64.png /app/share/icons/hicolor/64x64/apps/com.visualstudio.code.png + - install -Dm644 com.visualstudio.code-128.png /app/share/icons/hicolor/128x128/apps/com.visualstudio.code.png + - install -Dm644 com.visualstudio.code-256.png /app/share/icons/hicolor/256x256/apps/com.visualstudio.code.png + - install -Dm644 com.visualstudio.code-512.png /app/share/icons/hicolor/512x512/apps/com.visualstudio.code.png + - install -Dm644 com.visualstudio.code.appdata.xml -t /app/share/metainfo + - install -Dm644 com.visualstudio.code.desktop -t /app/share/applications + - install -Dm644 npmrc -t /app/etc + - install -Dm644 flatpak-warning.txt -t /app/share/vscode + - install -D apply_extra -t /app/bin + - cp /usr/bin/ar /app/bin + - ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so/app/lib + - ARCH_TRIPLE=$(gcc --print-multiarch) && ln -s /usr/lib/${ARCH_TRIPLE}/libtinfo.so/app/lib/libtinfo.so.5 + sources: + - type: script + dest-filename: apply_extra + commands: + - ar x code.deb + - tar xf data.tar.xz + - mv usr/share/code vscode + - rm -r code.deb control.tar.gz data.tar.xz debian-binary usr + - type: file + path: code.sh + - type: file + path: flatpak-warning.txt + - type: file + path: npmrc + - type: file + path: com.visualstudio.code.appdata.xml + - type: file + path: com.visualstudio.code.desktop + - type: file + path: com.visualstudio.code-512.png + - type: file + path: com.visualstudio.code-256.png + - type: file + path: com.visualstudio.code-128.png + - type: file + path: com.visualstudio.code-64.png + - type: extra-data + filename: code.deb + only-arches: [x86_64] + url: https://vscode-update.azurewebsites.net/1.32.3/linux-deb-x64/stable + sha256: 3347516c7c657598cf169b404472d5c669346db03c89293e02aeb462e696b4e0 + size: 47829494 + - type: extra-data + filename: code.deb + only-arches: [i386] + url: https://vscode-update.azurewebsites.net/1.32.3/linux-deb-ia32/stable + sha256: eb717ef0c1e6dab1c0662c74dca9633931bd8aaa8195deddcbc1007416235907 + size: 48792494