Changeset 217

Timestamp:

Jan 21, 2022, 10:44:06 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updated snapcraft file.

Files:

• tags/1.6.0/Install/deb/AcronymDecoder.desktop (deleted)
• tags/1.6.0/Install/deb/debian/rules (modified) (1 diff)
• tags/1.6.0/Install/shared (added)
• tags/1.6.0/Install/shared/AcronymDecoder.desktop (added)
• tags/1.6.0/Install/shared/acronym-decoder.xml (added)
• tags/1.6.0/Install/snap/local/AcronymDecoder.desktop (deleted)
• tags/1.6.0/Install/snap/snapcraft.yaml (modified) (3 diffs)
• trunk/Install/snap/snapcraft.yaml (modified) (2 diffs)

tags/1.6.0/Install/deb/debian/rules

@@ -17 +17 @@
         install -s -m 755 AcronymDecoder $(ROOT)/usr/bin
         install -d -m 755 $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 755 Languages/AcronymDecoder.po $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 755 Languages/AcronymDecoder.cs.po $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 755 Languages/UJobProgressView.po $(ROOT)/usr/share/AcronymDecoder/languages
-        install -m 755 Languages/UJobProgressView.cs.po $(ROOT)/usr/share/AcronymDecoder/languages
+        install -m 644 Languages/AcronymDecoder.pot $(ROOT)/usr/share/AcronymDecoder/languages
+        install -m 644 Languages/AcronymDecoder.cs.po $(ROOT)/usr/share/AcronymDecoder/languages
         install -d -m 755 $(ROOT)/usr/share/AcronymDecoder/Examples
         @install -D -m 644 Examples/* $(ROOT)/usr/share/AcronymDecoder/Examples || true
+        install -d -m 755 $(ROOT)/usr/share/mime/packages
+        install -m 644 Install/shared/acronym-decoder.xml $(ROOT)/usr/share/mime/packages
         install -d -m 755 $(ROOT)/usr/share/applications
-        install -m 755 Install/deb/AcronymDecoder.desktop $(ROOT)/usr/share/applications
+        install -m 755 Install/shared/AcronymDecoder.desktop $(ROOT)/usr/share/applications
         install -d -m 755 $(ROOT)/usr/share/pixmaps
-        install -m 755 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps
+        install -m 644 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps
+        install -m 644 Images/AcronymDecoder.png $(ROOT)/usr/share/pixmaps/application-adp.png
 
 %:

tags/1.6.0/Install/snap/snapcraft.yaml

@@ -4 +4 @@
 summary: A simple tool for quick searching of acronyms and abbreviations meaning.
 description: |
-  A tool for quick searching of acronym or abbreviation meaning.
-
-  Features:
-  * Add, Edit, Remove acronyms
-  * Import acronym from online sources with defined parsing rules
-  * Export to various formats
-  * Support acronym groups
+  A tool for quick searching of acronym or abbreviation meanings.
+  
+  **Features:**
+  * Acronym database management
+  * Quick searching by acronym name, meaning or category. Exact or partial match.
+  * Acronym categories
+  * Database stored as project file in open XML format
+  * Configurable import from external web pages (http, https) with custom text parsing rules
+  * Support for import from MS Access database file
+  * Localized interface (English, Czech)
+  * Allows minimization to system tray
+  * Document check for acronyms occurrence, definitions and summary section
 confinement: strict
 base: core20
@@ -22 +27 @@
     source: .
     source-type: local
-    build-packages: 
+    build-packages:
     - fpc
     - lazarus
@@ -30 +35 @@
       snapcraftctl build
       lazbuild --build-mode=Release AcronymDecoder.lpi
-      ROOT=/root/parts/acronym-decoder/install
-      install -d -m 755 $ROOT/usr/bin
-      install -s -m 755 AcronymDecoder $ROOT/usr/bin/AcronymDecoder
-      install -d -m 755 $ROOT/usr/share/AcronymDecoder/Languages
-      install -m 755 Languages/AcronymDecoder.po $ROOT/usr/share/AcronymDecoder/Languages
-      install -m 755 Languages/AcronymDecoder.cs.po $ROOT/usr/share/AcronymDecoder/Languages
-      install -m 755 Packages/Common/Languages/UFormAbout.po $ROOT/usr/share/AcronymDecoder/Languages
-      install -m 755 Packages/Common/Languages/UFormAbout.cs.po $ROOT/usr/share/AcronymDecoder/Languages
-      install -d -m 755 $ROOT/usr/share/applications
-      install -m 755 Install/snap/local/AcronymDecoder.desktop $ROOT/usr/share/applications
-      install -d -m 755 $ROOT/usr/share/pixmaps
-      install -m 755 Images/AcronymDecoder.png $ROOT/usr/share/pixmaps
-      cp -r Examples $ROOT/usr/share/AcronymDecoder
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/bin
+      install -s -m 755 AcronymDecoder $SNAPCRAFT_PART_INSTALL/usr/bin/AcronymDecoder
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Languages/AcronymDecoder.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Languages/AcronymDecoder.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UJobProgressView.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UJobProgressView.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UFormAbout.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UFormAbout.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -m 644 Install/shared/acronym-decoder.xml $SNAPCRAFT_PART_INSTALL/usr/share/mime/packages
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -m 755 Install/shared/AcronymDecoder.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -m 644 Images/AcronymDecoder.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -m 644 Images/AcronymDecoder.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-adp.png
+      cp -r Examples $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder
+    after:
+    - desktop-gtk2
     stage:
-      - etc
-      - usr
-      - usr/bin
-      - usr/share/AcronymDecoder
-      - usr/share/applications/AcronymDecoder.desktop
-      - usr/share/pixmaps
+    - etc
+    - usr
+    - usr/bin
+    - usr/share/AcronymDecoder
+    - usr/share/applications/AcronymDecoder.desktop
+    - usr/share/pixmaps
     stage-packages:
-      - libatk1.0-0
-      - libcairo2
-      - libdatrie1
-      - libfontconfig1
-      - libfreetype6
-      - libfribidi0
-      - libgdk-pixbuf2.0-0
-      - libgraphite2-3
-      - libgtk2.0-0
-      - libharfbuzz0b
-      - libpango-1.0-0
-      - libpangocairo-1.0-0
-      - libpangoft2-1.0-0
-      - libpixman-1-0
-      - libpng16-16
-      - libthai0
-      - libx11-6
-      - libxau6
-      - libxcb-render0
-      - libxcb-shm0
-      - libxcb1
-      - libxcomposite1
-      - libxcursor1
-      - libxdamage1
-      - libxdmcp6
-      - libxext6
-      - libxfixes3
-      - libxi6
-      - libxinerama1
-      - libxrandr2
-      - libxrender1
+    - libatk1.0-0
+    - libcairo2
+    - libdatrie1
+    - libfontconfig1
+    - libfreetype6
+    - libfribidi0
+    - libgdk-pixbuf2.0-0
+    - libgraphite2-3
+    - libgtk2.0-0
+    - libharfbuzz0b
+    - libpango-1.0-0
+    - libpangocairo-1.0-0
+    - libpangoft2-1.0-0
+    - libpixman-1-0
+    - libpng16-16
+    - libthai0
+    - libx11-6
+    - libxau6
+    - libxcb-render0
+    - libxcb-shm0
+    - libxcb1
+    - libxcomposite1
+    - libxcursor1
+    - libxdamage1
+    - libxdmcp6
+    - libxext6
+    - libxfixes3
+    - libxi6
+    - libxinerama1
+    - libxrandr2
+    - libxrender1
 
+  desktop-gtk2:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-subdir: gtk
+    plugin: make
+    make-parameters: ["FLAVOR=gtk2"]
+    build-packages:
+    - build-essential
+    - libgtk2.0-dev
+    stage-packages:
+    - libxkbcommon0  # XKB_CONFIG_ROOT
+    - ttf-ubuntu-font-family
+    - dmz-cursor-theme
+    - light-themes
+    - adwaita-icon-theme
+    - gnome-themes-standard
+    - shared-mime-info
+    - libgtk2.0-0
+    - libgdk-pixbuf2.0-0
+    - libglib2.0-bin
+    - libgtk2.0-bin
+    - unity-gtk2-module
+    - locales-all
+    - libappindicator1
+    - xdg-user-dirs
+    - ibus-gtk
+    - libibus-1.0-5
+      
+# Additional plugs to pick up the GTK theme and icons from the system
+plugs: 
+  icon-themes:
+    interface: content
+    target: $SNAP/data-dir/icons
+    default-provider: gtk-common-themes
+  sound-themes:
+    interface: content
+    target: $SNAP/data-dir/sounds
+    default-provider: gtk-common-themes
+  gtk-2-engines:
+    interface: content
+    target: $SNAP/lib/gtk-2.0
+    default-provider: gtk2-common-themes:gtk-2-engines
+  gtk-2-themes:
+    interface: content
+    target: $SNAP/usr/share/themes
+    default-provider: gtk2-common-themes:gtk-2-themes
+
+environment:
+  XDG_DATA_DIRS: $SNAP/usr/share:$XDG_DATA_DIRS
+  GTK_PATH: $SNAP/lib/gtk-2.0
+  
 apps:
   acronym-decoder:
     command: usr/bin/AcronymDecoder
+    command-chain:
+    - bin/desktop-launch
     desktop: usr/share/applications/AcronymDecoder.desktop
     plugs:
-      - desktop
-      - x11
+    - desktop
+    - x11
+    - home
 
 layout:

trunk/Install/snap/snapcraft.yaml

@@ -35 +35 @@
       snapcraftctl build
       lazbuild --build-mode=Release AcronymDecoder.lpi
-      install -d -m 755 $ROOT/usr/bin
+      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/bin
       install -s -m 755 AcronymDecoder $SNAPCRAFT_PART_INSTALL/usr/bin/AcronymDecoder
       install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
-      install -m 644 Languages/AcronymDecoder.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Languages/AcronymDecoder.pot $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
       install -m 644 Languages/AcronymDecoder.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
-      install -m 644 Packages/Common/Languages/UJobProgressView.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UJobProgressView.pot $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
       install -m 644 Packages/Common/Languages/UJobProgressView.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
-      install -m 644 Packages/Common/Languages/UFormAbout.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
+      install -m 644 Packages/Common/Languages/UFormAbout.pot $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
       install -m 644 Packages/Common/Languages/UFormAbout.cs.po $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder/Languages
       install -d -m 755 $(ROOT)/usr/share/mime/packages
@@ -52 +52 @@
       install -m 644 Images/AcronymDecoder.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps/application-adp.png
       cp -r Examples $SNAPCRAFT_PART_INSTALL/usr/share/AcronymDecoder
+    after:
+    - desktop-gtk2
     stage:
     - etc