Browse Source

- Removed build dependency on Python

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
b66be5b64b
  1. 1
      Changelog
  2. 1
      TODO
  3. 23
      configure
  4. 3
      qbittorrent.qc
  5. 19
      qcm/python.qcm
  6. 12
      testpython.py

1
Changelog

@ -64,6 +64,7 @@
- BUGFIX: Prevent downloadFromUrl flooding - BUGFIX: Prevent downloadFromUrl flooding
- BUGFIX: ETA was wrong for torrents with filtered files - BUGFIX: ETA was wrong for torrents with filtered files
- BUGFIX: Fixed drag'n drop on non-KDE systems - BUGFIX: Fixed drag'n drop on non-KDE systems
- BUGFIX: Removed build dependency on Python
- COSMETIC: Redesigned torrent properties a little - COSMETIC: Redesigned torrent properties a little
- COSMETIC: Totally redesigned program preferences - COSMETIC: Totally redesigned program preferences
- COSMETIC: Display more logs messages concerning features - COSMETIC: Display more logs messages concerning features

1
TODO

@ -57,4 +57,5 @@
- Translations update (IN PROGRESS) - Translations update (IN PROGRESS)
rc6->rc7 changelog: rc6->rc7 changelog:
- Removed build dependency on Python
- I18N: Updated Turkish translation - I18N: Updated Turkish translation

23
configure vendored

@ -723,26 +723,6 @@ public:
return true; return true;
} }
}; };
#line 1 "python.qcm"
/*
-----BEGIN QCMOD-----
name: python
-----END QCMOD-----
*/
class qc_python : public ConfObj
{
public:
qc_python(Conf *c) : ConfObj(c) {}
QString name() const { return "python >= 2.3"; }
QString shortname() const { return "python"; }
bool exec(){
int r = conf->doCommand("python testpython.py");
if(r == 0)
return true;
else
return false;
}
};
EOT EOT
cat >$1/modules_new.cpp <<EOT cat >$1/modules_new.cpp <<EOT
@ -764,9 +744,6 @@ cat >$1/modules_new.cpp <<EOT
o = new qc_libzzip(conf); o = new qc_libzzip(conf);
o->required = false; o->required = false;
o->disabled = false; o->disabled = false;
o = new qc_python(conf);
o->required = true;
o->disabled = false;
EOT EOT
cat >$1/conf4.h <<EOT cat >$1/conf4.h <<EOT

3
qbittorrent.qc

@ -17,7 +17,4 @@
</dep> </dep>
<dep type='libmagick'/> <dep type='libmagick'/>
<dep type='libzzip'/> <dep type='libzzip'/>
<dep type='python'>
<required/>
</dep>
</qconf> </qconf>

19
qcm/python.qcm

@ -1,19 +0,0 @@
/*
-----BEGIN QCMOD-----
name: python
-----END QCMOD-----
*/
class qc_python : public ConfObj
{
public:
qc_python(Conf *c) : ConfObj(c) {}
QString name() const { return "python >= 2.3"; }
QString shortname() const { return "python"; }
bool exec(){
int r = conf->doCommand("python testpython.py");
if(r == 0)
return true;
else
return false;
}
};

12
testpython.py

@ -1,12 +0,0 @@
#!/usr/bin/env python
# Test imports needed by our python search engine nova.py
# Christophe Dumez - chris@qbittorrent.org
import sys
import urllib
import sgmllib
from xml.dom import minidom
if __name__ == '__main__':
pass
Loading…
Cancel
Save