diff options
| -rw-r--r-- | icetray/Jamfile.jam | 52 | ||||
| -rw-r--r-- | icetray/dryice/Jamfile.jam | 22 | ||||
| -rw-r--r-- | icetray/dryice/dryice.cpp (renamed from icetray/dryice.cpp) | 0 | ||||
| -rw-r--r-- | icetray/dryice/dryice.h (renamed from icetray/dryice.h) | 0 | ||||
| -rw-r--r-- | icetray/dryice/mockPool.cpp (renamed from icetray/mockPool.cpp) | 0 | ||||
| -rw-r--r-- | icetray/dryice/mockPool.h (renamed from icetray/mockPool.h) | 0 | ||||
| -rw-r--r-- | icetray/icetray/Jamfile.jam | 31 | ||||
| -rw-r--r-- | icetray/icetray/abstractCachingDatabaseClient.cpp (renamed from icetray/abstractCachingDatabaseClient.cpp) | 0 | ||||
| -rw-r--r-- | icetray/icetray/abstractCachingDatabaseClient.h (renamed from icetray/abstractCachingDatabaseClient.h) | 0 | ||||
| -rw-r--r-- | icetray/icetray/abstractDatabaseClient.cpp (renamed from icetray/abstractDatabaseClient.cpp) | 0 | ||||
| -rw-r--r-- | icetray/icetray/abstractDatabaseClient.h (renamed from icetray/abstractDatabaseClient.h) | 0 | ||||
| -rw-r--r-- | icetray/icetray/database.h (renamed from icetray/database.h) | 0 | ||||
| -rw-r--r-- | icetray/icetray/defaultPool.cpp (renamed from icetray/defaultPool.cpp) | 0 | ||||
| -rw-r--r-- | icetray/icetray/defaultPool.h (renamed from icetray/defaultPool.h) | 0 | ||||
| -rw-r--r-- | icetray/icetray/icetrayService.cpp (renamed from icetray/icetrayService.cpp) | 0 | ||||
| -rw-r--r-- | icetray/icetray/icetrayService.h (renamed from icetray/icetrayService.h) | 0 | ||||
| -rw-r--r-- | icetray/tool/Jamfile.jam | 4 | ||||
| -rw-r--r-- | icetray/tool/embed.sql.cpp.m4 (renamed from icetray/embed.sql.cpp.m4) | 0 | ||||
| -rw-r--r-- | icetray/tool/embed.sql.h.m4 (renamed from icetray/embed.sql.h.m4) | 0 | ||||
| -rw-r--r-- | icetray/tool/icetray.jam (renamed from icetray/icetray.jam) | 0 | ||||
| -rw-r--r-- | icetray/unittests/Jamfile.jam | 2 |
21 files changed, 61 insertions, 50 deletions
diff --git a/icetray/Jamfile.jam b/icetray/Jamfile.jam index 9058895..f499586 100644 --- a/icetray/Jamfile.jam +++ b/icetray/Jamfile.jam @@ -13,53 +13,7 @@ lib boost_system ; lib boost_thread ; build-project unittests ; - -lib icetray : - abstractDatabaseClient.cpp - abstractCachingDatabaseClient.cpp - defaultPool.cpp - icetrayService.cpp - : - <library>adhocutil - <library>dbppcore - <library>Ice - <library>IceUtil - <library>IceBox - <library>pthread - <library>slicer - <library>slicer-db - <library>boost_system - <library>boost_thread - <library>..//glibmm - <cflags>-fvisibility=hidden - : : - <include>. - <library>dbppcore - <library>adhocutil - <library>slicer - <library>slicer-db - <library>boost_thread - ; - -lib dryice : - dryice.cpp - mockPool.cpp - : - <library>adhocutil - <library>icetray - <library>Ice - <library>IceUtil - <library>IceBox - <library>pthread - <library>boost_system - <library>boost_thread - <library>dl - <cflags>-fvisibility=hidden - : : - <include>. - ; - -package.install install-main : <install-source-root>. : : icetray : abstractDatabaseClient.h icetrayService.h ; -package.install-data install-tools : boost-build/tools : icetray.jam [ glob embed.*.m4 ] ; -package.install install-dryice : <install-source-root>. : : dryice : dryice.h ; +build-project icetray ; +build-project dryice ; +build-project tool ; diff --git a/icetray/dryice/Jamfile.jam b/icetray/dryice/Jamfile.jam new file mode 100644 index 0000000..3f8751b --- /dev/null +++ b/icetray/dryice/Jamfile.jam @@ -0,0 +1,22 @@ +import package ; + +lib dryice : + dryice.cpp + mockPool.cpp + : + <library>..//adhocutil + <library>../icetray//icetray + <library>..//Ice + <library>..//IceUtil + <library>..//IceBox + <library>..//pthread + <library>..//boost_system + <library>..//boost_thread + <library>..//dl + <cflags>-fvisibility=hidden + : : + <include>. + ; + +package.install install-dryice : <install-source-root>. : : dryice : [ glob *.h : mockPool.h ] ; + diff --git a/icetray/dryice.cpp b/icetray/dryice/dryice.cpp index 50f85cb..50f85cb 100644 --- a/icetray/dryice.cpp +++ b/icetray/dryice/dryice.cpp diff --git a/icetray/dryice.h b/icetray/dryice/dryice.h index f81a48c..f81a48c 100644 --- a/icetray/dryice.h +++ b/icetray/dryice/dryice.h diff --git a/icetray/mockPool.cpp b/icetray/dryice/mockPool.cpp index 43e7c0c..43e7c0c 100644 --- a/icetray/mockPool.cpp +++ b/icetray/dryice/mockPool.cpp diff --git a/icetray/mockPool.h b/icetray/dryice/mockPool.h index 8936cb2..8936cb2 100644 --- a/icetray/mockPool.h +++ b/icetray/dryice/mockPool.h diff --git a/icetray/icetray/Jamfile.jam b/icetray/icetray/Jamfile.jam new file mode 100644 index 0000000..65cd528 --- /dev/null +++ b/icetray/icetray/Jamfile.jam @@ -0,0 +1,31 @@ +import package ; + +lib icetray : + abstractDatabaseClient.cpp + abstractCachingDatabaseClient.cpp + defaultPool.cpp + icetrayService.cpp + : + <library>..//adhocutil + <library>..//dbppcore + <library>..//Ice + <library>..//IceUtil + <library>..//IceBox + <library>..//pthread + <library>..//slicer + <library>..//slicer-db + <library>..//boost_system + <library>..//boost_thread + <library>../..//glibmm + <cflags>-fvisibility=hidden + : : + <include>. + <library>..//dbppcore + <library>..//adhocutil + <library>..//slicer + <library>..//slicer-db + <library>..//boost_thread + ; + +package.install install-main : <install-source-root>. : : icetray : [ glob *.h : defaultPool.h ] ; + diff --git a/icetray/abstractCachingDatabaseClient.cpp b/icetray/icetray/abstractCachingDatabaseClient.cpp index 2c97ac6..2c97ac6 100644 --- a/icetray/abstractCachingDatabaseClient.cpp +++ b/icetray/icetray/abstractCachingDatabaseClient.cpp diff --git a/icetray/abstractCachingDatabaseClient.h b/icetray/icetray/abstractCachingDatabaseClient.h index bb1d070..bb1d070 100644 --- a/icetray/abstractCachingDatabaseClient.h +++ b/icetray/icetray/abstractCachingDatabaseClient.h diff --git a/icetray/abstractDatabaseClient.cpp b/icetray/icetray/abstractDatabaseClient.cpp index e5e3026..e5e3026 100644 --- a/icetray/abstractDatabaseClient.cpp +++ b/icetray/icetray/abstractDatabaseClient.cpp diff --git a/icetray/abstractDatabaseClient.h b/icetray/icetray/abstractDatabaseClient.h index aac9151..aac9151 100644 --- a/icetray/abstractDatabaseClient.h +++ b/icetray/icetray/abstractDatabaseClient.h diff --git a/icetray/database.h b/icetray/icetray/database.h index 23ad7fe..23ad7fe 100644 --- a/icetray/database.h +++ b/icetray/icetray/database.h diff --git a/icetray/defaultPool.cpp b/icetray/icetray/defaultPool.cpp index c3f7e50..c3f7e50 100644 --- a/icetray/defaultPool.cpp +++ b/icetray/icetray/defaultPool.cpp diff --git a/icetray/defaultPool.h b/icetray/icetray/defaultPool.h index 5b06ea2..5b06ea2 100644 --- a/icetray/defaultPool.h +++ b/icetray/icetray/defaultPool.h diff --git a/icetray/icetrayService.cpp b/icetray/icetray/icetrayService.cpp index aff6a8a..aff6a8a 100644 --- a/icetray/icetrayService.cpp +++ b/icetray/icetray/icetrayService.cpp diff --git a/icetray/icetrayService.h b/icetray/icetray/icetrayService.h index 8f35519..8f35519 100644 --- a/icetray/icetrayService.h +++ b/icetray/icetray/icetrayService.h diff --git a/icetray/tool/Jamfile.jam b/icetray/tool/Jamfile.jam new file mode 100644 index 0000000..f24c409 --- /dev/null +++ b/icetray/tool/Jamfile.jam @@ -0,0 +1,4 @@ +import package ; + +package.install-data install-tools : boost-build/tools : icetray.jam [ glob embed.*.m4 ] ; + diff --git a/icetray/embed.sql.cpp.m4 b/icetray/tool/embed.sql.cpp.m4 index 7043f78..7043f78 100644 --- a/icetray/embed.sql.cpp.m4 +++ b/icetray/tool/embed.sql.cpp.m4 diff --git a/icetray/embed.sql.h.m4 b/icetray/tool/embed.sql.h.m4 index fbabf62..fbabf62 100644 --- a/icetray/embed.sql.h.m4 +++ b/icetray/tool/embed.sql.h.m4 diff --git a/icetray/icetray.jam b/icetray/tool/icetray.jam index f999e2d..f999e2d 100644 --- a/icetray/icetray.jam +++ b/icetray/tool/icetray.jam diff --git a/icetray/unittests/Jamfile.jam b/icetray/unittests/Jamfile.jam index 459f103..4cd0977 100644 --- a/icetray/unittests/Jamfile.jam +++ b/icetray/unittests/Jamfile.jam @@ -1,5 +1,5 @@ import testing ; -import ../icetray ; +import ../tool/icetray ; lib boost_utf : : <name>boost_unit_test_framework ; lib boost_filesystem ; |