diff options
46 files changed, 181 insertions, 0 deletions
diff --git a/project2/cgi/Jamfile.jam b/project2/cgi/Jamfile.jam index fe5a3d2..261e992 100644 --- a/project2/cgi/Jamfile.jam +++ b/project2/cgi/Jamfile.jam @@ -7,7 +7,17 @@ lib cgicc : : <name>cgicc ; lib fcgi : : <name>fcgi ; lib fcgi++ : : <name>fcgi++ ; +cpp-pch pch : pch.hpp : + <include>../../libmisc + <library>cgicc + <library>libxmlpp + <library>../common//p2common + <library>boost_program_options + <library>boost_filesystem + <library>../xml//p2xml + ; lib p2web : + pch [ glob cgi*.cpp ] : <include>../libmisc diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index c01e4ac..4978c0c 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include <cgicc/Cgicc.h> #include <cgicc/HTTPHeader.h> diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp index 89808e1..3703c07 100644 --- a/project2/cgi/cgiCommon.cpp +++ b/project2/cgi/cgiCommon.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiCommon.h" #include "logger.h" #include <libxml/tree.h> diff --git a/project2/cgi/cgiEnvironment.cpp b/project2/cgi/cgiEnvironment.cpp index 039ff98..541e7ae 100644 --- a/project2/cgi/cgiEnvironment.cpp +++ b/project2/cgi/cgiEnvironment.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiEnvironment.h" #include "appEngine.h" #include "exceptions.h" diff --git a/project2/cgi/cgiHttpHeader.cpp b/project2/cgi/cgiHttpHeader.cpp index 37a48c9..e82a882 100644 --- a/project2/cgi/cgiHttpHeader.cpp +++ b/project2/cgi/cgiHttpHeader.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiHttpHeader.h" #include <boost/foreach.hpp> diff --git a/project2/cgi/cgiStageCustomError.cpp b/project2/cgi/cgiStageCustomError.cpp index b223323..8b4b347 100644 --- a/project2/cgi/cgiStageCustomError.cpp +++ b/project2/cgi/cgiStageCustomError.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageCustomNotFound.cpp b/project2/cgi/cgiStageCustomNotFound.cpp index 9575e94..fc49804 100644 --- a/project2/cgi/cgiStageCustomNotFound.cpp +++ b/project2/cgi/cgiStageCustomNotFound.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp index 5828831..5ba371f 100644 --- a/project2/cgi/cgiStageDefaultError.cpp +++ b/project2/cgi/cgiStageDefaultError.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiHttpHeader.h" #include "logger.h" diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp index 3407d0e..d67d892 100644 --- a/project2/cgi/cgiStageDefaultNotFound.cpp +++ b/project2/cgi/cgiStageDefaultNotFound.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp index 92595ef..b263110 100644 --- a/project2/cgi/cgiStageInitial.cpp +++ b/project2/cgi/cgiStageInitial.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "exceptions.h" diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp index 44a344b..fffcaa7 100644 --- a/project2/cgi/cgiStagePresent.cpp +++ b/project2/cgi/cgiStagePresent.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp index c17efac..4831a71 100644 --- a/project2/cgi/cgiStageRequest.cpp +++ b/project2/cgi/cgiStageRequest.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cgiAppEngine.h" #include "cgiEnvironment.h" #include "cgiHttpHeader.h" diff --git a/project2/cgi/pch.hpp b/project2/cgi/pch.hpp new file mode 100644 index 0000000..b3c7108 --- /dev/null +++ b/project2/cgi/pch.hpp @@ -0,0 +1,28 @@ +#ifdef BOOST_BUILD_PCH_ENABLED +#ifndef CGI_PCH +#define CGI_PCH + +#include "appEngine.h" +#include "cgiAppEngine.h" +#include "cgiCommon.h" +#include "cgiEnvironment.h" +#include "cgiHttpHeader.h" +#include "exceptions.h" +#include "iterate.h" +#include "logger.h" +#include "xmlObjectLoader.h" +#include <boost/bind.hpp> +#include <boost/foreach.hpp> +#include <boost/program_options.hpp> +#include <cgicc/CgiEnvironment.h> +#include <cgicc/Cgicc.h> +#include <cgicc/HTTPContentHeader.h> +#include <cgicc/HTTPHeader.h> +#include <cgicc/HTTPStatusHeader.h> +#include <iostream> +#include <map> +#include <stdexcept> + +#endif +#endif + diff --git a/project2/console/Jamfile.jam b/project2/console/Jamfile.jam index 72d2c1f..3a95bd6 100644 --- a/project2/console/Jamfile.jam +++ b/project2/console/Jamfile.jam @@ -2,7 +2,13 @@ alias libxmlpp : : : : <cflags>"`pkg-config --cflags libxml++-2.6`" <linkflags>"`pkg-config --libs libxml++-2.6`" ; +cpp-pch pch : pch.hpp : + <include>../../libmisc + <library>libxmlpp + <library>..//p2parts + ; exe p2console : + pch [ glob *.cpp ] : <library>..//p2parts diff --git a/project2/console/consoleAppEngine.cpp b/project2/console/consoleAppEngine.cpp index ce1cd0a..c5b9e3f 100644 --- a/project2/console/consoleAppEngine.cpp +++ b/project2/console/consoleAppEngine.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "consoleAppEngine.h" #include "consoleEnvironment.h" #include "iterate.h" diff --git a/project2/console/consoleEnvironment.cpp b/project2/console/consoleEnvironment.cpp index 128ecac..fa2748e 100644 --- a/project2/console/consoleEnvironment.cpp +++ b/project2/console/consoleEnvironment.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "consoleEnvironment.h" #include <sys/utsname.h> #include <errno.h> diff --git a/project2/console/consolePresenter.cpp b/project2/console/consolePresenter.cpp index d122771..d1aeeb7 100644 --- a/project2/console/consolePresenter.cpp +++ b/project2/console/consolePresenter.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "consolePresenter.h" DECLARE_COMPONENT_LOADER("console", ConsolePresenter, PresenterLoader) diff --git a/project2/console/p2consoleMain.cpp b/project2/console/p2consoleMain.cpp index bad803f..6201e72 100644 --- a/project2/console/p2consoleMain.cpp +++ b/project2/console/p2consoleMain.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include <libxml/tree.h> #include "consoleEnvironment.h" #include "consoleAppEngine.h" diff --git a/project2/console/pch.hpp b/project2/console/pch.hpp new file mode 100644 index 0000000..39cc465 --- /dev/null +++ b/project2/console/pch.hpp @@ -0,0 +1,20 @@ +#ifdef BOOST_BUILD_PCH_ENABLED +#ifndef CONSOLE_PCH +#define CONSOLE_PCH + +#include "consoleAppEngine.h" +#include "consoleEnvironment.h" +#include "consolePresenter.h" +#include "exceptions.h" +#include "iterate.h" +#include "logger.h" +#include "xmlObjectLoader.h" +#include <boost/bind.hpp> +#include <boost/foreach.hpp> +#include <boost/program_options.hpp> +#include <iostream> +#include <string> + +#endif +#endif + diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam index b05fd34..779aba3 100644 --- a/project2/sql/Jamfile.jam +++ b/project2/sql/Jamfile.jam @@ -24,7 +24,14 @@ obj sql-modPQ : <library>../../libpqpp//pqpp ; +cpp-pch pch : pch.hpp : + <include>../../libmisc + <include>../../libdbpp + <library>libxmlpp + <library>../common//p2common + ; lib p2sql : + pch sqlCheck.cpp sqlWriter.cpp sqlTask.cpp sqlMergeTask.cpp sqlRows.cpp sqlCache.cpp sqlVariableBinder.cpp tablepatch.cpp rdbmsDataSource.cpp sqlHandleAsVariableType.cpp ../../libdbpp//dbpp diff --git a/project2/sql/connectionLoader.h b/project2/sql/connectionLoader.h index 841b425..eabf28b 100644 --- a/project2/sql/connectionLoader.h +++ b/project2/sql/connectionLoader.h @@ -1,3 +1,6 @@ +#ifndef CONNECTIONLOADER_H +#define CONNECTIONLOADER_H + #include "xmlObjectLoader.h" #include "../libdbpp/connection.h" @@ -17,3 +20,5 @@ class ConnectionLoaderImpl : public ConnectionLoader { } }; +#endif + diff --git a/project2/sql/pch.hpp b/project2/sql/pch.hpp new file mode 100644 index 0000000..f009f1c --- /dev/null +++ b/project2/sql/pch.hpp @@ -0,0 +1,35 @@ +#ifdef BOOST_BUILD_PCH_ENABLED +#ifndef SQL_PCH +#define SQL_PCH + +#include "cache.h" +#include "column.h" +#include "columns.h" +#include "command.h" +#include "commonObjects.h" +#include "connectionLoader.h" +#include "exceptions.h" +#include "iHaveParameters.h" +#include "logger.h" +#include "modifycommand.h" +#include "rdbmsDataSource.h" +#include "rowProcessor.h" +#include "rowSet.h" +#include "selectcommand.h" +#include "sqlHandleAsVariableType.h" +#include "sqlVariableBinder.h" +#include "sqlWriter.h" +#include "variables.h" +#include "xmlObjectLoader.h" +#include <boost/bind.hpp> +#include <boost/foreach.hpp> +#include <boost/program_options.hpp> +#include <buffer.h> +#include <column.h> +#include <errno.h> +#include <libxml++/nodes/textnode.h> +#include <stdexcept> + +#endif +#endif + diff --git a/project2/sql/rdbmsDataSource.cpp b/project2/sql/rdbmsDataSource.cpp index dac6cb1..77d6fbf 100644 --- a/project2/sql/rdbmsDataSource.cpp +++ b/project2/sql/rdbmsDataSource.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "rdbmsDataSource.h" #include "connectionLoader.h" #include <libxml++/nodes/textnode.h> diff --git a/project2/sql/sqlCache.cpp b/project2/sql/sqlCache.cpp index 13bc23d..44b4399 100644 --- a/project2/sql/sqlCache.cpp +++ b/project2/sql/sqlCache.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cache.h" #include "sqlVariableBinder.h" #include "sqlHandleAsVariableType.h" diff --git a/project2/sql/sqlCheck.cpp b/project2/sql/sqlCheck.cpp index d86eb3b..d6e0651 100644 --- a/project2/sql/sqlCheck.cpp +++ b/project2/sql/sqlCheck.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlCheck.h" #include "xmlObjectLoader.h" #include "selectcommand.h" diff --git a/project2/sql/sqlHandleAsVariableType.cpp b/project2/sql/sqlHandleAsVariableType.cpp index f084a14..e628c29 100644 --- a/project2/sql/sqlHandleAsVariableType.cpp +++ b/project2/sql/sqlHandleAsVariableType.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlHandleAsVariableType.h" #include <boost/date_time/posix_time/posix_time.hpp> diff --git a/project2/sql/sqlMergeTask.cpp b/project2/sql/sqlMergeTask.cpp index 09657f8..fd9ae96 100644 --- a/project2/sql/sqlMergeTask.cpp +++ b/project2/sql/sqlMergeTask.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlMergeTask.h" #include "columns.h" #include "commonObjects.h" diff --git a/project2/sql/sqlRows.cpp b/project2/sql/sqlRows.cpp index 6e506d7..ed2d71b 100644 --- a/project2/sql/sqlRows.cpp +++ b/project2/sql/sqlRows.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlRows.h" #include "sqlHandleAsVariableType.h" #include "rowProcessor.h" diff --git a/project2/sql/sqlTask.cpp b/project2/sql/sqlTask.cpp index 3a1d334..63f73a9 100644 --- a/project2/sql/sqlTask.cpp +++ b/project2/sql/sqlTask.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlTask.h" #include <boost/foreach.hpp> #include "xmlObjectLoader.h" diff --git a/project2/sql/sqlVariableBinder.cpp b/project2/sql/sqlVariableBinder.cpp index 23c24f2..169fe2c 100644 --- a/project2/sql/sqlVariableBinder.cpp +++ b/project2/sql/sqlVariableBinder.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlVariableBinder.h" #include "command.h" #include "variables.h" diff --git a/project2/sql/sqlWriter.cpp b/project2/sql/sqlWriter.cpp index 88d9801..90de82f 100644 --- a/project2/sql/sqlWriter.cpp +++ b/project2/sql/sqlWriter.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sqlWriter.h" #include <boost/foreach.hpp> #include "sqlVariableBinder.h" diff --git a/project2/sql/tablepatch.cpp b/project2/sql/tablepatch.cpp index f87f60e..8443c7b 100644 --- a/project2/sql/tablepatch.cpp +++ b/project2/sql/tablepatch.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "tablepatch.h" #include <stdio.h> #include <misc.h> diff --git a/project2/xml/Jamfile.jam b/project2/xml/Jamfile.jam index 0cd4e1e..b6e29ef 100644 --- a/project2/xml/Jamfile.jam +++ b/project2/xml/Jamfile.jam @@ -6,7 +6,13 @@ alias libxslt : : : : <linkflags>"`pkg-config --libs libexslt`" ; lib boost_filesystem : : <name>boost_filesystem ; +cpp-pch pch : pch.hpp : + <include>../../libmisc + <library>libxmlpp + <library>../common//p2common + ; lib p2xml : + pch rawView.cpp xmlPresenter.cpp transformHtml.cpp transformText.cpp xmlRows.cpp xmlRawRows.cpp xslRows.cpp xslRowsCache.cpp xslPreFetch.cpp xmlMemCache.cpp xmlCache.cpp sessionXml.cpp : diff --git a/project2/xml/pch.hpp b/project2/xml/pch.hpp new file mode 100644 index 0000000..911d45c --- /dev/null +++ b/project2/xml/pch.hpp @@ -0,0 +1,27 @@ +#ifdef BOOST_BUILD_PCH_ENABLED +#ifndef XML_PCH +#define XML_PCH + +#include "appEngine.h" +#include "cache.h" +#include "environment.h" +#include "exceptions.h" +#include "iHaveParameters.h" +#include "logger.h" +#include "presenter.h" +#include "rawView.h" +#include "rowProcessor.h" +#include "safeMapFind.h" +#include "variables.h" +#include <boost/filesystem/path.hpp> +#include <boost/foreach.hpp> +#include <boost/program_options.hpp> +#include <libxml++/document.h> +#include <libxml++/nodes/element.h> +#include <libxml++/nodes/textnode.h> +#include <libxml++/parsers/domparser.h> +#include <set> + +#endif +#endif + diff --git a/project2/xml/rawView.cpp b/project2/xml/rawView.cpp index 73c319d..f033542 100644 --- a/project2/xml/rawView.cpp +++ b/project2/xml/rawView.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "exceptions.h" #include "rawView.h" #include "xml.h" diff --git a/project2/xml/sessionXml.cpp b/project2/xml/sessionXml.cpp index c1e2158..dd4e01c 100644 --- a/project2/xml/sessionXml.cpp +++ b/project2/xml/sessionXml.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sessionXml.h" #include "uuid.h" #include <libxml++/nodes/element.h> diff --git a/project2/xml/transformHtml.cpp b/project2/xml/transformHtml.cpp index eae1c27..6efb7e5 100644 --- a/project2/xml/transformHtml.cpp +++ b/project2/xml/transformHtml.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "transformHtml.h" #include "logger.h" #include <libxml++/document.h> diff --git a/project2/xml/transformText.cpp b/project2/xml/transformText.cpp index 5ba03cc..bec1a95 100644 --- a/project2/xml/transformText.cpp +++ b/project2/xml/transformText.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "transformText.h" #include <libxml++/document.h> #include "transformHtml.h" diff --git a/project2/xml/xmlCache.cpp b/project2/xml/xmlCache.cpp index 86b098a..020ad04 100644 --- a/project2/xml/xmlCache.cpp +++ b/project2/xml/xmlCache.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cache.h" #include "logger.h" #include "xmlObjectLoader.h" diff --git a/project2/xml/xmlMemCache.cpp b/project2/xml/xmlMemCache.cpp index af54eb5..9fe0a6f 100644 --- a/project2/xml/xmlMemCache.cpp +++ b/project2/xml/xmlMemCache.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cache.h" #include "logger.h" #include "xmlObjectLoader.h" diff --git a/project2/xml/xmlPresenter.cpp b/project2/xml/xmlPresenter.cpp index adaed38..6d4ddeb 100644 --- a/project2/xml/xmlPresenter.cpp +++ b/project2/xml/xmlPresenter.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xmlPresenter.h" #include "xmlObjectLoader.h" #include "variables.h" diff --git a/project2/xml/xmlRawRows.cpp b/project2/xml/xmlRawRows.cpp index 68a4e8c..c227b2c 100644 --- a/project2/xml/xmlRawRows.cpp +++ b/project2/xml/xmlRawRows.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xmlRawRows.h" #include <boost/foreach.hpp> #include <libxml++/parsers/domparser.h> diff --git a/project2/xml/xmlRows.cpp b/project2/xml/xmlRows.cpp index 8982945..182da6a 100644 --- a/project2/xml/xmlRows.cpp +++ b/project2/xml/xmlRows.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xmlRows.h" #include "rowProcessor.h" #include "xml.h" diff --git a/project2/xml/xslPreFetch.cpp b/project2/xml/xslPreFetch.cpp index b70d83c..136e20f 100644 --- a/project2/xml/xslPreFetch.cpp +++ b/project2/xml/xslPreFetch.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xslPreFetch.h" #include "xmlObjectLoader.h" diff --git a/project2/xml/xslRows.cpp b/project2/xml/xslRows.cpp index 07d57b6..666b607 100644 --- a/project2/xml/xslRows.cpp +++ b/project2/xml/xslRows.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xslRows.h" #include "safeMapFind.h" #include "rowProcessor.h" diff --git a/project2/xml/xslRowsCache.cpp b/project2/xml/xslRowsCache.cpp index 5cbc44c..51fd6c0 100644 --- a/project2/xml/xslRowsCache.cpp +++ b/project2/xml/xslRowsCache.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xslRowsCache.h" #include <string.h> #include <libxml/HTMLparser.h> |