[gnome-control-center] wacom: Add "update-from-gsd" target
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] wacom: Add "update-from-gsd" target
- Date: Wed, 25 Jan 2012 19:13:38 +0000 (UTC)
commit abbc0210e608356080d900afed23cde6620ed985
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jan 25 19:11:52 2012 +0000
wacom: Add "update-from-gsd" target
To update common files from gnome-settings-daemon
panels/wacom/Makefile.am | 9 +++++++++
panels/wacom/update-from-gsd.sh | 26 ++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index 660ba90..4e501e2 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -73,6 +73,15 @@ desktopdir = $(datadir)/applications
desktop_in_files = gnome-wacom-panel.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+WACOMDIR=$(top_srcdir)/../gnome-settings-daemon/plugins/wacom/
+WACOMFILES=gsd-wacom-device.c gsd-wacom-device.h
+COMMONDIR=$(top_srcdir)/../gnome-settings-daemon/plugins/common/
+COMMONFILES=gsd-wacom-device.c gsd-wacom-device.h
+update-from-gsd:
+ FILES="$(WACOMFILES)" DIR="$(WACOMDIR)" $(srcdir)/update-from-gsd.sh && changed=true ; \
+ FILES="$(COMMONFILES)" DIR="$(WACOMDIR)" $(srcdir)/update-from-gsd.sh && changed=true ; \
+ git commit -m "wacom: Update from gnome-settings-daemon" $(WACOMFILES) $(COMMONFILES)
+
CLEANFILES = $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(ui_DATA) $(pixmap_DATA)
diff --git a/panels/wacom/update-from-gsd.sh b/panels/wacom/update-from-gsd.sh
new file mode 100755
index 0000000..6eccb4c
--- /dev/null
+++ b/panels/wacom/update-from-gsd.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+function die() {
+ echo $*
+ exit 1
+}
+
+if test -z "$DIR"; then
+ echo "Must set DIR"
+ exit 1
+fi
+
+if test -z "$FILES"; then
+ echo "Must set FILES"
+ exit 1
+fi
+
+for FILE in $FILES; do
+ if cmp -s $DIR/$FILE $FILE; then
+ echo "File $FILE is unchanged"
+ else
+ cp $DIR/$FILE $FILE || die "Could not move $DIR/$FILE to $FILE"
+ echo "Updated $FILE"
+ git add $FILE
+ fi
+done
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]