Move non p2 specific components into a supporting library, build libmisc into this too

18 files changed, 30 insertions, 12 deletions

diff --git a/project2/cgi/Jamfile.jam b/project2/cgi/Jamfile.jam
index b5725d0..6d9021e 100644
--- a/project2/cgi/Jamfile.jam
+++ b/project2/cgi/Jamfile.jam
@@ -24,6 +24,7 @@ lib p2cgicommon :
 	<library>cgicc
 	<library>glibmm
 	<library>../common//p2common
+	<library>../lib//p2lib
 	<library>boost_filesystem
 	<library>../xml//p2xml
 	<library>gcrypt
diff --git a/project2/common/Jamfile.jam b/project2/common/Jamfile.jam
index 1559f25..bf61902 100644
--- a/project2/common/Jamfile.jam
+++ b/project2/common/Jamfile.jam
@@ -15,19 +15,16 @@ cpp-pch pch : pch.hpp :
 lib p2common :
 	pch
 	[ glob-tree *.cpp ]
-	../../libmisc/buffer.cpp
-	../../libmisc/misc.cpp
 	:
-	<include>../../libmisc
 	<library>glibmm 
 	<library>dl
 	<library>boost_system
 	<library>boost_filesystem
 	<library>boost_date_time
 	<library>../uuid//p2uuid
+	<library>../lib//p2lib
 	: :
 	<include>.
-	<include>../../libmisc
 	<library>boost_system
 	;
 
diff --git a/project2/common/variables/lookup.cpp b/project2/common/variables/lookup.cpp
index 41326c2..19884e5 100644
--- a/project2/common/variables/lookup.cpp
+++ b/project2/common/variables/lookup.cpp
@@ -1,6 +1,6 @@
 #include "../pch.hpp"
 #include "../variables.h"
-#include "../safeMapFind.h"
+#include <safeMapFind.h>
 #include "../logger.h"
 #include "../rowProcessor.h"
 #include "../rowSet.h"
diff --git a/project2/files/Jamfile.jam b/project2/files/Jamfile.jam
index 3b23db0..66d55f0 100644
--- a/project2/files/Jamfile.jam
+++ b/project2/files/Jamfile.jam
@@ -21,6 +21,7 @@ lib p2files :
 	<library>boost_iostreams
 	<library>gcrypt
 	<library>../common//p2common
+	<library>../lib//p2lib
 	: :
 	<include>.
 	;
diff --git a/project2/files/fileStream.cpp b/project2/files/fileStream.cpp
index d01ce27..99eb302 100644
--- a/project2/files/fileStream.cpp
+++ b/project2/files/fileStream.cpp
@@ -1,6 +1,6 @@
 #include "pch.hpp"
 #include "logger.h"
-#include "scopeObject.h"
+#include <scopeObject.h>
 #include "stream.h"
 #include "rowProcessor.h"
 #include "scriptLoader.h"
diff --git a/project2/files/presenterCache.cpp b/project2/files/presenterCache.cpp
index ee07fd2..439028a 100644
--- a/project2/files/presenterCache.cpp
+++ b/project2/files/presenterCache.cpp
@@ -1,7 +1,7 @@
 #include "../common/presenterCache.h"
 #include "../common/exceptions.h"
 #include "../common/options.h"
-#include "../common/safeMapFind.h"
+#include <safeMapFind.h>
 #include "../common/environment.h"
 #include <fcntl.h>
 #include <attr/xattr.h>
diff --git a/project2/json/Jamfile.jam b/project2/json/Jamfile.jam
index 323e4fe..88bf92e 100644
--- a/project2/json/Jamfile.jam
+++ b/project2/json/Jamfile.jam
@@ -16,6 +16,7 @@ lib p2json :
 	<include>../libmisc
 	<library>glibmm
 	<library>../common//p2common
+	<library>../lib//p2lib
 	<library>../uuid//p2uuid
 	<library>../url//p2url
 	<library>boost_filesystem
diff --git a/project2/lib/Jamfile.jam b/project2/lib/Jamfile.jam
new file mode 100644
index 0000000..5825d48
--- /dev/null
+++ b/project2/lib/Jamfile.jam
@@ -0,0 +1,15 @@
+alias glibmm : : : :
+	<cflags>"`pkg-config --cflags glibmm-2.4`"
+	<linkflags>"`pkg-config --libs glibmm-2.4`"
+	;
+
+lib p2lib :
+	[ glob-tree *.cpp ]
+	../../libmisc/buffer.cpp
+	../../libmisc/misc.cpp
+	:
+	<include>../../libmisc
+	: :
+	<include>../../libmisc
+	<include>.
+	;
diff --git a/project2/common/safeMapFind.h b/project2/lib/safeMapFind.h
index a5786bc..a5786bc 100644
--- a/project2/common/safeMapFind.h
+++ b/project2/lib/safeMapFind.h
diff --git a/project2/common/scopeObject.cpp b/project2/lib/scopeObject.cpp
index b51287c..e2e42da 100644
--- a/project2/common/scopeObject.cpp
+++ b/project2/lib/scopeObject.cpp
@@ -1,6 +1,4 @@
-#include "pch.hpp"
 #include "scopeObject.h"
-#include "logger.h"
 
 ScopeObject::ScopeObject(const Event & onexitpre, const Event & onsuccess, const Event & onfailure, const Event & onexitpost) :
 	onExitPre(onexitpre),
diff --git a/project2/common/scopeObject.h b/project2/lib/scopeObject.h
index d019e7d..6fc323d 100644
--- a/project2/common/scopeObject.h
+++ b/project2/lib/scopeObject.h
@@ -5,7 +5,7 @@
 
 class ScopeObject {
 	public:
-		typedef boost::function0<void> Event;
+		typedef boost::function<void()> Event;
 		ScopeObject(const Event &, const Event & = Event(), const Event & = Event(), const Event & = Event());
 		~ScopeObject();
 
diff --git a/project2/processes/Jamfile.jam b/project2/processes/Jamfile.jam
index cba36f2..99f6ffd 100644
--- a/project2/processes/Jamfile.jam
+++ b/project2/processes/Jamfile.jam
@@ -8,5 +8,6 @@ lib p2processes :
 	<include>../../libmisc
 	<library>glibmm
 	<library>../common//p2common
+	<library>../lib//p2lib
 	;
 
diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
index f73fd65..dffab25 100644
--- a/project2/sql/Jamfile.jam
+++ b/project2/sql/Jamfile.jam
@@ -51,6 +51,7 @@ lib p2sql :
 	<mysql>yes:<library>sql-modMySQL
 	<library>glibmm
 	<library>../common//p2common
+	<library>../lib//p2lib
 	<include>../../libmisc
 	;
 
diff --git a/project2/streams/Jamfile.jam b/project2/streams/Jamfile.jam
index be72d6e..530fac1 100644
--- a/project2/streams/Jamfile.jam
+++ b/project2/streams/Jamfile.jam
@@ -9,5 +9,6 @@ lib p2streams :
 	<include>../../libmisc
 	<library>glibmm
 	<library>../common//p2common
+	<library>../lib//p2lib
 	;
 
diff --git a/project2/streams/viewStream.cpp b/project2/streams/viewStream.cpp
index fb40c0e..28efc17 100644
--- a/project2/streams/viewStream.cpp
+++ b/project2/streams/viewStream.cpp
@@ -1,6 +1,6 @@
 #include "scriptLoader.h"
 #include "stream.h"
-#include "scopeObject.h"
+#include <scopeObject.h>
 #include "ostreamWrapper.h"
 #include "viewHost.h"
 #include <boost/iostreams/stream.hpp>
diff --git a/project2/url/Jamfile.jam b/project2/url/Jamfile.jam
index 272749d..b35eb03 100644
--- a/project2/url/Jamfile.jam
+++ b/project2/url/Jamfile.jam
@@ -9,6 +9,7 @@ lib p2url :
 	../../libmisc/curlsup.cpp
 	:
 	<library>../common//p2common
+	<library>../lib//p2lib
 	<include>../../libmisc
 	<library>glibmm
 	<library>curl
diff --git a/project2/url/downloadToFile.cpp b/project2/url/downloadToFile.cpp
index dcd9710..5546efc 100644
--- a/project2/url/downloadToFile.cpp
+++ b/project2/url/downloadToFile.cpp
@@ -1,6 +1,6 @@
 #include "curlHelper.h"
 #include "task.h"
-#include "scopeObject.h"
+#include <scopeObject.h>
 #include "scriptLoader.h"
 #include "exceptions.h"
 #include "../libmisc/curlsup.h"
diff --git a/project2/xml/Jamfile.jam b/project2/xml/Jamfile.jam
index 2adadaf..8addab8 100644
--- a/project2/xml/Jamfile.jam
+++ b/project2/xml/Jamfile.jam
@@ -21,6 +21,7 @@ lib p2xml :
 	<library>../common//p2common
 	<library>../uuid//p2uuid
 	<library>../url//p2url
+	<library>../lib//p2lib
 	<library>libxslt
 	<library>boost_filesystem
 	<library>boost_date_time