GNOME.org
 

[gnome-weather] Respect Development Profile

commit a2817606237b2833e07a109bbcdf6bf952256d0f
Author: Falk Alexander Seidl <fseidl gnome org>
Date:   Sun Dec 9 19:48:23 2018 +0100

    Respect Development Profile

 data/meson.build                |  22 ++++----
 meson.build                     |   1 +
 org.gnome.Weather-unstable.json | 108 ++++++++++++++++++++++++----------------
 org.gnome.Weather.json          | 103 ++++++++++++++++++++++----------------
 src/meson.build                 |  12 ++---
 5 files changed, 144 insertions(+), 102 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 8ce8838..f9147aa 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -9,8 +9,8 @@ data_conf.set('pkgdatadir', pkgdatadir)
 message('Compiling resources')
 
 gnome.compile_resources(
-       application_id + '.Application.data',
-       application_id + '.Application.data.gresource.xml',
+       application_id_stable + '.Application.data',
+       application_id_stable + '.Application.data.gresource.xml',
        gresource_bundle: true,
        source_dir: '.',
        install_dir: DATA_DIR,
@@ -18,8 +18,8 @@ gnome.compile_resources(
 )
 
 gnome.compile_resources(
-       application_id + '.BackgroundService.data',
-       application_id + '.BackgroundService.data.gresource.xml',
+       application_id_stable + '.BackgroundService.data',
+       application_id_stable + '.BackgroundService.data.gresource.xml',
        gresource_bundle: true,
        source_dir: '.',
        install_dir: DATA_DIR,
@@ -28,7 +28,7 @@ gnome.compile_resources(
 
 # Installing the schema file
 install_data(
-       application_id + '.Application.gschema.xml',
+       application_id_stable + '.Application.gschema.xml',
        install_dir: 'share/glib-2.0/schemas'
 )
 
@@ -36,8 +36,8 @@ install_data(
 desktop_conf = configuration_data()
 desktop = i18n.merge_file(
        'desktop',
-       input: 'org.gnome.Weather.Application.desktop.in',
-       output: 'org.gnome.Weather.Application.desktop',
+       input: application_id_stable + '.Application.desktop.in',
+       output: application_id + '.Application.desktop',
        po_dir: join_paths(meson.source_root(), 'po'),
        type: 'desktop',
        install: true,
@@ -58,7 +58,7 @@ endif
 appdata_conf = configuration_data()
 appdata = i18n.merge_file(
        'appdata',
-       input: 'org.gnome.Weather.appdata.xml.in',
+       input: application_id_stable + '.appdata.xml.in',
        output: application_id + '.appdata.xml',
        install: true,
        install_dir: join_paths(join_paths('share'), 'metainfo'),
@@ -67,7 +67,7 @@ appdata = i18n.merge_file(
 
 
 configure_file(
-       input: application_id + '.Application.service.in',
+       input: application_id_stable + '.Application.service.in',
        output: application_id + '.Application.service',
        configuration: data_conf,
        install: true,
@@ -75,7 +75,7 @@ configure_file(
 )
 
 configure_file(
-       input: application_id + '.BackgroundService.service.in',
+       input: application_id_stable + '.BackgroundService.service.in',
        output: application_id + '.BackgroundService.service',
        configuration: data_conf,
        install: true,
@@ -84,7 +84,7 @@ configure_file(
 
 # Search Provider
 install_data(
-       application_id + '.Application.search-provider.ini',
+       application_id_stable + '.Application.search-provider.ini',
        install_dir: 'share/gnome-shell/search-providers'
 )
 
diff --git a/meson.build b/meson.build
index a48ad68..0bfef04 100644
--- a/meson.build
+++ b/meson.build
@@ -8,6 +8,7 @@ prefix = get_option('prefix')
 i18n = import('i18n')
 gnome = import('gnome')
 application_id = 'org.gnome.Weather'
+application_id_stable = 'org.gnome.Weather'
 
 message('Looking for dependencies')
 dependency('glib-2.0')
diff --git a/org.gnome.Weather-unstable.json b/org.gnome.Weather-unstable.json
index 8874c4f..c13d4c1 100644
--- a/org.gnome.Weather-unstable.json
+++ b/org.gnome.Weather-unstable.json
@@ -1,73 +1,97 @@
 {
-    "app-id": "org.gnome.Weather",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "/app/share/org.gnome.Weather/org.gnome.Weather.Application",
-    "tags": ["nightly"],
-    "finish-args": [
-        "--share=ipc", "--socket=x11",
+    "app-id" : "org.gnome.Weather",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "/app/share/org.gnome.Weather/org.gnome.WeatherDevel.Application",
+    "tags" : [
+        "nightly"
+    ],
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=x11",
         "--socket=wayland",
         "--share=network",
         "--system-talk-name=org.freedesktop.GeoClue2",
-        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g",
-        "env": {
-            "V": "1"
+        "cflags" : "-O2 -g",
+        "cxxflags" : "-O2 -g",
+        "env" : {
         }
     },
-    "cleanup": ["/include", "/lib/pkgconfig",
-                "/share/pkgconfig", "/share/aclocal",
-                "/man", "/share/man", "/share/gtk-doc",
-                "/share/vala",
-                "*.la", "*.a"],
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "/share/aclocal",
+        "/man",
+        "/share/man",
+        "/share/gtk-doc",
+        "/share/vala",
+        "*.la",
+        "*.a"
+    ],
     "cleanup-commands": [ "desktop-file-edit \"--set-name=(Development) Weather\" 
/app/share/applications/org.gnome.Weather.Application.desktop" ],
     "modules": [
         {
-            "name": "geocode-glib",
-            "config-opts": ["-Denable-installed-tests=false", "-Denable-gtk-doc=false"],
-            "buildsystem": "meson",
-            "sources": [
+            "name" : "geocode-glib",
+            "config-opts" : [
+                "-Denable-installed-tests=false",
+                "-Denable-gtk-doc=false"
+            ],
+            "buildsystem" : "meson",
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/geocode-glib.git";
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/geocode-glib.git";
                 }
             ]
         },
         {
-            "name": "libgweather",
-            "config-opts": ["-Denable_vala=false", "-Dgtk_doc=false"],
-            "buildsystem": "meson",
-            "sources": [
+            "name" : "libgweather",
+            "config-opts" : [
+                "-Denable_vala=false",
+                "-Dgtk_doc=false"
+            ],
+            "buildsystem" : "meson",
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libgweather.git";
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libgweather.git";
                 }
             ]
         },
         {
-            "name": "gnome-desktop",
-            "buildsystem": "meson",
-            "config-opts": ["-Ddebug_tools=false", "-Dudev=disabled", "-Ddesktop_docs=false"],
-            "sources": [
+            "name" : "gnome-desktop",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Ddebug_tools=false",
+                "-Dudev=disabled",
+                "-Ddesktop_docs=false"
+            ],
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-desktop.git";
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git";
                 }
             ]
         },
         {
-            "name": "gnome-weather",
-            "sources": [
+            "name" : "gnome-weather",
+            "config-opts": [
+                "-Dprofile=development"
+            ],
+            "sources" : [
                 {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-weather.git";
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-weather.git";
                 }
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/org.gnome.Weather.json b/org.gnome.Weather.json
index d22ac6b..458f2c4 100644
--- a/org.gnome.Weather.json
+++ b/org.gnome.Weather.json
@@ -1,71 +1,88 @@
 {
-    "app-id": "org.gnome.Weather",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.26",
-    "branch": "stable",
-    "sdk": "org.gnome.Sdk",
-    "command": "/app/share/org.gnome.Weather/org.gnome.Weather.Application",
-    "finish-args": [
-        "--share=ipc", "--socket=x11",
+    "app-id" : "org.gnome.Weather",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.26",
+    "branch" : "stable",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "/app/share/org.gnome.Weather/org.gnome.Weather.Application",
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=x11",
         "--socket=wayland",
         "--share=network",
         "--system-talk-name=org.freedesktop.GeoClue2",
-        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
     ],
     "build-options" : {
-        "cflags": "-O2 -g",
-        "cxxflags": "-O2 -g",
-        "env": {
-            "V": "1"
+        "cflags" : "-O2 -g",
+        "cxxflags" : "-O2 -g",
+        "env" : {
         }
     },
-    "cleanup": ["/include", "/lib/pkgconfig",
-                "/share/pkgconfig", "/share/aclocal",
-                "/man", "/share/man", "/share/gtk-doc",
-                "/share/vala",
-                "*.la", "*.a"],
-    "modules": [
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "/share/aclocal",
+        "/man",
+        "/share/man",
+        "/share/gtk-doc",
+        "/share/vala",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
         {
-            "name": "geocode-glib",
-            "config-opts": ["--disable-static"],
-            "sources": [
+            "name" : "geocode-glib",
+            "config-opts" : [
+                "--disable-static"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": 
"https://download.gnome.org/sources/geocode-glib/3.25/geocode-glib-3.25.4.1.tar.xz";,
-                    "sha256": "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778"
+                    "type" : "archive",
+                    "url" : 
"https://download.gnome.org/sources/geocode-glib/3.25/geocode-glib-3.25.4.1.tar.xz";,
+                    "sha256" : "f10169262c313dfaa21acf00687c01e0aaf52983524648e8b9e8e42c052dd778"
                 }
             ]
         },
         {
-            "name": "libgweather",
-            "config-opts": ["--disable-static", "--disable-vala"],
-            "sources": [
+            "name" : "libgweather",
+            "config-opts" : [
+                "--disable-static",
+                "--disable-vala"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libgweather/3.26/libgweather-3.26.1.tar.xz";,
-                    "sha256": "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"
+                    "type" : "archive",
+                    "url" : "https://download.gnome.org/sources/libgweather/3.26/libgweather-3.26.1.tar.xz";,
+                    "sha256" : "fca78470b345bce948e0333cab0a7c52c32562fc4a75de37061248a64e8fc4b8"
                 }
             ]
         },
         {
-            "name": "gnome-desktop",
-            "config-opts": ["--disable-debug-tools", "--disable-udev"],
-            "sources": [
+            "name" : "gnome-desktop",
+            "config-opts" : [
+                "--disable-debug-tools",
+                "--disable-udev"
+            ],
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": 
"https://download.gnome.org/sources/gnome-desktop/3.26/gnome-desktop-3.26.0.tar.xz";,
-                    "sha256": "8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2"
+                    "type" : "archive",
+                    "url" : 
"https://download.gnome.org/sources/gnome-desktop/3.26/gnome-desktop-3.26.0.tar.xz";,
+                    "sha256" : "8a99a084ea06fba20f5c547822dd8e36758676714729c7ae7b44ae3deca57be2"
                 }
             ]
         },
         {
-            "name": "gnome-weather",
-            "sources": [
+            "name" : "gnome-weather",
+            "sources" : [
                 {
-                    "type": "archive",
-                    "url": 
"https://download.gnome.org/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz";,
-                    "sha256": "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"
+                    "type" : "archive",
+                    "url" : 
"https://download.gnome.org/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz";,
+                    "sha256" : "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"
                 }
             ]
         }
diff --git a/src/meson.build b/src/meson.build
index d18a0e6..3bce183 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,7 +6,7 @@ source_conf.set('libdir', EXTENSION_DIR)
 source_conf.set('prefix', prefix)
 
 configure_file(
-       input: application_id + '.Application.in',
+       input: application_id_stable + '.Application.in',
        output: application_id + '.Application',
        configuration: source_conf,
        install: true,
@@ -14,7 +14,7 @@ configure_file(
 )
 
 configure_file(
-       input: application_id + '.BackgroundService.in',
+       input: application_id_stable + '.BackgroundService.in',
        output: application_id + '.BackgroundService',
        configuration: source_conf,
        install: true,
@@ -22,16 +22,16 @@ configure_file(
 )
 
 gnome.compile_resources(
-       application_id + '.Application.src',
-       application_id + '.Application.src.gresource.xml',
+       application_id_stable + '.Application.src',
+       application_id_stable + '.Application.src.gresource.xml',
        gresource_bundle: true,
        install: true,
        install_dir: DATA_DIR
 )
 
 gnome.compile_resources(
-       application_id + '.BackgroundService.src',
-       application_id + '.BackgroundService.src.gresource.xml',
+       application_id_stable + '.BackgroundService.src',
+       application_id_stable + '.BackgroundService.src.gresource.xml',
        gresource_bundle: true,
        install: true,
        install_dir: DATA_DIR
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]