From 7df03241dccf066d5d75846a34226b32d439c00d Mon Sep 17 00:00:00 2001 From: APTX Date: Wed, 11 May 2011 19:42:07 +0200 Subject: [PATCH] Allow for building without proxy or renameparser support. --- anidbudpclient.pro | 256 ++++++++++++++++++++++------------------- filerenamedelegate.cpp | 17 +++ filerenamedelegate.h | 6 + 3 files changed, 159 insertions(+), 120 deletions(-) diff --git a/anidbudpclient.pro b/anidbudpclient.pro index f57faf5..99a1323 100644 --- a/anidbudpclient.pro +++ b/anidbudpclient.pro @@ -1,120 +1,136 @@ -# ------------------------------------------------- -# Project created by QtCreator 2009-03-22T14:53:52 -# ------------------------------------------------- -QT += network \ - script -QT -= gui -TEMPLATE = lib -TARGET = anidbudpclient -static { - message(anidbpudpclinet: Static build) - DESTDIR = build-static -} -!static { - message(anidbpudpclinet: Dynamic build) - DESTDIR = build -} -INCLUDEPATH += renameparser -DEPENDPATH += renameparser -DEFINES += ANIDBUDPCLIENT_LIBRARY -SOURCES += client.cpp \ - abstractcommand.cpp \ - authcommand.cpp \ - rawcommand.cpp \ - mylistaddcommand.cpp \ - logoutcommand.cpp \ - uptimecommand.cpp \ - mylistcommand.cpp \ - filecommand.cpp \ - votecommand.cpp \ - file.cpp \ - hash.cpp \ - hashproducer.cpp \ - hashconsumer.cpp \ - clientsentcommandsmodel.cpp \ - clientqueuedcommandsmodel.cpp \ - filerenamedelegate.cpp \ - clientinterface.cpp \ - myliststate.cpp - -HEADERS += client.h \ - anidbudpclient_global.h \ - abstractcommand.h \ - authcommand.h \ - rawcommand.h \ - mylistaddcommand.h \ - logoutcommand.h \ - uptimecommand.h \ - mylistcommand.h \ - filecommand.h \ - votecommand.h \ - file.h \ - hash.h \ - hashproducer.h \ - hashconsumer.h \ - circularbuffer.h \ - clientsentcommandsmodel.h \ - clientqueuedcommandsmodel.h \ - filerenamedelegate.h \ - clientinterface.h \ - myliststate.h - -CONV_HEADERS += include/AniDBUdpClient/Client \ - include/AniDBUdpClient/AbstractCommand \ - include/AniDBUdpClient/RawCommand \ - include/AniDBUdpClient/MyListCommand \ - include/AniDBUdpClient/MyListAddCommand \ - include/AniDBUdpClient/FileCommand \ - include/AniDBUdpClient/VoteCommand \ - include/AniDBUdpClient/UptimeCommand \ - include/AniDBUdpClient/File \ - include/AniDBUdpClient/Hash \ - include/AniDBUdpClient/ClientSentCommandsModel \ - include/AniDBUdpClient/ClientQueuedCommandsModel \ - include/AniDBUdpClient/FileRenameDelegate - -# proxy files - -CONFIG += qxt -QXT *= network - -HEADERS += proxyclient.h \ - proxyserver.h \ - -SOURCES += proxyclient.cpp \ - proxyserver.cpp \ - -CONV_HEADERS += include/AniDBUdpClient/ProxyClient \ - include/AniDBUdpClient/ProxyServer - -# RenameParser Files - -HEADERS += renameparser/renameengine.h \ - renameparser/functions.h \ - renameparser/abstractparser.h \ - renameparser/ast.h \ - renameparser/debugwalk.h \ - renameparser/abstractwalk.h \ - renameparser/evaluatewalk.h \ - renameparser/analyzewalk.h -SOURCES += renameparser/renameengine.cpp \ - renameparser/functions.cpp \ - renameparser/abstractparser.cpp \ - renameparser/ast.cpp \ - renameparser/debugwalk.cpp \ - renameparser/abstractwalk.cpp \ - renameparser/evaluatewalk.cpp \ - renameparser/analyzewalk.cpp - -HEADERS += renameparser/AniAdd/renameparser.h \ - renameparser/AniAdd/renamegrammar_p.h \ - renameparser/AniAdd/lexer.h -SOURCES += renameparser/AniAdd/renameparser.cpp \ - renameparser/AniAdd/renamegrammar.cpp \ - renameparser/AniAdd/lexer.cpp - -QT *= script -HEADERS += renameparser/ECMAScript/parser.h -SOURCES += renameparser/ECMAScript/parser.cpp - -CONV_HEADERS += include/RenameParser/RenameEngine +# ------------------------------------------------- +# Project created by QtCreator 2009-03-22T14:53:52 +# ------------------------------------------------- +QT += network \ + script +QT -= gui +TEMPLATE = lib +TARGET = anidbudpclient +static { + message(anidbpudpclinet: Static build) + DESTDIR = build-static +} +!static { + message(anidbpudpclinet: Dynamic build) + DESTDIR = build +} + +DEFINES += ANIDBUDPCLIENT_LIBRARY +SOURCES += client.cpp \ + abstractcommand.cpp \ + authcommand.cpp \ + rawcommand.cpp \ + mylistaddcommand.cpp \ + logoutcommand.cpp \ + uptimecommand.cpp \ + mylistcommand.cpp \ + filecommand.cpp \ + votecommand.cpp \ + file.cpp \ + hash.cpp \ + hashproducer.cpp \ + hashconsumer.cpp \ + clientsentcommandsmodel.cpp \ + clientqueuedcommandsmodel.cpp \ + filerenamedelegate.cpp \ + clientinterface.cpp \ + myliststate.cpp + +HEADERS += client.h \ + anidbudpclient_global.h \ + abstractcommand.h \ + authcommand.h \ + rawcommand.h \ + mylistaddcommand.h \ + logoutcommand.h \ + uptimecommand.h \ + mylistcommand.h \ + filecommand.h \ + votecommand.h \ + file.h \ + hash.h \ + hashproducer.h \ + hashconsumer.h \ + circularbuffer.h \ + clientsentcommandsmodel.h \ + clientqueuedcommandsmodel.h \ + filerenamedelegate.h \ + clientinterface.h \ + myliststate.h + +CONV_HEADERS += include/AniDBUdpClient/Client \ + include/AniDBUdpClient/AbstractCommand \ + include/AniDBUdpClient/RawCommand \ + include/AniDBUdpClient/MyListCommand \ + include/AniDBUdpClient/MyListAddCommand \ + include/AniDBUdpClient/FileCommand \ + include/AniDBUdpClient/VoteCommand \ + include/AniDBUdpClient/UptimeCommand \ + include/AniDBUdpClient/File \ + include/AniDBUdpClient/Hash \ + include/AniDBUdpClient/ClientSentCommandsModel \ + include/AniDBUdpClient/ClientQueuedCommandsModel \ + include/AniDBUdpClient/FileRenameDelegate + +# proxy files + +!noproxy { + + CONFIG += qxt + QXT *= network + + HEADERS += proxyclient.h \ + proxyserver.h \ + + SOURCES += proxyclient.cpp \ + proxyserver.cpp \ + + CONV_HEADERS += include/AniDBUdpClient/ProxyClient \ + include/AniDBUdpClient/ProxyServer +} +noproxy { + DEFINES += ANIDBUDPCLIENT_NO_PROXY + message(Disabled proxy support) +} + +# RenameParser Files + +!norenameparser { + + INCLUDEPATH += renameparser + DEPENDPATH += renameparser + + HEADERS += renameparser/renameengine.h \ + renameparser/functions.h \ + renameparser/abstractparser.h \ + renameparser/ast.h \ + renameparser/debugwalk.h \ + renameparser/abstractwalk.h \ + renameparser/evaluatewalk.h \ + renameparser/analyzewalk.h + SOURCES += renameparser/renameengine.cpp \ + renameparser/functions.cpp \ + renameparser/abstractparser.cpp \ + renameparser/ast.cpp \ + renameparser/debugwalk.cpp \ + renameparser/abstractwalk.cpp \ + renameparser/evaluatewalk.cpp \ + renameparser/analyzewalk.cpp + + HEADERS += renameparser/AniAdd/renameparser.h \ + renameparser/AniAdd/renamegrammar_p.h \ + renameparser/AniAdd/lexer.h + SOURCES += renameparser/AniAdd/renameparser.cpp \ + renameparser/AniAdd/renamegrammar.cpp \ + renameparser/AniAdd/lexer.cpp + + QT *= script + HEADERS += renameparser/ECMAScript/parser.h + SOURCES += renameparser/ECMAScript/parser.cpp + + CONV_HEADERS += include/RenameParser/RenameEngine +} +norenameparser { + DEFINES += ANIDBUDPCLIENT_NO_RENAMEPARSER + message(Disabled renameparser support) +} diff --git a/filerenamedelegate.cpp b/filerenamedelegate.cpp index 9a54f87..a40ccb6 100644 --- a/filerenamedelegate.cpp +++ b/filerenamedelegate.cpp @@ -23,6 +23,10 @@ RenameParser::RenameEngine *FileRenameDelegate::renameEngine() const void FileRenameDelegate::setRenameEngine(RenameParser::RenameEngine *renameEngine) { +#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER + Q_UNUSED(renameEngine) + return; +#else if (m_renameEngine) { m_renameEngine->disconnect(this); @@ -34,6 +38,7 @@ void FileRenameDelegate::setRenameEngine(RenameParser::RenameEngine *renameEngin return; connect(m_renameEngine, SIGNAL(renameStringChanged()), this, SLOT(updateMasks())); +#endif } @@ -49,6 +54,12 @@ FMask FileRenameDelegate::requiredFMask() const void FileRenameDelegate::rename(const AniDBUdpClient::FileReply *reply, QString &fileName, QString &filePath) { +#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER + Q_UNUSED(reply) + Q_UNUSED(fileName) + Q_UNUSED(filePath) + return; +#else if (!m_renameEngine || !reply) return; @@ -112,10 +123,15 @@ void FileRenameDelegate::rename(const AniDBUdpClient::FileReply *reply, QString fileName = env.value("FileName", ""); filePath = env.value("FilePath", ""); +#endif } void FileRenameDelegate::updateMasks() { +#ifdef ANIDBUDPCLIENT_NO_RENAMEPARSER + return; +#else + static bool init = true; static QMap fMaskVars; static QMap aMaskVars; @@ -170,6 +186,7 @@ void FileRenameDelegate::updateMasks() if (aMaskVars.contains(var)) aMask |= aMaskVars[var]; } +#endif } } // namespace AniDBUdpClient diff --git a/filerenamedelegate.h b/filerenamedelegate.h index 6728ad9..f5e8435 100644 --- a/filerenamedelegate.h +++ b/filerenamedelegate.h @@ -2,7 +2,13 @@ #define FILERENAMEDELEGATE_H #include "anidbudpclient_global.h" +#ifndef ANIDBUDPCLIENT_NO_RENAMEPARSER #include "renameparser/renameengine.h" +#else + namespace RenameParser { + class RenameEngine {}; + } +#endif #include #include -- 2.52.0