d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

- qConf is buggy and the configure file was not working properly. I had to rewrite most of the configure code to get it working.

adaptive-webui-19844
Christophe Dumez 18 years ago
parent
2f0bee3b19
commit
732cc41be4
3 changed files with 126 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 68
      qcm/libboost.qcm
  2. 79
      qcm/libcurl.qcm
  3. 74
      qcm/libtorrent.qcm

68
qcm/libboost.qcm
Unescape View File

@ -1,6 +1,7 @@
/* /*
-----BEGIN QCMOD----- -----BEGIN QCMOD-----
name: libboost name: libboost
arg: with-libboost-inc=[path], Path to libboost include files
-----END QCMOD----- -----END QCMOD-----
*/ */
class qc_libboost : public ConfObj class qc_libboost : public ConfObj
@ -10,31 +11,46 @@ public:
QString name() const { return "libboost"; } QString name() const { return "libboost"; }
QString shortname() const { return "libboost"; } QString shortname() const { return "libboost"; }
bool exec(){ bool exec(){
QString s; QString s;
QStringList sl; s = conf->getenv("QC_WITH_LIBBOOST_INC");
sl += "/usr/include"; if(!s.isEmpty()) {
sl += "/usr/local/include"; if(!conf->checkHeader(s, "boost/format.hpp")) {
sl += "/sw/include"; return false;
if(!conf->findHeader("boost/format.hpp", sl, &s)) { }
qWarning("libboost includes not found!"); if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
return false; return false;
} }
conf->addIncludePath(s); if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
if(!conf->findHeader("boost/date_time/posix_time/posix_time.hpp", sl, &s)) { return false;
qWarning("libboost-date-time includes not found!"); }
return false; if(!conf->checkHeader(s, "boost/thread.hpp")) {
} return false;
conf->addIncludePath(s); }
if(!conf->findHeader("boost/filesystem/path.hpp", sl, &s)) { }else{
qWarning("libboost-filesystem includes not found!"); QStringList sl;
return false; sl << "/usr/include";
} sl << "/usr/local/include";
if(!conf->findHeader("boost/thread.hpp", sl, &s)) { bool found = false;
qWarning("libboost-thread includes not found!"); foreach(s, sl){
return false; if(conf->checkHeader(s, "boost/format.hpp")){
} found = true;
conf->addIncludePath(s); break;
}
return true; }
if(!found) {
return false;
}
if(!conf->checkHeader(s, "boost/date_time/posix_time/posix_time.hpp")) {
return false;
}
if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) {
return false;
}
if(!conf->checkHeader(s, "boost/thread.hpp")) {
return false;
}
}
conf->addIncludePath(s);
return true;
} }
}; };

79
qcm/libcurl.qcm
Unescape View File

@ -12,43 +12,50 @@ public:
QString name() const { return "libcurl"; } QString name() const { return "libcurl"; }
QString shortname() const { return "libcurl"; } QString shortname() const { return "libcurl"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBCURL_INC"); s = conf->getenv("QC_WITH_LIBCURL_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "curl/curl.h")) { if(!conf->checkHeader(s, "curl/curl.h")) {
qWarning("libcurl includes not found!"); return false;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl += "/usr/include"; sl << "/usr/local/include";
sl += "/usr/local/include"; bool found = false;
if(!conf->findHeader("curl/curl.h", sl, &s)) { foreach(s, sl){
qWarning("libcurl includes not found!"); if(conf->checkHeader(s, "curl/curl.h")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
s = conf->getenv("QC_WITH_LIBCURL_LIB"); s = conf->getenv("QC_WITH_LIBCURL_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "curl")) { if(!conf->checkLibrary(s, "curl")) {
qWarning("libcurl library not found!"); return false;
return false; }
} conf->addLib(QString("-L") + s);
conf->addLib(QString("-L") + s); }else{
}else{ QStringList sl;
if(!conf->findLibrary("curl", &s)) { sl << "/usr/lib/";
qWarning("libcurl library not found!"); sl << "/usr/local/lib/";
return false; bool found = false;
} foreach(s, sl){
if (!s.isEmpty()) if(conf->checkLibrary(s, "curl")){
conf->addLib(QString("-L") + s); found = true;
} break;
}
conf->addLib("-lcurl"); }
if(!found) return false;
return true; conf->addLib(QString("-L") + s);
}
conf->addLib("-lcurl");
return true;
} }
}; };

74
qcm/libtorrent.qcm
Unescape View File

@ -12,43 +12,51 @@ public:
QString name() const { return "libtorrent >= 0.12"; } QString name() const { return "libtorrent >= 0.12"; }
QString shortname() const { return "libtorrent"; } QString shortname() const { return "libtorrent"; }
bool exec(){ bool exec(){
QString s; QString s;
s = conf->getenv("QC_WITH_LIBTORRENT_INC"); s = conf->getenv("QC_WITH_LIBTORRENT_INC");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) { if(!conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")) {
qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); return false;
return false;
} }
conf->addIncludePath(s); }else{
}else{ QStringList sl;
QStringList sl; sl << "/usr/include";
sl << "/usr/include/"; sl << "/usr/local/include";
sl << "/usr/local/include"; bool found = false;
if(!conf->findHeader("libtorrent/extensions/ut_pex.hpp", sl, &s)) { foreach(s, sl){
qWarning("libtorrent v0.12 includes not found!\nYou can download it at http://www.libtorrent.net"); if(conf->checkHeader(s, "libtorrent/extensions/ut_pex.hpp")){
return false; found = true;
} break;
conf->addIncludePath(s); }
} }
if(!found) {
return false;
}
}
conf->addIncludePath(s);
conf->addIncludePath(s+QDir::separator()+"libtorrent");
s = conf->getenv("QC_WITH_LIBTORRENT_LIB"); s = conf->getenv("QC_WITH_LIBTORRENT_LIB");
if(!s.isEmpty()) { if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "torrent")) { if(!conf->checkLibrary(s, "torrent")) {
qWarning("libtorrent library not found!");
return false; return false;
} }
conf->addLib(QString("-L") + s); conf->addLib(QString("-L") + s);
}else{ }else{
if(!conf->findLibrary("torrent", &s)) { QStringList sl;
qWarning("libtorrent library not found!"); sl << "/usr/lib/";
return false; sl << "/usr/local/lib/";
} bool found = false;
if (!s.isEmpty()) foreach(s, sl){
conf->addLib(QString("-L") + s); if(conf->checkLibrary(s, "torrent")){
} found = true;
break;
conf->addLib("-ltorrent"); }
}
return true; if(!found) return false;
conf->addLib(QString("-L") + s);
}
conf->addLib("-ltorrent");
return true;
} }
}; };

Write Preview
Loading…
Cancel
Save