diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-04-22 17:28:37 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-04-22 17:29:06 (GMT) |
commit | 36e023ad7af10181a8aa44b149fb25f003665198 (patch) | |
tree | 4b139a5fc5b7e23c1b20bdb99b2b4c2a02cfea08 | |
parent | b4211d332fad8c41632b6a64b92b16bb8b2054cb (diff) |
Add binary blobs selector
-rw-r--r-- | MANIFEST | 253 | ||||
-rwxr-xr-x | fill.so | bin | 12012 -> 0 bytes | |||
-rw-r--r-- | fill/Makefile (renamed from fill_src/Makefile) | 25 | ||||
-rw-r--r-- | fill/__init__.py | 21 | ||||
-rw-r--r-- | fill/eggfill.c (renamed from fill_src/eggfill.c) | 0 | ||||
-rw-r--r-- | fill/eggfill.h (renamed from fill_src/eggfill.h) | 0 | ||||
-rw-r--r-- | fill/fill.c (renamed from fill_src/fill.c) | 0 | ||||
-rw-r--r-- | fill/fill.defs (renamed from fill_src/fill.defs) | 0 | ||||
-rw-r--r-- | fill/fill.override (renamed from fill_src/fill.override) | 2 | ||||
-rw-r--r-- | fill/fillmodule.c (renamed from fill_src/fillmodule.c) | 4 |
10 files changed, 44 insertions, 261 deletions
diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index c132706..0000000 --- a/MANIFEST +++ /dev/null @@ -1,253 +0,0 @@ -activity/activity.info -activity/activity-paint.svg -Area.py -COPYING -Desenho.py -fill.so -fill_src/eggfill.c -fill_src/eggfill.h -fill_src/fill.c -fill_src/fill.defs -fill_src/fillmodule.c -fill_src/fill.override -fill_src/Makefile -icons/bg.svg -icons/edit-clear.svg -icons/edit-copy.svg -icons/edit-paste.svg -icons/edit-redo.svg -icons/edit-undo.svg -icons/effect-grayscale.svg -icons/effect-rainbow.svg -icons/format-justify-center.svg -icons/format-justify-left.svg -icons/format-justify-right.svg -icons/format-text-bold.svg -icons/format-text-italic.svg -icons/format-text-size.svg -icons/format-text-underline.svg -icons/icon-fill.svg -icons/icon-stroke.svg -icons/object-height.svg -icons/object-insert.svg -icons/object-rotate-left.svg -icons/object-rotate-right.svg -icons/object-width.svg -icons/text.svg -icons/tool-brush.svg -icons/tool-bucket.svg -icons/tool-eraser.svg -icons/tool-marquee-elliptical.svg -icons/tool-marquee-freeform.svg -icons/tool-marquee-rectangular.svg -icons/tool-marquee-smart.svg -icons/tool-pencil.svg -icons/tool-polygon.svg -icons/tool-shape-arrow.svg -icons/tool-shape-curve.svg -icons/tool-shape-ellipse.svg -icons/tool-shape-freeform.svg -icons/tool-shape-heart.svg -icons/tool-shape-line.svg -icons/tool-shape-parallelogram.svg -icons/tool-shape-polygon.svg -icons/tool-shape-rectangle.svg -icons/tool-shape-star.svg -icons/tool-shape-trapezoid.svg -icons/tool-shape-triangle.svg -images/arrow.png -images/brush.png -images/bucket.png -images/ellipse.png -images/eraser.png -images/heart.png -images/line.png -images/marquee-rectangular.png -images/move_cursor.png -images/parallelogram.png -images/pencil.png -images/polygon.png -images/rectangle.png -images/star.png -images/text.png -images/trapezoid.png -images/triangle.png -locale/af/activity.linfo -locale/af/LC_MESSAGES/org.laptop.Oficina.mo -locale/am/activity.linfo -locale/am/LC_MESSAGES/org.laptop.Oficina.mo -locale/ar/activity.linfo -locale/ar/LC_MESSAGES/org.laptop.Oficina.mo -locale/ay/activity.linfo -locale/ay/LC_MESSAGES/org.laptop.Oficina.mo -locale/bg/activity.linfo -locale/bg/LC_MESSAGES/org.laptop.Oficina.mo -locale/bn/activity.linfo -locale/bn_IN/activity.linfo -locale/bn_IN/LC_MESSAGES/org.laptop.Oficina.mo -locale/bn/LC_MESSAGES/org.laptop.Oficina.mo -locale/ca/activity.linfo -locale/ca/LC_MESSAGES/org.laptop.Oficina.mo -locale/de/activity.linfo -locale/de/LC_MESSAGES/org.laptop.Oficina.mo -locale/dz/activity.linfo -locale/dz/LC_MESSAGES/org.laptop.Oficina.mo -locale/el/activity.linfo -locale/el/LC_MESSAGES/org.laptop.Oficina.mo -locale/en/activity.linfo -locale/en/LC_MESSAGES/org.laptop.Oficina.mo -locale/es/activity.linfo -locale/es/LC_MESSAGES/org.laptop.Oficina.mo -locale/fa/activity.linfo -locale/fa_AF/activity.linfo -locale/fa_AF/LC_MESSAGES/org.laptop.Oficina.mo -locale/fa/LC_MESSAGES/org.laptop.Oficina.mo -locale/ff/activity.linfo -locale/ff/LC_MESSAGES/org.laptop.Oficina.mo -locale/fr/activity.linfo -locale/fr/LC_MESSAGES/org.laptop.Oficina.mo -locale/gu/activity.linfo -locale/gu/LC_MESSAGES/org.laptop.Oficina.mo -locale/ha/activity.linfo -locale/ha/LC_MESSAGES/org.laptop.Oficina.mo -locale/hi/activity.linfo -locale/hi/LC_MESSAGES/org.laptop.Oficina.mo -locale/ht/activity.linfo -locale/ht/LC_MESSAGES/org.laptop.Oficina.mo -locale/ig/activity.linfo -locale/ig/LC_MESSAGES/org.laptop.Oficina.mo -locale/is/activity.linfo -locale/is/LC_MESSAGES/org.laptop.Oficina.mo -locale/it/activity.linfo -locale/it/LC_MESSAGES/org.laptop.Oficina.mo -locale/ja/activity.linfo -locale/ja/LC_MESSAGES/org.laptop.Oficina.mo -locale/km/activity.linfo -locale/km/LC_MESSAGES/org.laptop.Oficina.mo -locale/ko_KO/activity.linfo -locale/ko_KO/LC_MESSAGES/org.laptop.Oficina.mo -locale/mk/activity.linfo -locale/mk/LC_MESSAGES/org.laptop.Oficina.mo -locale/ml/activity.linfo -locale/ml/LC_MESSAGES/org.laptop.Oficina.mo -locale/mn/activity.linfo -locale/mn/LC_MESSAGES/org.laptop.Oficina.mo -locale/mr/activity.linfo -locale/mr/LC_MESSAGES/org.laptop.Oficina.mo -locale/mvo/activity.linfo -locale/mvo/LC_MESSAGES/org.laptop.Oficina.mo -locale/nb/activity.linfo -locale/nb/LC_MESSAGES/org.laptop.Oficina.mo -locale/ne/activity.linfo -locale/ne/LC_MESSAGES/org.laptop.Oficina.mo -locale/nl/activity.linfo -locale/nl/LC_MESSAGES/org.laptop.Oficina.mo -locale/pa/activity.linfo -locale/pa/LC_MESSAGES/org.laptop.Oficina.mo -locale/pap/activity.linfo -locale/pap/LC_MESSAGES/org.laptop.Oficina.mo -locale/pis/activity.linfo -locale/pis/LC_MESSAGES/org.laptop.Oficina.mo -locale/pl/activity.linfo -locale/pl/LC_MESSAGES/org.laptop.Oficina.mo -locale/ps/activity.linfo -locale/ps/LC_MESSAGES/org.laptop.Oficina.mo -locale/pt/activity.linfo -locale/pt_BR/activity.linfo -locale/pt_BR/LC_MESSAGES/org.laptop.Oficina.mo -locale/pt/LC_MESSAGES/org.laptop.Oficina.mo -locale/qu/activity.linfo -locale/qu/LC_MESSAGES/org.laptop.Oficina.mo -locale/ro/activity.linfo -locale/ro/LC_MESSAGES/org.laptop.Oficina.mo -locale/ru/activity.linfo -locale/ru/LC_MESSAGES/org.laptop.Oficina.mo -locale/rw/activity.linfo -locale/rw/LC_MESSAGES/org.laptop.Oficina.mo -locale/sd/activity.linfo -locale/sd/LC_MESSAGES/org.laptop.Oficina.mo -locale/si/activity.linfo -locale/si/LC_MESSAGES/org.laptop.Oficina.mo -locale/sl/activity.linfo -locale/sl/LC_MESSAGES/org.laptop.Oficina.mo -locale/te/activity.linfo -locale/te/LC_MESSAGES/org.laptop.Oficina.mo -locale/th/activity.linfo -locale/th/LC_MESSAGES/org.laptop.Oficina.mo -locale/tpi/activity.linfo -locale/tpi/LC_MESSAGES/org.laptop.Oficina.mo -locale/tr/activity.linfo -locale/tr/LC_MESSAGES/org.laptop.Oficina.mo -locale/ur/activity.linfo -locale/ur/LC_MESSAGES/org.laptop.Oficina.mo -locale/vi/activity.linfo -locale/vi/LC_MESSAGES/org.laptop.Oficina.mo -locale/yo/activity.linfo -locale/yo/LC_MESSAGES/org.laptop.Oficina.mo -locale/zh_CN/activity.linfo -locale/zh_CN/LC_MESSAGES/org.laptop.Oficina.mo -locale/zh_TW/activity.linfo -locale/zh_TW/LC_MESSAGES/org.laptop.Oficina.mo -NEWS -OficinaActivity.py -po/af.po -po/am.po -po/ar.po -po/ay.po -po/bg.po -po/bn_IN.po -po/bn.po -po/ca.po -po/de.po -po/dz.po -po/el.po -po/en.po -po/es.po -po/fa_AF.po -po/fa.po -po/ff.po -po/fr.po -po/gu.po -po/ha.po -po/hi.po -po/ht.po -po/ig.po -po/is.po -po/it.po -po/ja.po -po/km.po -po/ko_KO.po -po/mk.po -po/ml.po -po/mn.po -po/mr.po -po/mvo.po -po/nb.po -po/ne.po -po/nl.po -po/Paint.pot -po/pa.po -po/pap.po -po/pis.po -po/pl.po -po/ps.po -po/pt_BR.po -po/pt.po -po/qu.po -po/ro.po -po/ru.po -po/rw.po -po/sd.po -po/si.po -po/sl.po -po/te.po -po/th.po -po/tpi.po -po/tr.po -po/ur.po -po/vi.po -po/yo.po -po/zh_CN.po -po/zh_TW.po -setup.py -toolbox.py diff --git a/fill.so b/fill.so Binary files differdeleted file mode 100755 index 5e944ad..0000000 --- a/fill.so +++ /dev/null diff --git a/fill_src/Makefile b/fill/Makefile index dc1f3ec..e437f99 100644 --- a/fill_src/Makefile +++ b/fill/Makefile @@ -34,11 +34,26 @@ #Rafael Barbolo Lopes (barbolo@gmail.com) #Alexandre A. Gonçalves Martinazzo (alexandremartinazzo@gmail.com) -CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -I/usr/include/python2.5/ -I. -I/usr/include/pygtk-2.0/ -LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0` +CFLAGS = $(shell pkg-config --cflags gtk+-2.0 pygtk-2.0) \ + $(shell python-config --cflags) \ + -fPIC -fill.so: fill.o eggfill.o fillmodule.o - $(CC) $(LDFLAGS) -shared $^ -o $@ +LDFLAGS = $(shell pkg-config --libs gtk+-2.0 pygtk-2.0) \ + $(shell python-config --libs) + +ARCH = $(shell arch | grep 64 >/dev/null && echo linux64 || echo linux32) +PYTHON_VERSION = $(shell python -c 'import sys; print "%d%d" % sys.version_info[0:2]') +LIB_DIR = $(ARCH)_$(PYTHON_VERSION) + +all: _fill.so + rm -rf $(LIB_DIR) + mkdir $(LIB_DIR) + strip -s _fill.so + mv _fill.so $(LIB_DIR)/ + touch $(LIB_DIR)/__init__.py + +_fill.so: fill.o eggfill.o fillmodule.o + $(LD) $(LDFLAGS) -shared $^ -o $@ DEFS=`pkg-config --variable=defsdir pygtk-2.0` # Generate the C wrapper @@ -51,5 +66,5 @@ fill.c: fill.defs fill.override fill.defs > $@ clean: - rm -f fill.so *.o fill.c *~ + rm -f *.so *.o fill.c *~ diff --git a/fill/__init__.py b/fill/__init__.py new file mode 100644 index 0000000..34b4d37 --- /dev/null +++ b/fill/__init__.py @@ -0,0 +1,21 @@ +import os +import sys +import logging + +_sys_path = sys.path +_root_path = os.path.dirname(__file__) + +for i in os.listdir(_root_path): + path = os.path.join(_root_path, i) + if (os.path.isdir(path)): + sys.path = _sys_path + [os.path.join('.', path)] + try: + from _fill import * + logging.debug('use %s blobs' % path) + _sys_path = None + break + except Exception, e: + logging.debug('skip %s blobs: %s' % (path, e)) + +if _sys_path: + raise('cannot find proper binary blobs') diff --git a/fill_src/eggfill.c b/fill/eggfill.c index 5de388d..5de388d 100644 --- a/fill_src/eggfill.c +++ b/fill/eggfill.c diff --git a/fill_src/eggfill.h b/fill/eggfill.h index 1836043..1836043 100644 --- a/fill_src/eggfill.h +++ b/fill/eggfill.h diff --git a/fill_src/fill.c b/fill/fill.c index 39c4e34..39c4e34 100644 --- a/fill_src/fill.c +++ b/fill/fill.c diff --git a/fill_src/fill.defs b/fill/fill.defs index d2ebadf..d2ebadf 100644 --- a/fill_src/fill.defs +++ b/fill/fill.defs diff --git a/fill_src/fill.override b/fill/fill.override index 85a2f70..3de606c 100644 --- a/fill_src/fill.override +++ b/fill/fill.override @@ -5,7 +5,7 @@ headers #include "pygobject.h" #include "eggfill.h" %% -modulename fill +modulename _fill %% import gtk.gdk.Drawable as PyGdkDrawable_Type import gtk.gdk.GC as PyGdkGC_Type diff --git a/fill_src/fillmodule.c b/fill/fillmodule.c index bdfc872..b23bfd7 100644 --- a/fill_src/fillmodule.c +++ b/fill/fillmodule.c @@ -53,13 +53,13 @@ void fill_register_classes (PyObject *d); extern PyMethodDef fill_functions[]; DL_EXPORT(void) -initfill(void) +init_fill(void) { PyObject *m, *d; init_pygobject (); - m = Py_InitModule ("fill", fill_functions); + m = Py_InitModule ("_fill", fill_functions); d = PyModule_GetDict (m); fill_register_classes (d); |