[nautilus] Replacing gcovr module with gcovr.json



commit 9e166fc9eeb11356ed582b2486dcb1e483d308f8
Author: Vaibhav Yadav <yadav vaibhav46 yahoo com>
Date:   Fri Nov 2 11:50:35 2018 +0000

    Replacing gcovr module with gcovr.json
    
    Currently network is used during build time because of pip fetching from
    internet.
    However network should not be used during build time.
    To fix this issue, use gcovr.json generated by flatpak-pip-generator
    and replace them with gcovr module in org.gnome.Nautilus.json and
    org.gnome.Nautilus.yml and remove build option that uses network.
    
    Closes issue https://gitlab.gnome.org/GNOME/nautilus/issues/681

 build-aux/flatpak/gcovr.json              | 24 ++++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Nautilus.json | 20 +-------------------
 build-aux/flatpak/org.gnome.Nautilus.yml  | 12 +-----------
 3 files changed, 26 insertions(+), 30 deletions(-)
---
diff --git a/build-aux/flatpak/gcovr.json b/build-aux/flatpak/gcovr.json
new file mode 100644
index 000000000..399c6aa37
--- /dev/null
+++ b/build-aux/flatpak/gcovr.json
@@ -0,0 +1,24 @@
+{
+    "name": "python3-gcovr",
+    "buildsystem": "simple",
+    "build-commands": [
+        "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} gcovr"
+    ],
+    "sources": [
+        {
+            "type": "file",
+            "url": 
"https://files.pythonhosted.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/MarkupSafe-1.0.tar.gz";,
+            "sha256": "a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665"
+        },
+        {
+            "type": "file",
+            "url": 
"https://files.pythonhosted.org/packages/ed/f2/140298e4696c41fb17e8399166ea73cfe3fb9938faaf814b7e72f8b2e157/gcovr-4.1.tar.gz";,
+            "sha256": "ca94c337f2d9a70db177ec4330534fad7b2b772beda625c1ec071fbcf1361e22"
+        },
+        {
+            "type": "file",
+            "url": 
"https://files.pythonhosted.org/packages/56/e6/332789f295cf22308386cf5bbd1f4e00ed11484299c5d7383378cf48ba47/Jinja2-2.10.tar.gz";,
+            "sha256": "f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index b3ae6dae3..c0b640d4b 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -25,26 +25,8 @@
         "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
         "--env=TRACKER_SPARQL_BACKEND=bus"
     ],
-    "build-options" : {
-        "build-args" : [
-            "--share=network"
-        ]
-    },
     "modules" : [
-        {
-            "name" : "gcovr",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "/usr/bin/pip3 --disable-pip-version-check install --prefix=/app --verbose ."
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/gcovr/gcovr";,
-                    "tag" : "4.1"
-                }
-            ]
-        },
+        "gcovr.json",
         {
             "name" : "exiv2",
             "config-opts" : [
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 874fbf68c..c69166795 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -23,18 +23,8 @@ finish-args:
 - "--talk-name=ca.desrt.dconf"
 - "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
 - "--env=TRACKER_SPARQL_BACKEND=bus"
-build-options:
-  build-args:
-  - "--share=network"
 modules:
-- name: gcovr
-  buildsystem: simple
-  build-commands:
-  - "/usr/bin/pip3 --disable-pip-version-check install --prefix=/app --verbose ."
-  sources:
-  - type: git
-    url: https://github.com/gcovr/gcovr
-    tag: '4.1'
+- gcovr.json
 - name: exiv2
   config-opts:
   - "-DCMAKE_INSTALL_PREFIX=/app"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]