From: Ben Hutchings Date: Thu, 7 Feb 2008 20:29:08 +0000 (+0000) Subject: [svn-upgrade] Integrating new upstream version, ion3 (20080207) X-Git-Tag: 20080207 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=5e1e6e6c4467839ec70cee64dc1faabcf08e2a5f;p=ion3.git [svn-upgrade] Integrating new upstream version, ion3 (20080207) --- diff --git a/ChangeLog b/ChangeLog index e261047..7551588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,50 @@ +2008-02-05 17:40 UTC Tuomo Valkonen + tagged ion-3-20080207 + +2008-02-04 22:51 UTC Tuomo Valkonen + * Release notes + +2008-02-04 22:50 UTC Tuomo Valkonen + * More cfg_ion.lua embedded documentation + +2008-02-03 08:34 UTC Tuomo Valkonen + * Added same rootwin check for 'target' winprop + +2008-02-03 08:34 UTC Tuomo Valkonen + * 'jumpto' wasn't working well with pointer_focus_hack + +2008-02-02 08:31 UTC Tuomo Valkonen + * README improvement + +2008-01-21 19:38 UTC Tuomo Valkonen + * Enabled default statusbar template in cfg_statusbar.lua + (Some seem to have trouble understanding commented-out settings.) + +2008-01-21 15:45 UTC Tuomo Valkonen + * ioncore.set{mousefocus='disabled'} setting support had been lost at + some point, and documentation was wrong too. + +2008-01-18 16:47 UTC Tuomo Valkonen + * Some cfg_ion.lua documentation + +2008-01-07 18:39 UTC Tuomo Valkonen + * Some build system improvements for nicer .exe handling + +2008-01-07 18:02 UTC Tuomo Valkonen + * Added CF_NO_GET_LOADAVG + +2008-01-06 20:41 UTC Tuomo Valkonen + * Dockapp WM_CLASS hack had been broken. Fixed. + +2008-01-04 15:25 UTC Tuomo Valkonen + * Removed defer-pending on destroy warning + +2008-01-03 21:38 UTC Tuomo Valkonen + * Some header comments weren't up-to-date + +2008-01-03 18:49 UTC Tuomo Valkonen + * Bah, statusd build was still broken + 2008-01-03 18:23 UTC Tuomo Valkonen tagged ion-3rc-20080103 diff --git a/README b/README index 407c55e..3e8fd63 100644 --- a/README +++ b/README @@ -19,8 +19,7 @@ Building and installing * Lua 5.1 * gettext -2. Edit `system.mk` to suit your system. Most GNU/Linux users should - need very few changes. +2. Edit `system.mk` to suit your system. 3. If you want to build some extra modules now or do not want to build some of the standard modules, edit `modulelist.mk`. diff --git a/RELNOTES b/RELNOTES index 07c9cd6..d5190c0 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,10 @@ +ion-3-20080207 +-------------- + +. + + ion-3rc-20080103 ---------------- diff --git a/build/rules.mk b/build/rules.mk index 488a02a..d538bbc 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -16,6 +16,17 @@ LUA_COMPILED := $(subst .lua,.lc, $(LUA_SOURCES)) TARGETS := $(TARGETS) $(LUA_COMPILED) endif +ifdef EXTRA_EXECUTABLE +EXECUTABLE := $(EXTRA_EXECUTABLE) +BINDIR_ := $(EXTRABINDIR) +endif + +ifdef EXECUTABLE +BINDIR_ ?= $(BINDIR) +EXECUTABLE_ := $(EXECUTABLE)$(BIN_SUFFIX) +TARGETS := $(TARGETS) $(EXECUTABLE_) +endif + # Main targets ###################################### @@ -87,6 +98,42 @@ endif # !MAKE_EXPORTS OBJS=$(subst .c,.o,$(SOURCES) $(EXPORTS_C)) + +ifdef EXECUTABLE + +ifdef MODULE_LIST +ifdef MODULE_PATH +ifeq ($(PRELOAD_MODULES),1) +EXT_OBJS += $(foreach mod, $(MODULE_LIST), $(MODULE_PATH)/$(mod)/$(mod).a) +DEPEND_DEPENDS += preload.c +SOURCES += preload.c +TO_CLEAN += preload.c +else # !PRELOAD_MODULES +LDFLAGS += $(EXPORT_DYNAMIC) +WHOLEA = -Wl,-whole-archive +NO_WHOLEA = -Wl,-no-whole-archive +endif # !PRELOAD_MODULES + +preload.c: + $(LUA) $(TOPDIR)/build/mkpreload.lua $(MODULE_LIST) > preload.c + +endif # MODULE_PATH +endif # MODULE_LIST + +ifeq ($(RELOCATABLE),1) +DEFINES += -DCF_RELOCATABLE_BIN_LOCATION=\"$(BINDIR_)/$(EXECUTABLE)\" +endif + +$(EXECUTABLE_): $(OBJS) $(EXT_OBJS) + $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ + +executable_install: + $(INSTALLDIR) $(BINDIR_) + $(INSTALLBIN) $(EXECUTABLE_) $(BINDIR_) + +endif # EXECUTABLE + + ifdef MODULE ifneq ($(PRELOAD_MODULES),1) diff --git a/etc/cfg_ion.lua b/etc/cfg_ion.lua index 726d654..c16103a 100644 --- a/etc/cfg_ion.lua +++ b/etc/cfg_ion.lua @@ -3,7 +3,14 @@ -- -- This file only includes some settings that are rather frequently altered. -- The rest of the settings are in cfg_ioncore.lua and individual modules' --- configuration files (cfg_modulename.lua). +-- configuration files (cfg_modulename.lua). +-- +-- When any binding and other customisations that you want are minor, it is +-- recommended that you include them in a copy of this file in ~/.ion3/. +-- Simply create or copy the relevant settings at the end of this file (from +-- the other files), recalling that a key can be unbound by passing 'nil' +-- (without the quotes) as the callback. For more information, please see +-- the Ion configuration manual available from the Ion Web page. -- -- Set default modifiers. Alt should usually be mapped to Mod1 on @@ -57,7 +64,7 @@ ioncore.set{ -- modules with 'mod' replaced by 'cfg'. dopath("cfg_defaults") --- Load configuration of the Ion 'core' +-- Load configuration of the Ion 'core'. Most bindings are here. --dopath("cfg_ioncore") -- Load some kludges to make apps behave better. @@ -66,7 +73,8 @@ dopath("cfg_defaults") -- Define some layouts. --dopath("cfg_layouts") --- Load some modules. +-- Load some modules. Bindings and other configuration specific to modules +-- are in the files cfg_modulename.lua. --dopath("mod_query") --dopath("mod_menu") --dopath("mod_tiling") diff --git a/etc/cfg_statusbar.lua b/etc/cfg_statusbar.lua index 82fa506..dd04c32 100644 --- a/etc/cfg_statusbar.lua +++ b/etc/cfg_statusbar.lua @@ -36,6 +36,7 @@ mod_statusbar.create{ -- right, respectively, and %systray is a placeholder for system tray -- windows and icons. -- + template="[ %date || load: %load ] %filler%systray", --template="[ %date || load:% %>load || mail:% %>mail_new/%>mail_total ] %filler%systray", --template="[ %date || load: %05load_1min || mail: %02mail_new/%02mail_total ] %filler%systray", } diff --git a/exact-version b/exact-version index 3ed2119..45a6e95 100644 --- a/exact-version +++ b/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-3rc-20080103 -Tuomo Valkonen **20080103182346] +[TAG ion-3-20080207 +Tuomo Valkonen **20080205174053] diff --git a/ion/Makefile b/ion/Makefile index d723946..6ab6c28 100644 --- a/ion/Makefile +++ b/ion/Makefile @@ -11,34 +11,20 @@ include $(TOPDIR)/modulelist.mk ###################################### -SOURCES=ion.c +EXECUTABLE = ion3 -TARGETS=ion3 +SOURCES = ion.c -INCLUDES += $(X11_INCLUDES) +INCLUDES += $(X11_INCLUDES) INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) INCLUDES += -I.. -LIBS += $(X11_LIBS) +LIBS += $(X11_LIBS) -lSM -lICE LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA) LIBS += $(LUA_LIBS) $(DL_LIBS) LIBS += -lm -ifeq ($(PRELOAD_MODULES),1) -EXT_OBJS += $(foreach mod, $(MODULE_LIST), ../$(mod)/$(mod).a) -DEPEND_DEPENDS += preload.c -SOURCES += preload.c -TO_CLEAN += preload.c -LIBS += -lSM -lICE -else -LDFLAGS += $(EXPORT_DYNAMIC) -WHOLEA = -Wl,-whole-archive -NO_WHOLEA = -Wl,-no-whole-archive -endif - -ifeq ($(RELOCATABLE),1) -DEFINES += -DCF_RELOCATABLE_ION3_LOCATION=\"$(BINDIR)/ion3\" -endif +MODULE_PATH = $(TOPDIR) EXT_OBJS += ../ioncore/ioncore.a @@ -54,12 +40,6 @@ include $(TOPDIR)/build/rules.mk ###################################### -ion3: $(OBJS) $(EXT_OBJS) - $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ -preload.c: - $(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c +_install: executable_install -_install: - $(INSTALLDIR) $(BINDIR) - $(INSTALLBIN) ion3 $(BINDIR) diff --git a/ion/ion.c b/ion/ion.c index 4bbfb60..ac07f3f 100644 --- a/ion/ion.c +++ b/ion/ion.c @@ -151,8 +151,8 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef CF_RELOCATABLE_ION3_LOCATION - prefix_set(argv[0], CF_RELOCATABLE_ION3_LOCATION); +#ifdef CF_RELOCATABLE_BIN_LOCATION + prefix_set(argv[0], CF_RELOCATABLE_BIN_LOCATION); #endif localedir=prefix_add(LOCALEDIR); diff --git a/ioncore/clientwin.c b/ioncore/clientwin.c index cb528ad..0d81b2f 100644 --- a/ioncore/clientwin.c +++ b/ioncore/clientwin.c @@ -508,10 +508,7 @@ WClientWin* ioncore_manage_clientwin(Window win, bool maprq) xwindow_unmanaged_selectinput(win, 0); xwindow_unmanaged_selectinput(icon_win, StructureNotifyMask); - - win=icon_win; - attr=icon_attr; - + /* Copy WM_CLASS as _ION_DOCKAPP_HACK */ p=xwindow_get_text_property(win, XA_WM_CLASS, &n); @@ -525,6 +522,9 @@ WClientWin* ioncore_manage_clientwin(Window win, bool maprq) xwindow_set_text_property(icon_win, ioncore_g.atom_dockapp_hack, pdummy, 2); } + + win=icon_win; + attr=icon_attr; } } @@ -561,8 +561,9 @@ WClientWin* ioncore_manage_clientwin(Window win, bool maprq) param.geom=REGION_GEOM(cwin); param.maprq=maprq; - param.switchto=(init_state!=IconicState && clientwin_get_switchto(cwin)); param.jumpto=extl_table_is_bool_set(cwin->proptab, "jumpto"); + param.switchto=(init_state!=IconicState && + (param.jumpto || clientwin_get_switchto(cwin))); param.gravity=(cwin->size_hints.flags&PWinGravity ? cwin->size_hints.win_gravity : ForgetGravity); @@ -597,7 +598,11 @@ WClientWin* ioncore_manage_clientwin(Window win, bool maprq) } if(postmanage_check(cwin, &attr)){ - if(param.jumpto && ioncore_g.focus_next==NULL) + /* Check for focus_next==NULL does not play nicely with + * pointer_focus_hack. + */ + /*if(param.jumpto && ioncore_g.focus_next==NULL)*/ + if(param.jumpto && !region_manager_is_focusnext((WRegion*)cwin)) region_goto((WRegion*)cwin); hook_call_o(clientwin_mapped_hook, (Obj*)cwin); return cwin; diff --git a/ioncore/conf.c b/ioncore/conf.c index edafe94..7142d32 100644 --- a/ioncore/conf.c +++ b/ioncore/conf.c @@ -77,7 +77,7 @@ static ExtlFn get_layout_fn; * \codestr{lrud} (left-right, then up-down), or * \codestr{random}. \\ * \var{mousefocus} & (string) Mouse focus mode: - * \codestr{disable} or \codestr{sloppy}. \\ + * \codestr{disabled} or \codestr{sloppy}. \\ * \var{unsqueeze} & (boolean) Auto-unsqueeze transients/menus/queries/etc. \\ * \var{autoraise} & (boolean) Autoraise regions in groups on goto. \\ * \end{tabularx} diff --git a/ioncore/eventh.c b/ioncore/eventh.c index 011093b..572ab91 100644 --- a/ioncore/eventh.c +++ b/ioncore/eventh.c @@ -307,8 +307,10 @@ void ioncore_handle_enter_window(XEvent *ev) XEnterWindowEvent *eev=&(ev->xcrossing); WRegion *reg=NULL; - if(ioncore_g.input_mode!=IONCORE_INPUTMODE_NORMAL) + if(ioncore_g.input_mode!=IONCORE_INPUTMODE_NORMAL || + ioncore_g.no_mousefocus){ return; + } if(eev->mode!=NotifyNormal && !ioncore_g.warp_enabled) return; diff --git a/ioncore/focus.c b/ioncore/focus.c index bbba50d..f80a5f2 100644 --- a/ioncore/focus.c +++ b/ioncore/focus.c @@ -308,7 +308,7 @@ bool region_is_active(WRegion *reg, bool pseudoact_ok) } -static bool region_manager_is_focusnext(WRegion *reg) +bool region_manager_is_focusnext(WRegion *reg) { if(reg==NULL || ioncore_g.focus_next==NULL) return FALSE; diff --git a/ioncore/focus.h b/ioncore/focus.h index 5c702e8..12340cd 100644 --- a/ioncore/focus.h +++ b/ioncore/focus.h @@ -39,6 +39,7 @@ extern void region_lost_focus(WRegion *reg); /* May reg transfer focus to its children? */ extern bool region_may_control_focus(WRegion *reg); +extern bool region_manager_is_focusnext(WRegion *reg); /* Does reg have focus? */ extern bool region_is_active(WRegion *reg, bool pseudoact_ok); diff --git a/ioncore/manage.c b/ioncore/manage.c index 52cd0b8..5b03605 100644 --- a/ioncore/manage.c +++ b/ioncore/manage.c @@ -72,6 +72,9 @@ static WPHolder *try_target(WClientWin *cwin, const WManageParams *param, if(r==NULL) return NULL; + if(!region_same_rootwin(r, (WRegion*)cwin)) + return NULL; + return region_prepare_manage(r, cwin, param, MANAGE_PRIORITY_NONE); } diff --git a/libmainloop/defer.c b/libmainloop/defer.c index 90e02af..304a37c 100644 --- a/libmainloop/defer.c +++ b/libmainloop/defer.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "defer.h" @@ -78,7 +79,7 @@ static void defer_watch_handler(Watch *w, Obj *obj) free_defer(d); - warn(TR("Object destroyed while deferred actions are still pending.")); + D(warn(TR("Object destroyed while deferred actions are still pending."))); } diff --git a/mod_sm/sm_matchwin.c b/mod_sm/sm_matchwin.c index a26027e..e3705a8 100644 --- a/mod_sm/sm_matchwin.c +++ b/mod_sm/sm_matchwin.c @@ -5,7 +5,7 @@ * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * - * Ion is free software; you can redistribute it and/or modify it under + * This is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. diff --git a/mod_sm/sm_matchwin.h b/mod_sm/sm_matchwin.h index 6e93945..5c90fb4 100644 --- a/mod_sm/sm_matchwin.h +++ b/mod_sm/sm_matchwin.h @@ -5,7 +5,7 @@ * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * - * Ion is free software; you can redistribute it and/or modify it under + * This is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. diff --git a/mod_sm/sm_session.c b/mod_sm/sm_session.c index 52d6955..0874311 100644 --- a/mod_sm/sm_session.c +++ b/mod_sm/sm_session.c @@ -5,7 +5,7 @@ * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * - * Ion is free software; you can redistribute it and/or modify it under + * This is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. diff --git a/mod_sm/sm_session.h b/mod_sm/sm_session.h index a4cc980..05deb34 100644 --- a/mod_sm/sm_session.h +++ b/mod_sm/sm_session.h @@ -5,7 +5,7 @@ * * Based on the code of the 'sm' module for Ion1 by an unknown contributor. * - * Ion is free software; you can redistribute it and/or modify it under + * This is free software; you can redistribute it and/or modify it under * the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. diff --git a/pwm/Makefile b/pwm/Makefile index 2721bbf..983c51c 100644 --- a/pwm/Makefile +++ b/pwm/Makefile @@ -11,36 +11,22 @@ include $(TOPDIR)/modulelist.mk ###################################### -SOURCES=pwm.c +EXECUTABLE = pwm3 -ETC = cfg_pwm.lua +SOURCES = pwm.c -TARGETS = pwm3 +ETC = cfg_pwm.lua INCLUDES += $(X11_INCLUDES) INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBTU_INCLUDES) $(LIBEXTL_INCLUDES) INCLUDES += -I.. -LIBS += $(X11_LIBS) +LIBS += $(X11_LIBS) -lSM -lICE LIBS += $(WHOLEA) $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(NO_WHOLEA) LIBS += $(LUA_LIBS) $(DL_LIBS) LIBS += -lm -ifeq ($(PRELOAD_MODULES),1) -EXT_OBJS += $(foreach mod, $(PWM_MODULE_LIST), ../$(mod)/$(mod).a) -DEPEND_DEPENDS += preload.c -SOURCES += preload.c -TO_CLEAN += preload.c -LIBS += -lSM -lICE -else -LDFLAGS += $(EXPORT_DYNAMIC) -WHOLEA = -Wl,-whole-archive -NO_WHOLEA = -Wl,-no-whole-archive -endif - -ifeq ($(RELOCATABLE),1) -DEFINES += -DCF_RELOCATABLE_PWM3_LOCATION=\"$(BINDIR)/pwm3\" -endif +MODULE_PATH = $(TOPDIR) EXT_OBJS += ../ioncore/ioncore.a @@ -62,15 +48,7 @@ include $(TOPDIR)/build/rules.mk ###################################### -pwm3: $(OBJS) $(EXT_OBJS) - $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ - -preload.c: - $(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c - -_install: - $(INSTALLDIR) $(BINDIR) - $(INSTALLBIN) pwm3 $(BINDIR) +_install: executable_install $(INSTALLDIR) $(PWM_ETCDIR) for i in $(ETC); do \ $(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \ diff --git a/pwm/pwm.c b/pwm/pwm.c index 422bb40..0f38cbb 100644 --- a/pwm/pwm.c +++ b/pwm/pwm.c @@ -98,8 +98,8 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef CF_RELOCATABLE_PWM3_LOCATION - prefix_set(argv[0], CF_RELOCATABLE_PWM3_LOCATION); +#ifdef CF_RELOCATABLE_BIN_LOCATION + prefix_set(argv[0], CF_RELOCATABLE_BIN_LOCATION); #endif localedir=prefix_add(LOCALEDIR); diff --git a/system.mk b/system.mk index b592858..11996f4 100644 --- a/system.mk +++ b/system.mk @@ -38,6 +38,9 @@ VARDIR=/var/cache/ion3 # Message catalogs LOCALEDIR=$(PREFIX)/share/locale +# Executable suffix (for Cygwin). +#BIN_SUFFIX = .exe + ## ## Modules @@ -131,6 +134,9 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND # monotonic clock at all (which Ion can live with, and usually detect). EXTRA_LIBS += -lrt +# Cygwin needs this. +#DEFINES += -DCF_NO_GETLOADAVG + # # If you're using/have gcc, it is unlikely that you need to modify diff --git a/utils/ion-completefile/Makefile b/utils/ion-completefile/Makefile index 8491638..f2e553c 100644 --- a/utils/ion-completefile/Makefile +++ b/utils/ion-completefile/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/build/system-inc.mk ###################################### -LIBS += $(LIBTU_LIBS) -INCLUDES += $(LIBTU_INCLUDES) -CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) +EXTRA_EXECUTABLE = ion-completefile SOURCES=ion-completefile.c -TARGETS=ion-completefile +LIBS += $(LIBTU_LIBS) +INCLUDES += $(LIBTU_INCLUDES) +CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) ###################################### @@ -22,9 +22,4 @@ include $(TOPDIR)/build/rules.mk ###################################### -ion-completefile: $(SOURCES) - $(CC) $< $(CFLAGS) $(LDFLAGS) -o $@ - -_install: - $(INSTALLDIR) $(EXTRABINDIR) - $(INSTALLBIN) ion-completefile $(EXTRABINDIR) +_install: executable_install diff --git a/utils/ion-statusd/Makefile b/utils/ion-statusd/Makefile index 0a0afac..8e5da54 100644 --- a/utils/ion-statusd/Makefile +++ b/utils/ion-statusd/Makefile @@ -8,19 +8,18 @@ include $(TOPDIR)/build/system-inc.mk ###################################### +EXTRA_EXECUTABLE = ion-statusd + +SOURCES = ion-statusd.c exec.c extlrx.c + INCLUDES += $(LIBMAINLOOP_INCLUDES) $(LIBEXTL_INCLUDES) $(LIBTU_INCLUDES) LIBS += $(LIBMAINLOOP_LIBS) $(LIBEXTL_LIBS) $(LIBTU_LIBS) $(LUA_LIBS) $(DL_LIBS) -lm CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \ - -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DSTATUSD_LOCATION=\"$(EXTRABINDIR)/ion-statusd\" + -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -SOURCES = ion-statusd.c exec.c extlrx.c - -TARGETS = ion-statusd - LUA_SOURCES = statusd_date.lua statusd_mail.lua statusd_load.lua MAKE_EXPORTS = statusd @@ -33,9 +32,4 @@ include $(TOPDIR)/build/rules.mk ###################################### -ion-statusd: $(OBJS) $(EXT_OBJS) - $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@ - -_install: lc_install - $(INSTALLDIR) $(EXTRABINDIR) - $(INSTALLBIN) ion-statusd $(EXTRABINDIR) +_install: lc_install executable_install diff --git a/utils/ion-statusd/exec.c b/utils/ion-statusd/exec.c index 3270cb8..d15f0ab 100644 --- a/utils/ion-statusd/exec.c +++ b/utils/ion-statusd/exec.c @@ -3,10 +3,7 @@ * * Copyright (c) Tuomo Valkonen 2005-2008. * - * Ion is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. + * See the included file LICENSE for details. */ diff --git a/utils/ion-statusd/extlrx.c b/utils/ion-statusd/extlrx.c index d7d1fb5..ce67bf0 100644 --- a/utils/ion-statusd/extlrx.c +++ b/utils/ion-statusd/extlrx.c @@ -3,10 +3,7 @@ * * Copyright (c) Tuomo Valkonen 2004-2008. * - * Ion is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. + * See the included file LICENSE for details. */ #include diff --git a/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c index 6402746..5aa02c0 100644 --- a/utils/ion-statusd/ion-statusd.c +++ b/utils/ion-statusd/ion-statusd.c @@ -3,10 +3,7 @@ * * Copyright (c) Tuomo Valkonen 2004-2008. * - * Ion is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or - * (at your option) any later version. + * See the included file LICENSE for details. */ #include @@ -69,15 +66,15 @@ static const char statusd_copy[]= static const char statusd_license[]=DUMMY_TR( - "This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU Lesser General Public\n" - "License as published by the Free Software Foundation; either\n" - "version 2.1 of the License, or (at your option) any later version.\n" + "This software is licensed under the GNU Lesser General Public License\n" + "(LGPL), version 2.1, extended with terms applying to the use of the name\n" + "of the project, Ion(tm), unless otherwise indicated in components taken\n" + "from elsewhere. For details, see the file LICENSE that you should have\n" + "received with this software.\n" "\n" "This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" - "Lesser General Public License for more details.\n"); + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"); /* new_informs=TRUE because we should always print period when @@ -161,8 +158,8 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef STATUSD_LOCATION - prefix_set(argv[0], STATUSD_LOCATION); +#ifdef CF_RELOCATABLE_BIN_LOCATION + prefix_set(argv[0], CF_RELOCATABLE_BIN_LOCATION); #endif extl_init(); @@ -300,6 +297,7 @@ EXTL_EXPORT ExtlTab statusd_getloadavg() { ExtlTab t=extl_create_table(); +#ifndef CF_NO_GETLOADAVG double l[3]; int n; @@ -311,7 +309,7 @@ ExtlTab statusd_getloadavg() extl_table_sets_d(t, "5min", l[1]); if(n>=3) extl_table_sets_d(t, "15min", l[2]); - +#endif return t; } diff --git a/utils/ion-statusd/statusd_date.lua b/utils/ion-statusd/statusd_date.lua index 6f048c7..8672088 100644 --- a/utils/ion-statusd/statusd_date.lua +++ b/utils/ion-statusd/statusd_date.lua @@ -3,10 +3,7 @@ -- -- Copyright (c) Tuomo Valkonen 2004-2008. -- --- Ion is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License as published by --- the Free Software Foundation; either version 2.1 of the License, or --- (at your option) any later version. +-- See the included file LICENSE for details. -- diff --git a/utils/ion-statusd/statusd_load.lua b/utils/ion-statusd/statusd_load.lua index 104b07a..b9d6fea 100644 --- a/utils/ion-statusd/statusd_load.lua +++ b/utils/ion-statusd/statusd_load.lua @@ -3,10 +3,7 @@ -- -- Copyright (c) Tuomo Valkonen 2004-2008. -- --- Ion is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License as published by --- the Free Software Foundation; either version 2.1 of the License, or --- (at your option) any later version. +-- See the included file LICENSE for details. -- -- diff --git a/utils/ion-statusd/statusd_mail.lua b/utils/ion-statusd/statusd_mail.lua index 48406a4..e332dbc 100644 --- a/utils/ion-statusd/statusd_mail.lua +++ b/utils/ion-statusd/statusd_mail.lua @@ -3,10 +3,7 @@ -- -- Copyright (c) Tuomo Valkonen 2004-2008. -- --- Ion is free software; you can redistribute it and/or modify it under --- the terms of the GNU Lesser General Public License as published by --- the Free Software Foundation; either version 2.1 of the License, or --- (at your option) any later version. +-- See the included file LICENSE for details. -- -- The keyword for this monitor diff --git a/version.h b/version.h index 10af9dd..d3cf125 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,3 @@ -#define ION_RELEASE "3rc-20080103" +#define ION_RELEASE "3-20080207" #define ION_VERSION ION_RELEASE #define ION_API_VERSION "3"