openbox scripting works again! config too!
Dana Jansens danakj@orodu.net
4 files changed,
5 insertions(+),
18 deletions(-)
M
otk/Makefile.am
→
otk/Makefile.am
@@ -2,7 +2,7 @@ buttonsdir = $(pkgdatadir)/buttons
scriptdir = $(libdir)/openbox/python CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \ --DBUTTONSDIR=\"$(buttonsdir)\" +-DBUTTONSDIR=\"$(buttonsdir)\" -DSWIG_GLOBAL INCLUDES= -I../src@@ -40,6 +40,6 @@ otk.i: $(wildcard *.hh)
touch $@ %_wrap.cc: %.i - swig -c $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< + swig $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< # local dependencies
M
src/Makefile.am
→
src/Makefile.am
@@ -7,8 +7,7 @@ CXXFLAGS=$(XFT_CFLAGS) $(PYTHON_CFLAGS) @CXXFLAGS@ \
-DDEFAULTMENU=\"$(DEFAULT_MENU)\" \ -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \ -DLOCALEDIR=\"$(localedir)\" \ --DSCRIPTDIR=\"$(scriptdir)\" -DSWIG_GLOBAL -# -DSWIG_GLOBAL is for the swigruntime.cc (see swigruntime.i for explanation) +-DSCRIPTDIR=\"$(scriptdir)\" LIBS=$(XFT_LIBS) $(PYTHON_LIBS) @LIBS@@@ -21,7 +20,7 @@
openbox3_SOURCES= actions.cc client.cc frame.cc openbox.cc screen.cc \ main.cc backgroundwidget.cc labelwidget.cc \ buttonwidget.cc python.cc bindings.cc \ - swigruntime.cc openbox_wrap.cc + openbox_wrap.cc openbox3_LDFLAGS= $(PYTHON_LDFLAGS) script_DATA = ob.py@@ -38,8 +37,5 @@ touch $@
%_wrap.cc: %.i swig -c -I../otk $(filter -I%,$(CXXFLAGS)) -python -shadow -c++ -nodefault -o $@ $< - -swigruntime.cc: swigruntime.i - swig -python -c++ -o $@ $< # local dependencies
M
src/python.cc
→
src/python.cc
@@ -32,7 +32,7 @@ PyRun_SimpleString(const_cast<char*>(("sys.path.append('" +
otk::expandTilde("~/.openbox/python") + "')").c_str())); PyRun_SimpleString("sys.path.append('" SCRIPTDIR "')"); - PyRun_SimpleString("import ob; import otk;"); + PyRun_SimpleString("import ob; import otk; import config;"); // set up convenience global variables PyRun_SimpleString("ob.openbox = ob.Openbox_instance()"); PyRun_SimpleString("otk.display = otk.Display_instance()");
D
src/swigruntime.i
@@ -1,9 +0,0 @@
-// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- - -/* - This module exists just to link in the stuff that libswigpy would normally - provide. This way you don't need swig to compile this package from - distributed source tarballs. -*/ - -%module swigruntime