[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: meson: convert post-install.sh to python

[Tanu Kaskinen]

Tanu Kaskinen pushed to branch master at PulseAudio / pulseaudio


Commits:
52314834 by David Heidelberg at 2019-11-14T19:10:00Z
meson: convert post-install.sh to python

Inspired by: https://gitlab.gnome.org/GNOME/gnome-characters/commit/36a2e4f8a7c42447f40a797005ddeae0255151d0#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa_0_14

Signed-off-by: David Heidelberg <david at ixit.cz>

- - - - -
4d9d4582 by David Heidelberg at 2019-11-14T19:11:01Z
meson: convert to install_headers

Instead of install_data use correct install_headers

Signed-off-by: David Heidelberg <david at ixit.cz>

- - - - -


5 changed files:

- Makefile.am
- src/modules/gsettings/meson.build
- + src/modules/gsettings/meson_post_install.py
- − src/modules/gsettings/post-install.sh
- src/pulse/meson.build


Changes:

=====================================
Makefile.am
=====================================
@@ -58,7 +58,7 @@ EXTRA_DIST = \
 	src/modules/bluetooth/meson.build \
 	src/modules/echo-cancel/meson.build \
 	src/modules/gsettings/meson.build \
-	src/modules/gsettings/post-install.sh \
+	src/modules/gsettings/meson_post_install.py \
 	src/modules/meson.build \
 	src/modules/oss/meson.build \
 	src/modules/raop/meson.build \


=====================================
src/modules/gsettings/meson.build
=====================================
@@ -29,7 +29,7 @@ install_data('org.freedesktop.pulseaudio.gschema.xml',
   install_dir : join_paths(datadir, 'glib-2.0', 'schemas')
 )
 
-meson.add_install_script('post-install.sh', datadir)
+meson.add_install_script('meson_post_install.py', datadir)
 
 # Conversion from GConf to GSettings
 


=====================================
src/modules/gsettings/meson_post_install.py
=====================================
@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+import sys
+
+datadir = sys.argv[1]
+
+# Package managers set this so we don't need to run
+if not os.environ.get('DESTDIR'):
+    schemadir = os.path.join(datadir, 'glib-2.0', 'schemas')
+    print('Compiling gsettings schemas...')
+    subprocess.call(['glib-compile-schemas', schemadir])
+


=====================================
src/modules/gsettings/post-install.sh deleted
=====================================
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-DATADIR="$1"
-
-# Package managers set this so we don't need to run
-if [ "${DESTDIR:-}" ]; then exit 0; fi
-
-echo "Compiling GSettings schemas..."
-glib-compile-schemas "$DATADIR/glib-2.0/schemas"


=====================================
src/pulse/meson.build
=====================================
@@ -86,9 +86,9 @@ libpulse = shared_library('pulse',
 
 libpulse_dep = declare_dependency(link_with: libpulse)
 
-install_data(
+install_headers(
   libpulse_headers, 'simple.h',
-  install_dir : join_paths(includedir, 'pulse')
+  subdir : 'pulse'
 )
 
 libpulse_simple = shared_library('pulse-simple',



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/a17cc55c4c9a0901d527d21c00093fd57a2847b5...4d9d458268fa3dbb8bebe489f7f281a4d2f5a01f

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/a17cc55c4c9a0901d527d21c00093fd57a2847b5...4d9d458268fa3dbb8bebe489f7f281a4d2f5a01f
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20191114/3b446696/attachment-0001.html>