From 0174f42a56c3e95008ffc6a9771f2bb2d155f0f5 Mon Sep 17 00:00:00 2001 From: jblum Date: Sun, 28 Sep 2008 03:35:21 +0000 Subject: freedesktop git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9668 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 46 +++++ grc/freedesktop/gnuradio-grc.desktop | 8 + grc/freedesktop/gnuradio-grc.xml | 8 + grc/freedesktop/gnuradio-usrp_diagnostics.desktop | 7 + grc/freedesktop/grc-icon-256.png | Bin 0 -> 7843 bytes grc/freedesktop/grc-icon-256.svg | 216 ++++++++++++++++++++++ grc/freedesktop/grc-icon-32.png | Bin 0 -> 1060 bytes grc/freedesktop/grc-icon-48.png | Bin 0 -> 1691 bytes 8 files changed, 285 insertions(+) create mode 100644 grc/freedesktop/Makefile.am create mode 100644 grc/freedesktop/gnuradio-grc.desktop create mode 100644 grc/freedesktop/gnuradio-grc.xml create mode 100644 grc/freedesktop/gnuradio-usrp_diagnostics.desktop create mode 100644 grc/freedesktop/grc-icon-256.png create mode 100644 grc/freedesktop/grc-icon-256.svg create mode 100644 grc/freedesktop/grc-icon-32.png create mode 100644 grc/freedesktop/grc-icon-48.png (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am new file mode 100644 index 000000000..196d3a780 --- /dev/null +++ b/grc/freedesktop/Makefile.am @@ -0,0 +1,46 @@ +# +# Copyright 2008 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/grc/Makefile.inc + +install-data-local: + xdg-icon-resource install --context mimetypes --mode system --size 48 $(srcdir)/grc-icon-48.png application-gnuradio-grc + xdg-icon-resource install --context apps --mode system --size 256 $(srcdir)/grc-icon-256.png gnuradio-grc + xdg-icon-resource install --context apps --mode system --size 32 $(srcdir)/grc-icon-32.png gnuradio-grc + xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + +uninstall-local: + xdg-icon-resource uninstall --context mimetypes --mode system --size 48 application-gnuradio-grc + xdg-icon-resource uninstall --context apps --mode system --size 256 gnuradio-grc + xdg-icon-resource uninstall --context apps --mode system --size 32 gnuradio-grc + xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + +EXTRA_DIST = \ + $(srcdir)/grc-icon-256.png \ + $(srcdir)/grc-icon-48.png \ + $(srcdir)/grc-icon-32.png \ + $(srcdir)/gnuradio-grc.xml \ + $(srcdir)/gnuradio-grc.desktop \ + $(srcdir)/gnuradio-usrp_diagnostics.desktop diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-grc.desktop new file mode 100644 index 000000000..d9c70ca92 --- /dev/null +++ b/grc/freedesktop/gnuradio-grc.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=GRC +Exec=grc %F +Categories=Development; +MimeType=application/gnuradio-grc; +Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-grc.xml b/grc/freedesktop/gnuradio-grc.xml new file mode 100644 index 000000000..a5cb95d9f --- /dev/null +++ b/grc/freedesktop/gnuradio-grc.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/grc/freedesktop/gnuradio-usrp_diagnostics.desktop b/grc/freedesktop/gnuradio-usrp_diagnostics.desktop new file mode 100644 index 000000000..9a5000bb7 --- /dev/null +++ b/grc/freedesktop/gnuradio-usrp_diagnostics.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP Diagnostics +Exec=usrp_diagnostics +Categories=Development; +Icon=gnuradio-grc diff --git a/grc/freedesktop/grc-icon-256.png b/grc/freedesktop/grc-icon-256.png new file mode 100644 index 000000000..e4e8e54ae Binary files /dev/null and b/grc/freedesktop/grc-icon-256.png differ diff --git a/grc/freedesktop/grc-icon-256.svg b/grc/freedesktop/grc-icon-256.svg new file mode 100644 index 000000000..87526d46c --- /dev/null +++ b/grc/freedesktop/grc-icon-256.svg @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Patrick Strasser <patrick.strasser@tugraz.at> + + + Icon/Symbol for the GNURadio Companion + grc-icon.svg + 2007-02-23 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grc/freedesktop/grc-icon-32.png b/grc/freedesktop/grc-icon-32.png new file mode 100644 index 000000000..1e4f4f6c5 Binary files /dev/null and b/grc/freedesktop/grc-icon-32.png differ diff --git a/grc/freedesktop/grc-icon-48.png b/grc/freedesktop/grc-icon-48.png new file mode 100644 index 000000000..caddc92ad Binary files /dev/null and b/grc/freedesktop/grc-icon-48.png differ -- cgit From 719cb912950e20eab2a378636221c874d3544258 Mon Sep 17 00:00:00 2001 From: jblum Date: Sun, 28 Sep 2008 20:48:43 +0000 Subject: multiple icon sizes for apps and mimetypes git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9671 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 18 ++++++++++++------ grc/freedesktop/grc-icon-128.png | Bin 0 -> 3570 bytes grc/freedesktop/grc-icon-64.png | Bin 0 -> 1893 bytes 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 grc/freedesktop/grc-icon-128.png create mode 100644 grc/freedesktop/grc-icon-64.png (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 196d3a780..5d8521064 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -21,24 +21,30 @@ include $(top_srcdir)/grc/Makefile.inc +sizes = 32 48 64 128 256 + install-data-local: - xdg-icon-resource install --context mimetypes --mode system --size 48 $(srcdir)/grc-icon-48.png application-gnuradio-grc - xdg-icon-resource install --context apps --mode system --size 256 $(srcdir)/grc-icon-256.png gnuradio-grc - xdg-icon-resource install --context apps --mode system --size 32 $(srcdir)/grc-icon-32.png gnuradio-grc + for size in $(sizes); do \ + xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + done xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop uninstall-local: - xdg-icon-resource uninstall --context mimetypes --mode system --size 48 application-gnuradio-grc - xdg-icon-resource uninstall --context apps --mode system --size 256 gnuradio-grc - xdg-icon-resource uninstall --context apps --mode system --size 32 gnuradio-grc + for size in $(sizes); do \ + xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ + done xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop EXTRA_DIST = \ $(srcdir)/grc-icon-256.png \ + $(srcdir)/grc-icon-128.png \ + $(srcdir)/grc-icon-64.png \ $(srcdir)/grc-icon-48.png \ $(srcdir)/grc-icon-32.png \ $(srcdir)/gnuradio-grc.xml \ diff --git a/grc/freedesktop/grc-icon-128.png b/grc/freedesktop/grc-icon-128.png new file mode 100644 index 000000000..d94ef35dc Binary files /dev/null and b/grc/freedesktop/grc-icon-128.png differ diff --git a/grc/freedesktop/grc-icon-64.png b/grc/freedesktop/grc-icon-64.png new file mode 100644 index 000000000..fa8e06e28 Binary files /dev/null and b/grc/freedesktop/grc-icon-64.png differ -- cgit From 582c8108b5277ab3442ebdca6a2e919a6cb893a9 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 30 Sep 2008 15:58:01 +0000 Subject: gtk IconTheme module needs --theme gnome for some systems git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9681 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 5d8521064..192b20253 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -25,6 +25,7 @@ sizes = 32 48 64 128 256 install-data-local: for size in $(sizes); do \ + xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ done @@ -34,6 +35,7 @@ install-data-local: uninstall-local: for size in $(sizes); do \ + xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ done -- cgit From e5c137e191f0f0f9817e03b9d54c11788432da50 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 30 Sep 2008 16:53:46 +0000 Subject: test for xdg utils git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9682 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 192b20253..dbbf94ce4 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -24,24 +24,28 @@ include $(top_srcdir)/grc/Makefile.inc sizes = 32 48 64 128 256 install-data-local: - for size in $(sizes); do \ - xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ - done - xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + if test -s "`which xdg-mime`"; then \ + for size in $(sizes); do \ + xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + done; \ + xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml; \ + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop; \ + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ + fi uninstall-local: - for size in $(sizes); do \ - xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ - done - xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop + if test -s "`which xdg-mime`"; then \ + for size in $(sizes); do \ + xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ + done; \ + xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml; \ + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop; \ + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ + fi EXTRA_DIST = \ $(srcdir)/grc-icon-256.png \ -- cgit From 39f5fa920c360e84f757162572fa4aa999aea4ef Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 30 Sep 2008 19:43:04 +0000 Subject: AC check for xdg utils git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9684 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index dbbf94ce4..30073b951 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -24,28 +24,26 @@ include $(top_srcdir)/grc/Makefile.inc sizes = 32 48 64 128 256 install-data-local: - if test -s "`which xdg-mime`"; then \ - for size in $(sizes); do \ - xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ - done; \ - xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml; \ - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop; \ - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ - fi + for size in $(sizes); do \ + xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context apps --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ + done + xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop uninstall-local: - if test -s "`which xdg-mime`"; then \ - for size in $(sizes); do \ - xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ - done; \ - xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml; \ - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop; \ - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop; \ - fi + for size in $(sizes); do \ + xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --theme gnome --mode system --size $${size} gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ + done + xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop + xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop EXTRA_DIST = \ $(srcdir)/grc-icon-256.png \ -- cgit From 3c593c11e470e92372cb0d8d9b28f0eb8a62b22a Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 30 Sep 2008 23:56:59 +0000 Subject: robust check for xdg-utils git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9686 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/README | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 grc/freedesktop/README (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/README b/grc/freedesktop/README new file mode 100644 index 000000000..0857ecc22 --- /dev/null +++ b/grc/freedesktop/README @@ -0,0 +1,20 @@ +################################################## +# Freedesktop Notes +################################################## + +This directory contains icons, a mime type, and menu files for grc. +Installation of these files requires a set of tools called xdg-utils. +xdg-utils will install files in a standard way according to the freedesktop.org standards. + +Desktop enviroments that implement these standards are gnome, kde, xfce, and others. +If you have one of these desktop enviroments, xdg-utils should come installed. +If xdg-utils is not installed, then this directory will be ignored by the build. + +The gtk IconTheme module locates the installed icons for use inside the grc app. +On recent versions of gtk, IconTheme ignores the icons installed into the default theme. +This presents a problem for the gnome file system browser, nautilus, and the grc app. +As a solution, icons are also installed under the gnome theme. + +*.png files - these are the icons of various sizes +*.desktop files - these are the menu items for grc executables +*.xml file - this is the mime type for the saved flow graphs -- cgit From dfa8c9065b28729c342f0d345f506df63326a884 Mon Sep 17 00:00:00 2001 From: jblum Date: Fri, 3 Oct 2008 00:48:47 +0000 Subject: fixed error for non root install in ticket:298, moved install task for freedesktop into script git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9704 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 50 +++++++++++++------------------- grc/freedesktop/grc_setup_freedesktop.in | 43 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 30 deletions(-) create mode 100644 grc/freedesktop/grc_setup_freedesktop.in (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 30073b951..9595af88c 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -21,36 +21,26 @@ include $(top_srcdir)/grc/Makefile.inc -sizes = 32 48 64 128 256 +ourdatadir = $(grc_data_prefix)/freedesktop +dist_ourdata_DATA = \ + grc-icon-256.png \ + grc-icon-128.png \ + grc-icon-64.png \ + grc-icon-48.png \ + grc-icon-32.png \ + gnuradio-grc.xml \ + gnuradio-grc.desktop \ + gnuradio-usrp_diagnostics.desktop -install-data-local: - for size in $(sizes); do \ - xdg-icon-resource install --context mimetypes --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --theme gnome --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ - xdg-icon-resource install --context apps --mode system --size $${size} $(srcdir)/grc-icon-$${size}.png gnuradio-grc; \ - done - xdg-mime install --mode system $(srcdir)/gnuradio-grc.xml - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-grc.desktop - xdg-desktop-menu install --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop +dist_bin_SCRIPTS = grc_setup_freedesktop +BUILT_SOURCES = grc_setup_freedesktop +grc_setup_freedesktop: Makefile $(srcdir)/grc_setup_freedesktop.in + sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/grc_setup_freedesktop.in > $@ -uninstall-local: - for size in $(sizes); do \ - xdg-icon-resource uninstall --context mimetypes --theme gnome --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --mode system --size $${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --theme gnome --mode system --size $${size} gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --mode system --size $${size} gnuradio-grc; \ - done - xdg-mime uninstall --mode system $(srcdir)/gnuradio-grc.xml - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-grc.desktop - xdg-desktop-menu uninstall --mode system $(srcdir)/gnuradio-usrp_diagnostics.desktop +EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in +MOSTLYCLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = \ - $(srcdir)/grc-icon-256.png \ - $(srcdir)/grc-icon-128.png \ - $(srcdir)/grc-icon-64.png \ - $(srcdir)/grc-icon-48.png \ - $(srcdir)/grc-icon-32.png \ - $(srcdir)/gnuradio-grc.xml \ - $(srcdir)/gnuradio-grc.desktop \ - $(srcdir)/gnuradio-usrp_diagnostics.desktop +install-data-hook: grc_setup_freedesktop + grc_setup_freedesktop install +uninstall-hook: grc_setup_freedesktop + sh grc_setup_freedesktop uninstall . diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in new file mode 100644 index 000000000..b904ffff2 --- /dev/null +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -0,0 +1,43 @@ +#!/bin/sh +################################################## +# setup grc on a freedesktop platform +# $1 should be install or uninstall +# $2 is the optional path to the files +# when $2 is unspecified, the path is: +# @SRCDIR@ +################################################## + +ICON_SIZES="32 48 64 128 256" +if [ -n "$2" ]; then + SRCDIR="$2" +else + SRCDIR="@SRCDIR@" +fi + +case "$1" in +'install') + for size in ${ICON_SIZES}; do \ + xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ + xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ + done + xdg-mime install ${SRCDIR}/gnuradio-grc.xml + xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop + xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_diagnostics.desktop + ;; +'uninstall') + for size in ${ICON_SIZES}; do \ + xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ + xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ + done + xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml + xdg-desktop-menu uninstall gnuradio-grc.desktop + xdg-desktop-menu uninstall gnuradio-usrp_diagnostics.desktop + ;; +*) + echo "Usage: $0 [install|uninstall]" + ;; +esac -- cgit From da8b917e3393427c3556044915f5a4d1e5fba030 Mon Sep 17 00:00:00 2001 From: jblum Date: Fri, 3 Oct 2008 05:27:52 +0000 Subject: verbose messages for freedesktop installer, added missing import for main window git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9705 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 2 +- grc/freedesktop/grc_setup_freedesktop.in | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 9595af88c..3ec4ac5b2 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -43,4 +43,4 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) install-data-hook: grc_setup_freedesktop grc_setup_freedesktop install uninstall-hook: grc_setup_freedesktop - sh grc_setup_freedesktop uninstall . + bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index b904ffff2..526cc27e4 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ################################################## # setup grc on a freedesktop platform # $1 should be install or uninstall @@ -16,26 +16,38 @@ fi case "$1" in 'install') + echo "Begin freedesktop install..." for size in ${ICON_SIZES}; do \ + echo "Install icon: ${size}x${size}" xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ done + echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml + echo "Install menu items" xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; 'uninstall') + echo "Begin freedesktop uninstall..." for size in ${ICON_SIZES}; do \ + echo "Uninstall icon: ${size}x${size}" xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ done + echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml + echo "Uninstall menu items" xdg-desktop-menu uninstall gnuradio-grc.desktop xdg-desktop-menu uninstall gnuradio-usrp_diagnostics.desktop + echo "Done!" + echo "" ;; *) echo "Usage: $0 [install|uninstall]" -- cgit From e0feca2c67788dffeff9a21fb047a8965658e528 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 7 Oct 2008 18:32:29 +0000 Subject: re-enable grc, passes distcheck git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9723 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 3ec4ac5b2..3755f2e1e 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/grc/Makefile.inc ourdatadir = $(grc_data_prefix)/freedesktop + dist_ourdata_DATA = \ grc-icon-256.png \ grc-icon-128.png \ @@ -33,14 +34,16 @@ dist_ourdata_DATA = \ gnuradio-usrp_diagnostics.desktop dist_bin_SCRIPTS = grc_setup_freedesktop -BUILT_SOURCES = grc_setup_freedesktop -grc_setup_freedesktop: Makefile $(srcdir)/grc_setup_freedesktop.in - sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/grc_setup_freedesktop.in > $@ + +grc_setup_freedesktop: Makefile grc_setup_freedesktop.in + $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in -MOSTLYCLEANFILES = $(BUILT_SOURCES) + +MOSTLYCLEANFILES = grc_setup_freedesktop install-data-hook: grc_setup_freedesktop - grc_setup_freedesktop install + bash $(srcdir)/grc_setup_freedesktop install $(srcdir) + uninstall-hook: grc_setup_freedesktop bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) -- cgit From 7e36f7c719e0e9ed4d9f0e82926168ed4962aca9 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 7 Oct 2008 20:18:45 +0000 Subject: handy post install message -> no more automated installation of freedesktop git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9726 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 3755f2e1e..e3ef845c8 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -39,11 +39,17 @@ grc_setup_freedesktop: Makefile grc_setup_freedesktop.in $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in - -MOSTLYCLEANFILES = grc_setup_freedesktop - -install-data-hook: grc_setup_freedesktop - bash $(srcdir)/grc_setup_freedesktop install $(srcdir) - -uninstall-hook: grc_setup_freedesktop - bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir) +BUILT_SOURCES = grc_setup_freedesktop +MOSTLYCLEANFILES = $(BUILT_SOURCES) + +install-data-hook: + @printf "\n*** GRC Post-Install Message ***\ + \nTo install icons, mime type, and menu items\ + \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ + \n >>> sudo grc_setup_freedesktop install\n\n" + +uninstall-hook: + @printf "\n*** GRC Post-Uninstall Message ***\ + \nTo uninstall icons, mime type, and menu items\ + \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ + \n >>> sudo grc_setup_freedesktop uninstall\n\n" -- cgit From b419135854207311cd467a987a75884dbae75afd Mon Sep 17 00:00:00 2001 From: jblum Date: Fri, 10 Oct 2008 21:18:20 +0000 Subject: dont sed check, can end badly git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9768 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index e3ef845c8..b8e084d86 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -36,7 +36,7 @@ dist_ourdata_DATA = \ dist_bin_SCRIPTS = grc_setup_freedesktop grc_setup_freedesktop: Makefile grc_setup_freedesktop.in - $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ + sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in BUILT_SOURCES = grc_setup_freedesktop -- cgit From 66811bb61a014b7da27235cdb6219705243533a9 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 20 Jan 2009 04:59:13 +0000 Subject: call it probe git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10264 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 2 +- grc/freedesktop/gnuradio-usrp_diagnostics.desktop | 7 ------- grc/freedesktop/gnuradio-usrp_probe.desktop | 7 +++++++ grc/freedesktop/grc_setup_freedesktop.in | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 grc/freedesktop/gnuradio-usrp_diagnostics.desktop create mode 100644 grc/freedesktop/gnuradio-usrp_probe.desktop (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index b8e084d86..36a88de75 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -31,7 +31,7 @@ dist_ourdata_DATA = \ grc-icon-32.png \ gnuradio-grc.xml \ gnuradio-grc.desktop \ - gnuradio-usrp_diagnostics.desktop + gnuradio-usrp_probe.desktop dist_bin_SCRIPTS = grc_setup_freedesktop diff --git a/grc/freedesktop/gnuradio-usrp_diagnostics.desktop b/grc/freedesktop/gnuradio-usrp_diagnostics.desktop deleted file mode 100644 index 9a5000bb7..000000000 --- a/grc/freedesktop/gnuradio-usrp_diagnostics.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=USRP Diagnostics -Exec=usrp_diagnostics -Categories=Development; -Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-usrp_probe.desktop b/grc/freedesktop/gnuradio-usrp_probe.desktop new file mode 100644 index 000000000..136321994 --- /dev/null +++ b/grc/freedesktop/gnuradio-usrp_probe.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP Probe +Exec=usrp_probe +Categories=Development; +Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index 526cc27e4..2714356a2 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -28,7 +28,7 @@ case "$1" in xdg-mime install ${SRCDIR}/gnuradio-grc.xml echo "Install menu items" xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop - xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_diagnostics.desktop + xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_probe.desktop echo "Done!" echo "" ;; @@ -45,7 +45,7 @@ case "$1" in xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml echo "Uninstall menu items" xdg-desktop-menu uninstall gnuradio-grc.desktop - xdg-desktop-menu uninstall gnuradio-usrp_diagnostics.desktop + xdg-desktop-menu uninstall gnuradio-usrp_probe.desktop echo "Done!" echo "" ;; -- cgit From a6b928438657b86426c6ca04adec2030a865dab2 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 20 Jan 2009 22:44:51 +0000 Subject: probe for the usrp2 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10271 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 1 + grc/freedesktop/gnuradio-usrp2_probe.desktop | 7 +++++++ grc/freedesktop/grc_setup_freedesktop.in | 11 +++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 grc/freedesktop/gnuradio-usrp2_probe.desktop (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 36a88de75..fab6f87ad 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -31,6 +31,7 @@ dist_ourdata_DATA = \ grc-icon-32.png \ gnuradio-grc.xml \ gnuradio-grc.desktop \ + gnuradio-usrp2_probe.desktop \ gnuradio-usrp_probe.desktop dist_bin_SCRIPTS = grc_setup_freedesktop diff --git a/grc/freedesktop/gnuradio-usrp2_probe.desktop b/grc/freedesktop/gnuradio-usrp2_probe.desktop new file mode 100644 index 000000000..c71a092b1 --- /dev/null +++ b/grc/freedesktop/gnuradio-usrp2_probe.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP2 Probe +Exec=usrp2_probe +Categories=Development; +Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index 2714356a2..33fc4e1ac 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -8,6 +8,7 @@ ################################################## ICON_SIZES="32 48 64 128 256" +MENU_ITEMS="grc usrp2_probe usrp_probe" if [ -n "$2" ]; then SRCDIR="$2" else @@ -27,8 +28,9 @@ case "$1" in echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml echo "Install menu items" - xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop - xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_probe.desktop + for menu_item in ${MENU_ITEMS}; do \ + xdg-desktop-menu install ${SRCDIR}/gnuradio-${menu_item}.desktop; \ + done echo "Done!" echo "" ;; @@ -44,8 +46,9 @@ case "$1" in echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml echo "Uninstall menu items" - xdg-desktop-menu uninstall gnuradio-grc.desktop - xdg-desktop-menu uninstall gnuradio-usrp_probe.desktop + for menu_item in ${MENU_ITEMS}; do \ + xdg-desktop-menu uninstall gnuradio-${menu_item}.desktop; \ + done echo "Done!" echo "" ;; -- cgit From c3f962a1f0a4132ad643c58774bb69b190dccc49 Mon Sep 17 00:00:00 2001 From: jcorgan Date: Sat, 14 Mar 2009 02:28:41 +0000 Subject: Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index fab6f87ad..b167a0c66 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,7 +41,6 @@ grc_setup_freedesktop: Makefile grc_setup_freedesktop.in EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in BUILT_SOURCES = grc_setup_freedesktop -MOSTLYCLEANFILES = $(BUILT_SOURCES) install-data-hook: @printf "\n*** GRC Post-Install Message ***\ -- cgit From a635c00f360fafb89e64f04638642e716d075760 Mon Sep 17 00:00:00 2001 From: jblum Date: Thu, 28 May 2009 21:14:27 +0000 Subject: Make the hardcoded paths in grc optionally configurable from environment variables: GR_DOCDIR, GR_DATADIR Allows the grc data files to up-rooted for a package installation (specifically macosx). Hardcoded path is the default when environment variables are undefined. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11161 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index b167a0c66..79388ba3a 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/grc/Makefile.inc -ourdatadir = $(grc_data_prefix)/freedesktop +ourdatadir = $(pkgdatadir)/grc/freedesktop dist_ourdata_DATA = \ grc-icon-256.png \ @@ -36,8 +36,8 @@ dist_ourdata_DATA = \ dist_bin_SCRIPTS = grc_setup_freedesktop -grc_setup_freedesktop: Makefile grc_setup_freedesktop.in - sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@ +grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile + sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@ EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in BUILT_SOURCES = grc_setup_freedesktop -- cgit From 253018c6cdb114f5662a2d7ba8ed748c6e68e3a7 Mon Sep 17 00:00:00 2001 From: git Date: Fri, 14 Aug 2009 18:10:11 +0000 Subject: Added git ignore files auto created from svn:ignore properties. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11592 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/freedesktop/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 grc/freedesktop/.gitignore (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/.gitignore b/grc/freedesktop/.gitignore new file mode 100644 index 000000000..ff07a101f --- /dev/null +++ b/grc/freedesktop/.gitignore @@ -0,0 +1,3 @@ +/grc_setup_freedesktop +/Makefile +/Makefile.in -- cgit From 175c074ba74143d5af530e5cc4bd50335f64b1d5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 28 Oct 2009 14:33:52 -0700 Subject: Created a grc_blockdir in makefile.common. Switched the grc src prefix in grc makefiles. Removed grc/Makefile.inc as it was no longer neededed. --- grc/freedesktop/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 79388ba3a..bfbdee940 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -19,7 +19,7 @@ # Boston, MA 02110-1301, USA. # -include $(top_srcdir)/grc/Makefile.inc +include $(top_srcdir)/Makefile.common ourdatadir = $(pkgdatadir)/grc/freedesktop -- cgit From e3b1b9107725127eff1a51e5026a27367ee9d6d1 Mon Sep 17 00:00:00 2001 From: Stefan Bruns Date: Tue, 8 Dec 2009 13:22:34 -0500 Subject: Small patch to speedup installation of freedesktop icons. The attached patch changes the icon installation to update the icon cache only once instead of once per icon --- grc/freedesktop/grc_setup_freedesktop.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index 33fc4e1ac..db6506452 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -20,11 +20,12 @@ case "$1" in echo "Begin freedesktop install..." for size in ${ICON_SIZES}; do \ echo "Install icon: ${size}x${size}" - xdg-icon-resource install --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ - xdg-icon-resource install --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ - xdg-icon-resource install --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ + xdg-icon-resource install --noupdate --context mimetypes --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --noupdate --context mimetypes --size ${size} ${SRCDIR}/grc-icon-${size}.png application-gnuradio-grc; \ + xdg-icon-resource install --noupdate --context apps --theme gnome --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ + xdg-icon-resource install --noupdate --context apps --size ${size} ${SRCDIR}/grc-icon-${size}.png gnuradio-grc; \ done + xdg-icon-resource forceupdate echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml echo "Install menu items" -- cgit From 8944000061cbfb995e56b74ab03034ec3541caac Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 18 May 2010 13:53:39 -0700 Subject: grc: rename execution binary from 'grc' to 'gnuradio-companion' This change resolves a conflict with the Generic Colorizer application which also uses the binary name 'grc'. Interested users can add an alias to their shell environment to run gnuradio-companion when grc is invoked. --- grc/freedesktop/Makefile.am | 2 +- grc/freedesktop/gnuradio-gnuradio-companion.desktop | 8 ++++++++ grc/freedesktop/gnuradio-grc.desktop | 8 -------- grc/freedesktop/grc_setup_freedesktop.in | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 grc/freedesktop/gnuradio-gnuradio-companion.desktop delete mode 100644 grc/freedesktop/gnuradio-grc.desktop (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index bfbdee940..23bb70bf5 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -30,7 +30,7 @@ dist_ourdata_DATA = \ grc-icon-48.png \ grc-icon-32.png \ gnuradio-grc.xml \ - gnuradio-grc.desktop \ + gnuradio-gnuradio-companion.desktop \ gnuradio-usrp2_probe.desktop \ gnuradio-usrp_probe.desktop diff --git a/grc/freedesktop/gnuradio-gnuradio-companion.desktop b/grc/freedesktop/gnuradio-gnuradio-companion.desktop new file mode 100644 index 000000000..5fd049780 --- /dev/null +++ b/grc/freedesktop/gnuradio-gnuradio-companion.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=GRC +Exec=gnuradio-companion %F +Categories=Development; +MimeType=application/gnuradio-grc; +Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-grc.desktop deleted file mode 100644 index d9c70ca92..000000000 --- a/grc/freedesktop/gnuradio-grc.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=GRC -Exec=grc %F -Categories=Development; -MimeType=application/gnuradio-grc; -Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index db6506452..a0c5ac193 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -8,7 +8,7 @@ ################################################## ICON_SIZES="32 48 64 128 256" -MENU_ITEMS="grc usrp2_probe usrp_probe" +MENU_ITEMS="gnuradio-companion usrp2_probe usrp_probe" if [ -n "$2" ]; then SRCDIR="$2" else -- cgit From 95027c952aa1b8bca0d6795071f7b375d69350d0 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 29 May 2010 00:45:26 -0700 Subject: grc: move grc_setup_freedesktop into libexec directory (not in users path). Renamed grc desktop file to simplify name and updated install script. --- grc/freedesktop/Makefile.am | 12 ++++----- .../gnuradio-gnuradio-companion.desktop | 8 ------ grc/freedesktop/gnuradio-grc.desktop | 8 ++++++ grc/freedesktop/grc_setup_freedesktop.in | 31 ++++++++++++++++++---- 4 files changed, 40 insertions(+), 19 deletions(-) delete mode 100644 grc/freedesktop/gnuradio-gnuradio-companion.desktop create mode 100644 grc/freedesktop/gnuradio-grc.desktop (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index 23bb70bf5..f6aa97a93 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008,2009 Free Software Foundation, Inc. +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,7 +22,6 @@ include $(top_srcdir)/Makefile.common ourdatadir = $(pkgdatadir)/grc/freedesktop - dist_ourdata_DATA = \ grc-icon-256.png \ grc-icon-128.png \ @@ -30,11 +29,12 @@ dist_ourdata_DATA = \ grc-icon-48.png \ grc-icon-32.png \ gnuradio-grc.xml \ - gnuradio-gnuradio-companion.desktop \ + gnuradio-grc.desktop \ gnuradio-usrp2_probe.desktop \ gnuradio-usrp_probe.desktop -dist_bin_SCRIPTS = grc_setup_freedesktop +pkglibexecdir = $(libexecdir)/$(PACKAGE) +dist_pkglibexec_SCRIPTS = grc_setup_freedesktop grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@ @@ -46,10 +46,10 @@ install-data-hook: @printf "\n*** GRC Post-Install Message ***\ \nTo install icons, mime type, and menu items\ \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ - \n >>> sudo grc_setup_freedesktop install\n\n" + \n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop install\n\n" uninstall-hook: @printf "\n*** GRC Post-Uninstall Message ***\ \nTo uninstall icons, mime type, and menu items\ \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ - \n >>> sudo grc_setup_freedesktop uninstall\n\n" + \n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop uninstall\n\n" diff --git a/grc/freedesktop/gnuradio-gnuradio-companion.desktop b/grc/freedesktop/gnuradio-gnuradio-companion.desktop deleted file mode 100644 index 5fd049780..000000000 --- a/grc/freedesktop/gnuradio-gnuradio-companion.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=GRC -Exec=gnuradio-companion %F -Categories=Development; -MimeType=application/gnuradio-grc; -Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-grc.desktop new file mode 100644 index 000000000..5fd049780 --- /dev/null +++ b/grc/freedesktop/gnuradio-grc.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=GRC +Exec=gnuradio-companion %F +Categories=Development; +MimeType=application/gnuradio-grc; +Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index a0c5ac193..ab4ce82ef 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -1,4 +1,24 @@ #!/bin/bash +# +# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# ################################################## # setup grc on a freedesktop platform # $1 should be install or uninstall @@ -8,7 +28,7 @@ ################################################## ICON_SIZES="32 48 64 128 256" -MENU_ITEMS="gnuradio-companion usrp2_probe usrp_probe" +MENU_ITEMS="grc usrp2_probe usrp_probe" if [ -n "$2" ]; then SRCDIR="$2" else @@ -39,11 +59,12 @@ case "$1" in echo "Begin freedesktop uninstall..." for size in ${ICON_SIZES}; do \ echo "Uninstall icon: ${size}x${size}" - xdg-icon-resource uninstall --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context mimetypes --size ${size} application-gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --theme gnome --size ${size} gnuradio-grc; \ - xdg-icon-resource uninstall --context apps --size ${size} gnuradio-grc; \ + xdg-icon-resource uninstall --noupdate --context mimetypes --theme gnome --size ${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} application-gnuradio-grc; \ + xdg-icon-resource uninstall --noupdate --context apps --theme gnome --size ${size} gnuradio-grc; \ + xdg-icon-resource uninstall --noupdate --context apps --size ${size} gnuradio-grc; \ done + xdg-icon-resource forceupdate echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml echo "Uninstall menu items" -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- grc/freedesktop/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index f6aa97a93..dd7411bbb 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -39,8 +39,8 @@ dist_pkglibexec_SCRIPTS = grc_setup_freedesktop grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@ -EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in -BUILT_SOURCES = grc_setup_freedesktop +EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in +BUILT_SOURCES += grc_setup_freedesktop install-data-hook: @printf "\n*** GRC Post-Install Message ***\ -- cgit From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 13 Mar 2011 17:33:33 -0700 Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons. --- grc/freedesktop/Makefile.am | 8 ++++---- grc/freedesktop/gnuradio-usrp2_probe.desktop | 7 ------- grc/freedesktop/gnuradio-usrp_probe.desktop | 7 ------- grc/freedesktop/grc_setup_freedesktop.in | 11 +++-------- 4 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 grc/freedesktop/gnuradio-usrp2_probe.desktop delete mode 100644 grc/freedesktop/gnuradio-usrp_probe.desktop (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am index dd7411bbb..f89a344f7 100644 --- a/grc/freedesktop/Makefile.am +++ b/grc/freedesktop/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright 2008-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -29,9 +29,7 @@ dist_ourdata_DATA = \ grc-icon-48.png \ grc-icon-32.png \ gnuradio-grc.xml \ - gnuradio-grc.desktop \ - gnuradio-usrp2_probe.desktop \ - gnuradio-usrp_probe.desktop + gnuradio-grc.desktop pkglibexecdir = $(libexecdir)/$(PACKAGE) dist_pkglibexec_SCRIPTS = grc_setup_freedesktop @@ -42,6 +40,7 @@ grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in BUILT_SOURCES += grc_setup_freedesktop +if XDG_UTILS install-data-hook: @printf "\n*** GRC Post-Install Message ***\ \nTo install icons, mime type, and menu items\ @@ -53,3 +52,4 @@ uninstall-hook: \nTo uninstall icons, mime type, and menu items\ \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ \n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop uninstall\n\n" +endif diff --git a/grc/freedesktop/gnuradio-usrp2_probe.desktop b/grc/freedesktop/gnuradio-usrp2_probe.desktop deleted file mode 100644 index c71a092b1..000000000 --- a/grc/freedesktop/gnuradio-usrp2_probe.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=USRP2 Probe -Exec=usrp2_probe -Categories=Development; -Icon=gnuradio-grc diff --git a/grc/freedesktop/gnuradio-usrp_probe.desktop b/grc/freedesktop/gnuradio-usrp_probe.desktop deleted file mode 100644 index 136321994..000000000 --- a/grc/freedesktop/gnuradio-usrp_probe.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=USRP Probe -Exec=usrp_probe -Categories=Development; -Icon=gnuradio-grc diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in index ab4ce82ef..1e3546197 100644 --- a/grc/freedesktop/grc_setup_freedesktop.in +++ b/grc/freedesktop/grc_setup_freedesktop.in @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2008, 2009, 2010 Free Software Foundation, Inc. +# Copyright 2008-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,7 +28,6 @@ ################################################## ICON_SIZES="32 48 64 128 256" -MENU_ITEMS="grc usrp2_probe usrp_probe" if [ -n "$2" ]; then SRCDIR="$2" else @@ -49,9 +48,7 @@ case "$1" in echo "Install mime type" xdg-mime install ${SRCDIR}/gnuradio-grc.xml echo "Install menu items" - for menu_item in ${MENU_ITEMS}; do \ - xdg-desktop-menu install ${SRCDIR}/gnuradio-${menu_item}.desktop; \ - done + xdg-desktop-menu install ${SRCDIR}/*.desktop echo "Done!" echo "" ;; @@ -68,9 +65,7 @@ case "$1" in echo "Uninstall mime type" xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml echo "Uninstall menu items" - for menu_item in ${MENU_ITEMS}; do \ - xdg-desktop-menu uninstall gnuradio-${menu_item}.desktop; \ - done + xdg-desktop-menu uninstall `ls ${SRCDIR}/*.desktop | xargs -n1 basename` echo "Done!" echo "" ;; -- cgit From accb9f2fe8fd8f6a1e114adac5b15304b0e0012d Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 20 Jul 2011 19:04:32 -0700 Subject: gr: squashed cmakelists.txt into one commit --- grc/freedesktop/CMakeLists.txt | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 grc/freedesktop/CMakeLists.txt (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt new file mode 100644 index 000000000..2e74dd3be --- /dev/null +++ b/grc/freedesktop/CMakeLists.txt @@ -0,0 +1,47 @@ +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +SET(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop) + +INSTALL(FILES + grc-icon-256.png + grc-icon-128.png + grc-icon-64.png + grc-icon-48.png + grc-icon-32.png + gnuradio-grc.xml + gnuradio-grc.desktop + DESTINATION ${grc_freedesktop_path} + COMPONENT "grc" +) + +FIND_PROGRAM(HAVE_XDG_UTILS xdg-desktop-menu) + +IF(UNIX AND HAVE_XDG_UTILS) + SET(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path}) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/grc_setup_freedesktop.in + ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + @ONLY) + INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" + ) +ENDIF(UNIX AND HAVE_XDG_UTILS) -- cgit From 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 8 Oct 2011 17:11:12 -0700 Subject: gr: the CMakeLists.txt took a chill pill --- grc/freedesktop/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 2e74dd3be..8c0f53d9f 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -18,9 +18,9 @@ # Boston, MA 02110-1301, USA. ######################################################################## -SET(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop) +set(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop) -INSTALL(FILES +install(FILES grc-icon-256.png grc-icon-128.png grc-icon-64.png @@ -32,16 +32,16 @@ INSTALL(FILES COMPONENT "grc" ) -FIND_PROGRAM(HAVE_XDG_UTILS xdg-desktop-menu) +find_program(HAVE_XDG_UTILS xdg-desktop-menu) -IF(UNIX AND HAVE_XDG_UTILS) - SET(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path}) - CONFIGURE_FILE( +if(UNIX AND HAVE_XDG_UTILS) + set(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path}) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/grc_setup_freedesktop.in ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop @ONLY) - INSTALL( + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" ) -ENDIF(UNIX AND HAVE_XDG_UTILS) +endif(UNIX AND HAVE_XDG_UTILS) -- cgit From 00420d32081d8252bb37142b2be19a8a7c4dc4c4 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 8 Dec 2011 13:48:48 -0800 Subject: Removed autotools, gr-waveform, some cleanup Nick Foster owes Nick Corgan a six-pack of beer! --- grc/freedesktop/.gitignore | 3 --- grc/freedesktop/Makefile.am | 55 --------------------------------------------- 2 files changed, 58 deletions(-) delete mode 100644 grc/freedesktop/.gitignore delete mode 100644 grc/freedesktop/Makefile.am (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/.gitignore b/grc/freedesktop/.gitignore deleted file mode 100644 index ff07a101f..000000000 --- a/grc/freedesktop/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/grc_setup_freedesktop -/Makefile -/Makefile.in diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am deleted file mode 100644 index f89a344f7..000000000 --- a/grc/freedesktop/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright 2008-2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -ourdatadir = $(pkgdatadir)/grc/freedesktop -dist_ourdata_DATA = \ - grc-icon-256.png \ - grc-icon-128.png \ - grc-icon-64.png \ - grc-icon-48.png \ - grc-icon-32.png \ - gnuradio-grc.xml \ - gnuradio-grc.desktop - -pkglibexecdir = $(libexecdir)/$(PACKAGE) -dist_pkglibexec_SCRIPTS = grc_setup_freedesktop - -grc_setup_freedesktop: $(srcdir)/grc_setup_freedesktop.in Makefile - sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $< > $@ - -EXTRA_DIST += $(srcdir)/grc_setup_freedesktop.in -BUILT_SOURCES += grc_setup_freedesktop - -if XDG_UTILS -install-data-hook: - @printf "\n*** GRC Post-Install Message ***\ - \nTo install icons, mime type, and menu items\ - \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ - \n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop install\n\n" - -uninstall-hook: - @printf "\n*** GRC Post-Uninstall Message ***\ - \nTo uninstall icons, mime type, and menu items\ - \nfor a freedesktop.org system (Gnome/KDE/Xfce):\ - \n >>> sudo $(pkglibexecdir)/grc_setup_freedesktop uninstall\n\n" -endif -- cgit From 89af584a24f470027874e30a2e238de3bb5f0d1f Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 2 Feb 2012 13:25:50 -0800 Subject: grc: fix install permissions on grc_setup_freedesktop --- grc/freedesktop/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 8c0f53d9f..492b0f7d8 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,7 +41,7 @@ if(UNIX AND HAVE_XDG_UTILS) ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop @ONLY) install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop + PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc" ) endif(UNIX AND HAVE_XDG_UTILS) -- cgit From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future. The sed script was provided by Moritz Fischer. --- grc/freedesktop/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'grc/freedesktop') diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt index 492b0f7d8..d95fe04ac 100644 --- a/grc/freedesktop/CMakeLists.txt +++ b/grc/freedesktop/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2011-2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, -- cgit