Changeset 115378 for src

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

Files:

• Helpers/Assert.cpp (moved) (moved from src/Assert.cpp )
• Helpers/Assert.hpp (moved) (moved from src/Assert.hpp ) (1 diff)
• Helpers/Info.cpp (moved) (moved from src/Info.cpp )
• Helpers/Info.hpp (moved) (moved from src/Info.hpp )
• Helpers/Log.cpp (moved) (moved from src/Log.cpp )
• Helpers/Log.hpp (moved) (moved from src/Log.hpp )
• Helpers/MemDebug.cpp (moved) (moved from src/MemDebug.cpp )
• Helpers/MemDebug.hpp (moved) (moved from src/MemDebug.hpp )
• Helpers/Range.hpp (moved) (moved from src/Range.hpp )
• Helpers/Verbose.cpp (moved) (moved from src/Verbose.cpp )
• Helpers/Verbose.hpp (moved) (moved from src/Verbose.hpp )
• Helpers/enumeration.hpp (added)
• Helpers/errorlogger.cpp (moved) (moved from src/errorlogger.cpp )
• Helpers/errorlogger.hpp (moved) (moved from src/errorlogger.hpp )
• Helpers/logger.cpp (moved) (moved from src/logger.cpp )
• Helpers/logger.hpp (moved) (moved from src/logger.hpp )
• Helpers/toString.hpp (moved) (moved from src/toString.hpp )
• Makefile.am (modified) (7 diffs)
• Patterns/Cacheable.hpp (modified) (1 diff)
• Patterns/Makefile.am (deleted)
• Patterns/Makefile.in (deleted)
• Patterns/Observer.cpp (modified) (2 diffs)
• Patterns/Registry_impl.hpp (modified) (1 diff)
• Patterns/Singleton.hpp (modified) (1 diff)
• Patterns/Singleton_impl.hpp (modified) (1 diff)
• Patterns/unittests/Makefile.am (modified) (3 diffs)
• Patterns/unittests/ObserverUnitTest.cpp (modified) (1 diff)
• codepatterns-config-main.cpp (added)
• codepatterns-config.cpp (added)
• codepatterns-config.hpp (added)
• fast_functions.hpp (deleted)
• unittests/InfoUnitTest.cpp (modified) (1 diff)
• unittests/LogUnitTest.cpp (modified) (1 diff)
• unittests/Makefile.am (modified) (1 diff)
• version.hpp (modified) (1 diff)

src/Helpers/Assert.hpp

@@ -15 +15 @@
 #include<map>
 
-#include "toString.hpp"
+#include "Helpers/toString.hpp"
 
 /**

src/Makefile.am

@@ -1 +1 @@
 # PLEASE adhere to the alphabetical ordering in this Makefile!
 # Also indentation by a single tab
-
-SUBDIRS = Patterns
 
 INCLUDES = -I$(top_srcdir)/src
@@ -11 +9 @@
 AM_CPPFLAGS = ${BOOST_CPPFLAGS}
 
+BOOST_LIB = $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_THREAD_LIB)
+
+
+## config utility ###
+
+bin_PROGRAMS = codepatterns-config
+
+codepatterns_config_SOURCES = \
+        codepatterns-config-main.cpp \
+        codepatterns-config.cpp \
+        codepatterns-config.hpp \
+        version.hpp
+codepatterns_config_LDFLAGS = \
+        $(BOOST_LDFLAGS) \
+        $(BOOST_PROGRAM_OPTIONS_LIB) \
+        $(BOOST_THREAD_LIB) \
+        libCodePatterns.la
+
+
+### PATTERNS ###
+
+nobase_include_HEADERS = $(PATTERNSOURCE) $(PATTERNHEADER)
+
+PATTERNSOURCE = \
+        Patterns/ObservedContainer_impl.hpp \
+        Patterns/Registry_impl.hpp \
+        Patterns/Singleton_impl.hpp
+PATTERNHEADER = \
+        Patterns/Cacheable.hpp \
+        Patterns/ObservedContainer.hpp \
+        Patterns/ObservedIterator.hpp \
+        Patterns/Observer.hpp \
+        Patterns/Registry.hpp \
+        Patterns/Singleton.hpp
+
+### HELPERS ###
+
+include_HEADERS = \
+        $(srcdir)/version.hpp
+
 # this includes source files that need to be present at multiple points
 HELPERSSOURCE =  \
-  Assert.cpp \
-  errorlogger.cpp \
-  Info.cpp \
-  Log.cpp \
-  logger.cpp \
-  MemDebug.cpp \
-  Verbose.cpp \
-  $(srcdir)/version.cpp
+        Patterns/Observer.cpp \
+        Helpers/Assert.cpp \
+        Helpers/errorlogger.cpp \
+        Helpers/Info.cpp \
+        Helpers/Log.cpp \
+        Helpers/logger.cpp \
+        Helpers/MemDebug.cpp \
+        Helpers/Verbose.cpp \
+        $(srcdir)/version.cpp
 
 HELPERSHEADER =  \
-  Assert.hpp \
-  errorlogger.hpp \
-  Info.hpp \
-  Log.hpp \
-  logger.hpp \
-  MemDebug.hpp \
-  Verbose.hpp \
-  $(srcdir)/version.hpp
+        Helpers/Assert.hpp \
+        Helpers/enumeration.hpp \
+        Helpers/errorlogger.hpp \
+        Helpers/Info.hpp \
+        Helpers/Log.hpp \
+        Helpers/logger.hpp \
+        Helpers/MemDebug.hpp \
+        Helpers/Range.hpp \
+        Helpers/toString.hpp \
+        Helpers/Verbose.hpp \
+        $(srcdir)/version.hpp
 
-lib_LTLIBRARIES = libCodePatterns-@CODEPATTERNS_API_VERSION@.la
-libCodePatterns_includedir = $(includedir)/CodePatterns-$(CODEPATTERNS_API_VERSION)/
-nobase_libCodePatterns_include_HEADERS = ${HELPERSHEADER}
+##-@CODEPATTERNS_API_VERSION@
+lib_LTLIBRARIES = libCodePatterns.la
+libCodePatterns_LIBS = $(BOOST_THREAD_LIB)
 
 ## Define the source file list for the "libexample-@CODEPATTERNS_API_VERSION@.la"
@@ -44 +86 @@
 ## from each source file.  Note that it is not necessary to list header files
 ## which are already listed elsewhere in a _HEADERS variable assignment.
-libCodePatterns_@CODEPATTERNS_API_VERSION@_la_SOURCES = ${HELPERSSOURCE}
+#-$(CODEPATTERNS_API_VERSION)
+libCodePatterns_la_SOURCES = ${HELPERSSOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared
 ## library file (.so).  The library ABI version is defined in configure.ac, so
 ## that all version information is kept in one place.
-libCodePatterns_@CODEPATTERNS_API_VERSION@_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
+#-$(CODEPATTERNS_API_VERSION)
+libCodePatterns_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -62 +106 @@
 ## configuration header file is generated at configure time and should not be
 ## shipped with the source tarball.
-libCodePatterns_libincludedir = $(libdir)/CodePatterns-$(CODEPATTERNS_API_VERSION)/include
-nodist_libCodePatterns_libinclude_HEADERS = $(top_builddir)/libCodePatterns_config.h
+libCodePatterns_libincludedir = $(includedir)/Helpers/
+#-$(CODEPATTERNS_API_VERSION)
+nodist_libCodePatterns_libinclude_HEADERS = $(HELPERSHEADER) $(top_builddir)/libCodePatterns_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for
@@ -70 +115 @@
 ## in which case the correct install location would be $(datadir)/pkgconfig.
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/CodePatterns-$(CODEPATTERNS_API_VERSION).pc
+pkgconfig_DATA = $(top_builddir)/CodePatterns.pc
 
 FORCE:
@@ -76 +121 @@
 $(srcdir)/.git-version: FORCE
         @if (test -d $(top_srcdir)/.git && cd $(srcdir) \
-             && { git describe --dirty --always || git describe; } ) > .git-version-t 2>/dev/null \
+             && { git describe | sed -e "s#^v##" ; } ) > .git-version-t 2>/dev/null \
           && ! diff .git-version-t $(srcdir)/.git-version >/dev/null 2>&1; then \
           mv -f .git-version-t $(srcdir)/.git-version; \
@@ -86 +131 @@
 
 $(srcdir)/version.cpp: $(srcdir)/.git-version
-        echo "const char *MOLECUILDERVERSION = \"$(PACKAGE_NAME) version "`cat $(srcdir)/.git-version`"\";" > $@
+        echo -e "const char *CODEPATTERNSVERSION = \"`cat $(srcdir)/.git-version`\";\nconst char *CODEPATTERNSFULLVERSION = \"$(PACKAGE_NAME) version "`cat $(srcdir)/.git-version`"\";\n" > $@
+
+$(srcdir)/codepatterns-config.cpp:
+        echo -e "const char *CODEPATTERNSCFLAGS=\"-I$(includedir) ${BOOST_CPPFLAGS}\";\nconst char *CODEPATTERNSLDFLAGS=\"-L$(libdir) $(BOOST_LDFLAGS)\";\nconst char *CODEPATTERNSLIBS=\"-lCodePatterns $(BOOST_THREAD_LIB)\";\n" > $@
+

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>

src/unittests/InfoUnitTest.cpp

@@ -27 +27 @@
 #include <stdio.h>
 
-#include "Info.hpp"
-#include "Log.hpp"
+#include "Helpers/Info.hpp"
+#include "Helpers/Log.hpp"
 
 #include "InfoUnitTest.hpp"

src/unittests/LogUnitTest.cpp

@@ -22 +22 @@
 #include <cppunit/ui/text/TestRunner.h>
 
-#include "Log.hpp"
-#include "Verbose.hpp"
+#include "Helpers/Log.hpp"
+#include "Helpers/Verbose.hpp"
 
 #include "LogUnitTest.hpp"

src/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)
 

src/version.hpp

@@ -1 @@
-#ifndef VERSION_H_
-#define VERSION_H_
+#ifndef VERSION_HPP_
+#define VERSION_HPP_
 
-extern const char *MOLECUILDERVERSION;
+extern const char *CODEPATTERNSVERSION;
+extern const char *CODEPATTERNSFULLVERSION;
 
-#endif /* VERSION_H_ */
+#endif /* VERSION_HPP_ */