* Fix python build for python3

* Add RDebug instance in RCore class
This commit is contained in:
pancake 2010-10-26 17:30:21 +02:00
parent fe9d750954
commit b779e77931
3 changed files with 4 additions and 15 deletions

View File

@ -78,12 +78,11 @@ test:
install-python:
@# py2.6 in debian uses dist-packages, but site-packages in arch..
@if [ "`grep python supported.langs`" ]; then \
for a in python2.5/site-packages python2.6/site-packages python2.6/dist-packages; do \
a=python`python --version 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1,2`/site-packages ; \
echo "Installing $$a r2 modules in ${DESTDIR}${PREFIX}/lib/$$a/r2" ; \
mkdir -p ${DESTDIR}${PREFIX}/lib/$$a/r2 ; \
touch ${DESTDIR}${PREFIX}/lib/$$a/r2/__init__.py ; \
cp -rf python/*.${SOEXT} python/r_*.py python/libr.py ${DESTDIR}${PREFIX}/lib/$$a/r2 ; \
done ; \
fi
install-lua:

View File

@ -14,16 +14,5 @@ bis:
valaswig-cc python r_io -I../../libr/include r_io `pkg-config --libs r_io`
mrproper:
rm -rf ${PREFIX}/lib/python2.5/r2
rm -rf ${PREFIX}/lib/python2.5/site-packages/r2
rm -rf ${PREFIX}/lib/python2.5/libr*
rm -rf ${PREFIX}/lib/python2.5/_libr*
rm -rf ${PREFIX}/lib/python2.5/site-packages/libr*
rm -rf ${PREFIX}/lib/python2.5/site-packages/_libr*
#
rm -rf ${PREFIX}/lib/python2.6/r2
rm -rf ${PREFIX}/lib/python2.6/site-packages/r2
rm -rf ${PREFIX}/lib/python2.6/libr*
rm -rf ${PREFIX}/lib/python2.6/_libr*
rm -rf ${PREFIX}/lib/python2.6/site-packages/libr*
rm -rf ${PREFIX}/lib/python2.6/site-packages/_libr*
a=python`python --version 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1,2`/site-packages ; \
rm -rf ${PREFIX}/lib/$a/r2

View File

@ -10,6 +10,7 @@ public class RCore {
public RCore();
public RIO io;
public RCons cons;
public RDebug debug;
public RConfig config;
public RAsm assembler;
public RAnal anal;