Changeset 115378 for src/Patterns

Timestamp:

Dec 22, 2010, 9:16:51 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

9098f9

Parents:

1d77e1a

git-author:

Frederik Heber <heber@…> (12/22/10 08:22:13)

git-committer:

Frederik Heber <heber@…> (12/22/10 09:16:51)

Message:

Changes to allow for (re-)incorporation of CodePatterns into MoleCuilder.

library:

• no more suffixed with version, this should be dealt by pkg-config (.pc) or a contained version information.
• corrected and extended .pc file
• m4 macro ax_codepatterns.m4 created to allow for easy checking with autotools

codepatterns-config:

• if pkg-config fails there is a small tool that tells about necessary cflags and the likes to compile with CodePatterns library (this was developed before we noticed we had a (half-)working pkg-config present).

smaller changes:

• moved all Helpers files to src/Helpers (again).
• changed include paths for Assert.hpp, ... accordingly.
• version is not prefixed with "v" anymore.
• small stuff in fast_functions.hpp is absolete (stl::algorithms)
• Helpers/enumeration.hpp contains enumeration class ("iterable enum")

Location:

src/Patterns

Files:

• Cacheable.hpp (modified) (1 diff)
• Makefile.am (deleted)
• Makefile.in (deleted)
• Observer.cpp (modified) (2 diffs)
• Registry_impl.hpp (modified) (1 diff)
• Singleton.hpp (modified) (1 diff)
• Singleton_impl.hpp (modified) (1 diff)
• unittests/Makefile.am (modified) (3 diffs)
• unittests/ObserverUnitTest.cpp (modified) (1 diff)

src/Patterns/Cacheable.hpp

@@ -13 +13 @@
 #include <boost/shared_ptr.hpp>
 
-#include "Assert.hpp"
+#include "Helpers/Assert.hpp"
 
 #ifndef NO_CACHING

src/Patterns/Observer.cpp

@@ -18 +18 @@
 #endif
 
-#include "MemDebug.hpp"
+#include "Helpers/MemDebug.hpp"
 
 #include "Observer.hpp"
@@ -24 +24 @@
 #include <iostream>
 
-#include "Assert.hpp"
-#include "MemDebug.hpp"
+#include "Helpers/Assert.hpp"
+#include "Helpers/MemDebug.hpp"
 
 using namespace std;

src/Patterns/Registry_impl.hpp

@@ -9 +9 @@
 #define REGISTRY_IMPL_HPP_
 
-#include "MemDebug.hpp"
+#include "Helpers/MemDebug.hpp"
 
 #include "Patterns/Registry.hpp"
 #include "Patterns/Singleton_impl.hpp"
 
-#include "Assert.hpp"
+#include "Helpers/Assert.hpp"
 #include <iostream>
 

src/Patterns/Singleton.hpp

@@ -11 +11 @@
 #include <boost/thread.hpp>
 
-#include "Assert.hpp"
+#include "Helpers/Assert.hpp"
 
 /**

src/Patterns/Singleton_impl.hpp

@@ -9 +9 @@
 #define SINGLETON_IMPL_HPP_
 
-#include "Assert.hpp"
+#include "Helpers/Assert.hpp"
 #include "Patterns/Singleton.hpp"
 

src/Patterns/unittests/Makefile.am

@@ -20 +20 @@
 BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_MPL_LIB) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(BOOST_THREAD_LIB)
 TESTLIBS = \
-        ../../libCodePatterns-@CODEPATTERNS_API_VERSION@.la \
+        ../../libCodePatterns.la \
         $(BOOST_LIB)
 
@@ -27 +27 @@
         CacheableUnitTest.hpp \
         ../Cachable.hpp \
-        ../Observer.cpp \
         ../Observer.hpp \
         ../ObserverIterator.hpp
@@ -35 +34 @@
         ObserverUnitTest.cpp \
         ObserverUnitTest.hpp \
-        ../Observer.cpp \
         ../Observer.hpp \
         ../ObserverIterator.hpp

src/Patterns/unittests/ObserverUnitTest.cpp

@@ -25 +25 @@
 #include "Patterns/Observer.hpp"
 #include "Patterns/ObservedIterator.hpp"
-#include "Assert.hpp"
+#include "Helpers/Assert.hpp"
 
 #include <iostream>