diff --git a/SConstruct b/SConstruct index 61eb2240fb..25e721864b 100644 --- a/SConstruct +++ b/SConstruct @@ -73,6 +73,7 @@ main_env.Append(LIBPATH=[ cwd+'/src/hm', cwd+'/src/um', cwd+'/src/authm', + cwd+'/src/xml', ]) # Compile flags @@ -187,6 +188,7 @@ build_scripts=[ 'src/hm/SConstruct', 'src/um/SConstruct', 'src/authm/SConstruct', + 'src/xml/SConstruct', ] # Testing @@ -222,6 +224,7 @@ if testing=='yes': 'src/um/test/SConstruct', 'src/vm/test/SConstruct', 'src/vnm/test/SConstruct', + 'src/xml/test/SConstruct', ]) else: main_env.Append(testing='no') diff --git a/src/scheduler/include/ObjectXML.h b/include/ObjectXML.h similarity index 100% rename from src/scheduler/include/ObjectXML.h rename to include/ObjectXML.h diff --git a/src/scheduler/SConstruct b/src/scheduler/SConstruct index 584e7986ac..01a6daf213 100644 --- a/src/scheduler/SConstruct +++ b/src/scheduler/SConstruct @@ -28,7 +28,7 @@ env.Append(CPPPATH=[ # Library dirs env.Append(LIBPATH=[ - cwd+'/src/xml', + cwd+'/src/client', cwd+'/src/pool', cwd+'/src/sched' ]) @@ -38,7 +38,7 @@ env.Append(LIBPATH=[ ################################################################################ build_scripts=[ - 'src/xml/SConstruct', + 'src/client/SConstruct', 'src/pool/SConstruct', 'src/sched/SConstruct' ] @@ -46,7 +46,6 @@ build_scripts=[ if env['testing']=='yes': build_scripts.extend([ 'src/pool/test/SConstruct', - 'src/xml/test/SConstruct', ]) for script in build_scripts: diff --git a/src/scheduler/src/xml/Client.cc b/src/scheduler/src/client/Client.cc similarity index 100% rename from src/scheduler/src/xml/Client.cc rename to src/scheduler/src/client/Client.cc diff --git a/src/scheduler/src/client/SConstruct b/src/scheduler/src/client/SConstruct new file mode 100644 index 0000000000..d9509465b1 --- /dev/null +++ b/src/scheduler/src/client/SConstruct @@ -0,0 +1,26 @@ +# SConstruct for src/pool + +# -------------------------------------------------------------------------- # +# Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +Import('sched_env') + +lib_name='scheduler_client' + +source_files=['Client.cc'] + +# Build library +sched_env.StaticLibrary(lib_name, source_files) diff --git a/src/scheduler/src/pool/test/SConstruct b/src/scheduler/src/pool/test/SConstruct index 4254d19e45..66ccbfba2f 100644 --- a/src/scheduler/src/pool/test/SConstruct +++ b/src/scheduler/src/pool/test/SConstruct @@ -18,7 +18,7 @@ Import('sched_env') # Libraries sched_env.Prepend(LIBS=[ - 'scheduler_xml', + 'nebula_xml', 'scheduler_pool', 'nebula_log', 'nebula_common', diff --git a/src/scheduler/src/sched/SConstruct b/src/scheduler/src/sched/SConstruct index 0239107e7c..52fd744fd7 100644 --- a/src/scheduler/src/sched/SConstruct +++ b/src/scheduler/src/sched/SConstruct @@ -31,7 +31,8 @@ sched_env.Prepend(LIBS=[ 'scheduler_sched', 'scheduler_pool', 'nebula_log', - 'scheduler_xml', + 'scheduler_client', + 'nebula_xml', 'nebula_common', 'crypto', ]) diff --git a/src/scheduler/src/xml/ObjectXML.cc b/src/xml/ObjectXML.cc similarity index 100% rename from src/scheduler/src/xml/ObjectXML.cc rename to src/xml/ObjectXML.cc diff --git a/src/scheduler/src/xml/SConstruct b/src/xml/SConstruct similarity index 80% rename from src/scheduler/src/xml/SConstruct rename to src/xml/SConstruct index 16765bad7b..16abefafdc 100644 --- a/src/scheduler/src/xml/SConstruct +++ b/src/xml/SConstruct @@ -1,4 +1,4 @@ -# SConstruct for src/pool +# SConstruct for src/xml # -------------------------------------------------------------------------- # # Copyright 2002-2010, OpenNebula Project Leads (OpenNebula.org) # @@ -16,33 +16,32 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -Import('sched_env') +Import('env') -lib_name='scheduler_xml' +lib_name='nebula_xml' -if sched_env['parsers']=='yes': +if env['parsers']=='yes': # LEX - parser=sched_env.Lex( + parser=env.Lex( source='expr_parser.l' ) - sched_env.NoClean(parser) + env.NoClean(parser) # BISON - parser=sched_env.Bison( + parser=env.Bison( source='expr_arith.y' ) - sched_env.NoClean(parser) + env.NoClean(parser) - parser=sched_env.Bison( + parser=env.Bison( source='expr_bool.y' ) - sched_env.NoClean(parser) + env.NoClean(parser) source_files=['ObjectXML.cc', - 'Client.cc', 'expr_parser.c', 'expr_bool.cc', 'expr_arith.cc'] # Build library -sched_env.StaticLibrary(lib_name, source_files) +env.StaticLibrary(lib_name, source_files) diff --git a/src/scheduler/src/xml/expr_arith.cc b/src/xml/expr_arith.cc similarity index 100% rename from src/scheduler/src/xml/expr_arith.cc rename to src/xml/expr_arith.cc diff --git a/src/scheduler/src/xml/expr_arith.h b/src/xml/expr_arith.h similarity index 100% rename from src/scheduler/src/xml/expr_arith.h rename to src/xml/expr_arith.h diff --git a/src/scheduler/src/xml/expr_arith.y b/src/xml/expr_arith.y similarity index 100% rename from src/scheduler/src/xml/expr_arith.y rename to src/xml/expr_arith.y diff --git a/src/scheduler/src/xml/expr_bool.cc b/src/xml/expr_bool.cc similarity index 100% rename from src/scheduler/src/xml/expr_bool.cc rename to src/xml/expr_bool.cc diff --git a/src/scheduler/src/xml/expr_bool.h b/src/xml/expr_bool.h similarity index 100% rename from src/scheduler/src/xml/expr_bool.h rename to src/xml/expr_bool.h diff --git a/src/scheduler/src/xml/expr_bool.y b/src/xml/expr_bool.y similarity index 100% rename from src/scheduler/src/xml/expr_bool.y rename to src/xml/expr_bool.y diff --git a/src/scheduler/src/xml/expr_parser.c b/src/xml/expr_parser.c similarity index 100% rename from src/scheduler/src/xml/expr_parser.c rename to src/xml/expr_parser.c diff --git a/src/scheduler/src/xml/expr_parser.l b/src/xml/expr_parser.l similarity index 100% rename from src/scheduler/src/xml/expr_parser.l rename to src/xml/expr_parser.l diff --git a/src/scheduler/src/xml/test/ObjectXMLTest.cc b/src/xml/test/ObjectXMLTest.cc similarity index 100% rename from src/scheduler/src/xml/test/ObjectXMLTest.cc rename to src/xml/test/ObjectXMLTest.cc diff --git a/src/scheduler/src/xml/test/SConstruct b/src/xml/test/SConstruct similarity index 91% rename from src/scheduler/src/xml/test/SConstruct rename to src/xml/test/SConstruct index 499fd915bd..c1f61c6ff0 100644 --- a/src/scheduler/src/xml/test/SConstruct +++ b/src/xml/test/SConstruct @@ -14,14 +14,14 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -Import('sched_env') +Import('env') # Libraries -sched_env.Prepend(LIBS=[ +env.Prepend(LIBS=[ 'nebula_log', - 'scheduler_xml', + 'nebula_xml', 'nebula_common', 'nebula_test_common', ]) -sched_env.Program('test_xml','ObjectXMLTest.cc') +env.Program('test_xml','ObjectXMLTest.cc')