Commits

Sebastien Binet  committed 406206d

reshuffle packages to better match the atlas repository layout + fixups for a multi-proj mana-ext/mana-core

  • Participants
  • Parent commits 1d22820
  • Branches waffle-repo

Comments (0)

Files changed (1)

 }
 
 def pkg_deps(ctx):
-    ctx.use_pkg('core/GaudiKernel')
-    ctx.use_pkg('core/Control/CxxUtils')
-    ctx.use_pkg('core/Control/SGTools')
-    ctx.use_pkg('core/Control/AthenaKernel')
-    ctx.use_pkg('core/Control/DataModel')
+    ctx.use_pkg('GaudiKernel')
+    ctx.use_pkg('Control/CxxUtils')
+    ctx.use_pkg('Control/SGTools')
+    ctx.use_pkg('Control/AthenaKernel')
+    ctx.use_pkg('Control/DataModel')
 
-    ctx.use_pkg('ext/uuid')
-    ctx.use_pkg('ext/root') # reflex
-    ctx.use_pkg('ext/boost')
+    ctx.use_pkg('External/AtlasUUID')
+    ctx.use_pkg('External/AtlasROOT') # reflex
+    ctx.use_pkg('External/AtlasBoost')
     return
 
 def configure(ctx):
     ctx.build_linklib(
         name     = 'SGtests',
         source   = 'test/SGtests.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools',
                     'GaudiKernel', 'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',
     ctx.build_app(
         name     = 'SGIterator_test',
         source   = 'test/SGIterator_test.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools', 'GaudiKernel',
                     'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',
     ctx.build_app(
         name     = 'KeyConcept_test',
         source   = 'test/KeyConcept_test.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools', 'GaudiKernel',
                     'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',
     ctx.build_app(
         name     = 'DataHandle_test',
         source   = 'test/DataHandle_test.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools', 'GaudiKernel',
                     'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',
     ctx.build_app(
         name     = 'StoreClearedIncident_test',
         source   = 'test/StoreClearedIncident_test.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools', 'GaudiKernel',
                     'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',
     ctx.build_app(
         name     = 'SegMemSvc_test',
         source   = 'test/SegMemSvc_test.cxx',
-        use      = ['StoreGateLib', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
+        use      = ['StoreGate', 'DataModel', 'SGTools', 'SGAudCore', 'AthenaKernel', 'CxxUtils',
                     'TestTools', 'GaudiKernel',
                     'Reflex',
                     'boost-filesystem', 'boost-system', 'boost-regex', 'boost-thread',