pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the need for hg and the dnspython fork

Browse source 
(upstream works, now)
This commit is contained in:
mathieui 2012-07-24 18:10:46 +02:00
parent 82e242305d
commit b7b7d6b3aa
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
doc/en/install.txt
View file

@ -32,17 +32,14 @@ In order for poezio to correctly work, you need the libs SleekXMPP and
dnspython. You can install them by downloading it from the dnspython. You can install them by downloading it from the
https://github.com/fritzy/SleekXMPP/[SleekXMPP] page and the https://github.com/fritzy/SleekXMPP/[SleekXMPP] page and the
http://www.dnspython.org/[dnspython] page , but you'll need the development http://www.dnspython.org/[dnspython] page , but you'll need the development
versions. Alternatively, you can download poezio's sources including SleekXMPP version of SleekXMPP. Alternatively, you can download poezio's sources
and dnspython, that's the easier way. including SleekXMPP and dnspython, that's the easier way.
As for dnspython, you will have to use our python3 fork, or poke them to accept
patches.
=== Dependencies === === Dependencies ===
If you want to install SleekXMPP and dnspython yourself, follow these If you want to install SleekXMPP and dnspython by yourself, follow these
instructions. Else, go to the next section. instructions. Else, go to the next section (recommended).
Download SleekXMPP Download SleekXMPP
@ -64,12 +61,13 @@ python3 setup.py build
su -c "python3 setup.py install" su -c "python3 setup.py install"
============================ ============================
Clone the repository at http://hg.louiz.org/dnspython (this is a fork, because Install the dnspython3 package on your distribution or install it manually:
upstream is unresponsive and didn’t fix an important bug).
============================ ============================
hg clone http://hg.louiz.org/dnspython wget -O dnspython.tgz http://www.dnspython.org/kits3/1.10.0/dnspython3-1.10.0.tar.gz
cd dnspython tar xvf dnspython.tgz
cd dnspython3-1.10.0
============================ ============================
And do the same again: And do the same again:
@ -88,11 +86,12 @@ If you skipped the installation of the dependencies and you only want to test
sh update.sh sh update.sh
============================ ============================
If you have git and hg installed, it will download and update locally the If you have git installed, it will download and update locally the
libraries for you. libraries for you.
If you don't want to install poezio but just test it, do: If you don't want to install poezio but just test it (or keep a development
version), do:
============================ ============================
./launch.sh ./launch.sh
============================ ============================

19
update.sh
View file

@ -28,15 +28,22 @@ else
echo "Downloading SleekXMPP" echo "Downloading SleekXMPP"
git clone git://github.com/louiz/SleekXMPP.git git clone git://github.com/louiz/SleekXMPP.git
fi fi
if [ -e "dnspython" ] if [ -e ".dnspython.tgz" ]
then then
echo "Updating dnspython" if [ -e "dnspython" ]
cd dnspython then
hg pull -u echo "dnspython up to date"
cd .. else
echo "Restoring dnspython"
tar xf .dnspython.tgz
mv dnspython3-1.10.0 dnspython
fi
else else
echo "Downloading dnspython" echo "Downloading dnspython"
hg clone http://hg.louiz.org/dnspython wget -c -q -O .dnspython.tgz http://www.dnspython.org/kits3/1.10.0/dnspython3-1.10.0.tar.gz
rm -fr dnspython
tar xf .dnspython.tgz
mv dnspython3-1.10.0 dnspython
fi fi
cd src cd src