From 7d27d9d398b92e73aa47dd37e4418166c03bf0ca Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 10 May 2007 03:12:44 +0000 Subject: [PATCH] kill the .in's for xml. we're not installing the xsd to the filesystem anymore anyways. kill the openbox-kde and openbox-gnome, we're going to have to do it different. put the full path to the openbox binary in the openbox-*-session files by using .in's --- Makefile.am | 22 +- data/{menu.xml.in => menu.xml} | 3 +- data/rc.xml | 491 ++++++++++++++++++ data/xsession/openbox-gnome | 4 - ...gnome-session => openbox-gnome-session.in} | 2 +- data/xsession/openbox-kde | 4 - ...box-kde-session => openbox-kde-session.in} | 2 +- 7 files changed, 506 insertions(+), 22 deletions(-) rename data/{menu.xml.in => menu.xml} (93%) create mode 100644 data/rc.xml delete mode 100755 data/xsession/openbox-gnome rename data/xsession/{openbox-gnome-session => openbox-gnome-session.in} (66%) mode change 100755 => 100644 delete mode 100755 data/xsession/openbox-kde rename data/xsession/{openbox-kde-session => openbox-kde-session.in} (70%) mode change 100755 => 100644 diff --git a/Makefile.am b/Makefile.am index 35ccca9c..95b017a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,9 +32,7 @@ bin_PROGRAMS = \ bin_SCRIPTS = \ data/xsession/openbox-gnome-session \ - data/xsession/openbox-kde-session \ - data/xsession/openbox-gnome \ - data/xsession/openbox-kde + data/xsession/openbox-kde-session noinst_PROGRAMS = \ tools/themetoxml/themetoxml @@ -377,19 +375,23 @@ nodist_rc_DATA = \ edit = $(SED) \ -e 's!@version\@!$(VERSION)!' \ - -e 's!@xsddir\@!$(xsddir)!' + -e 's!@bindir\@!$(bindir)!' -data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data +data/xsession/openbox-gnome-session: Makefile data \ + $(srcdir)/data/xsession/openbox-gnome-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/rc.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@ + @chmod +x $@ -data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data +data/xsession/openbox-kde-session: Makefile data \ + $(srcdir)/data/xsession/openbox-kde-session.in @echo make: creating $@ @rm -f $@ @mkdir data 2>/dev/null || true - @$(edit) $(srcdir)/data/menu.xml.in >$@ + @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@ + @chmod +x $@ dist_gnomewmfiles_DATA = \ data/gnome-wm-properties/openbox.desktop \ @@ -406,8 +408,8 @@ dist_noinst_DATA = \ data/rc.xsd \ data/menu.xsd \ data/themerc.xsd \ - data/rc.xml.in \ - data/menu.xml.in \ + data/xsession/openbox-gnome-session.in \ + data/xsession/openbox-kde-session.in \ render/obrender-3.0.pc.in \ parser/obparser-3.0.pc.in \ tools/themeupdate/themeupdate.py \ diff --git a/data/menu.xml.in b/data/menu.xml similarity index 93% rename from data/menu.xml.in rename to data/menu.xml index 9f86dd6a..3f070737 100644 --- a/data/menu.xml.in +++ b/data/menu.xml @@ -2,8 +2,7 @@ + xsi:schemaLocation="http://openbox.org/"> diff --git a/data/rc.xml b/data/rc.xml new file mode 100644 index 00000000..a224f6b1 --- /dev/null +++ b/data/rc.xml @@ -0,0 +1,491 @@ + + + + + + + + 10 + 20 + no + + + + yes + no + no + 0 + no + + + + Smart + + + + + Clearlooks + NLIMC + yes + + yes + yes + + sans + 7 + + bold + + normal + + + + sans + 7 + + bold + + normal + + + + sans + 8 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + sans + 9 + + bold + + normal + + + + + + + 4 + 1 + + desktop one + desktop two + desktop three + desktop four + + + + + yes + Nonpixel + + Center + + + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + 300 + Middle + + + + C-g + + + + + + + + + + + + no + + + no + + + no + + + no + + + no + + + no + + + no + + + no + + + + + + + + + + + + + + + yes + + + yes + + + + + + + + + + + + client-menu + + + + + 3 + 200 + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-list-menu + + + root-menu + + + + + + + + + + + + + + + + + + + + + + + menu.xml + 250 + no + 0 + yes + + + + + + + + + + yes + + no + + + + center + + 200 + + 1 + + + + yes + + + 1 + + + normal + + + no + + no + + + no + + + yes + + true + + + + --> + + diff --git a/data/xsession/openbox-gnome b/data/xsession/openbox-gnome deleted file mode 100755 index c146aa81..00000000 --- a/data/xsession/openbox-gnome +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# A temporary script to be replaced by a real program.. -exec openbox --restart-binary openbox-gnome "$@" diff --git a/data/xsession/openbox-gnome-session b/data/xsession/openbox-gnome-session.in old mode 100755 new mode 100644 similarity index 66% rename from data/xsession/openbox-gnome-session rename to data/xsession/openbox-gnome-session.in index d2b77014..c2bc9399 --- a/data/xsession/openbox-gnome-session +++ b/data/xsession/openbox-gnome-session.in @@ -1,5 +1,5 @@ #!/bin/sh # Run GNOME with Openbox as its window manager -export WINDOW_MANAGER=openbox-gnome +export WINDOW_MANAGER="@bindir@/openbox" exec gnome-session "$@" diff --git a/data/xsession/openbox-kde b/data/xsession/openbox-kde deleted file mode 100755 index 87a5812c..00000000 --- a/data/xsession/openbox-kde +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# A temporary script to be replaced by a real program.. -exec openbox --restart-binary openbox-kde "$@" diff --git a/data/xsession/openbox-kde-session b/data/xsession/openbox-kde-session.in old mode 100755 new mode 100644 similarity index 70% rename from data/xsession/openbox-kde-session rename to data/xsession/openbox-kde-session.in index 589a2c56..0fe00940 --- a/data/xsession/openbox-kde-session +++ b/data/xsession/openbox-kde-session.in @@ -1,5 +1,5 @@ #!/bin/sh # Run KDE with Openbox as its window manager -export KDEWM=openbox-kde +export KDEWM="@bindir@/openbox" exec startkde "$@" -- 2.45.2