diff --git a/.gitattributes b/.gitattributes index 142bb388211659314c2797652acf6326e90b23e7..972e730125d252a7efde7f358119766870dde859 100644 --- a/.gitattributes +++ b/.gitattributes @@ -975,6 +975,21 @@ CEP/Imager/LofarFT/src/LofarCubeSkyEquation.cc -text CEP/Imager/LofarFT/src/LofarVisibilityResampler.cc -text CEP/Imager/LofarFT/src/LofarVisibilityResamplerBase.cc -text CEP/Imager/LofarFT/src/addImagingInfo -text +CEP/LMWCommon/share/cep2.clusterdesc -text +CEP/LMWCommon/share/development.clusterdesc -text +CEP/LMWCommon/share/full.clusterdesc -text +CEP/LMWCommon/share/imaging.clusterdesc -text +CEP/LMWCommon/share/local.clusterdesc -text +CEP/LMWCommon/share/production.clusterdesc -text +CEP/LMWCommon/share/pulsar.clusterdesc -text +CEP/LMWCommon/share/sub1.clusterdesc -text +CEP/LMWCommon/share/sub2.clusterdesc -text +CEP/LMWCommon/share/sub3.clusterdesc -text +CEP/LMWCommon/share/sub4.clusterdesc -text +CEP/LMWCommon/share/sub5.clusterdesc -text +CEP/LMWCommon/share/sub6.clusterdesc -text +CEP/LMWCommon/share/sub7.clusterdesc -text +CEP/LMWCommon/share/sub8.clusterdesc -text CEP/LMWCommon/src/cexecms -text CEP/LMWCommon/src/cexecms-part -text CEP/LMWCommon/src/expandparameter -text @@ -2136,21 +2151,6 @@ LCS/Common/include/Common/NewHandler.h -text LCS/Common/include/Common/Thread/Cancellation.h -text LCS/Common/include/Common/Thread/Condition.h -text LCS/Common/include/Common/Thread/Mutex.h -text -LCS/Common/share/cep2.clusterdesc -text -LCS/Common/share/development.clusterdesc -text -LCS/Common/share/full.clusterdesc -text -LCS/Common/share/imaging.clusterdesc -text -LCS/Common/share/local.clusterdesc -text -LCS/Common/share/production.clusterdesc -text -LCS/Common/share/pulsar.clusterdesc -text -LCS/Common/share/sub1.clusterdesc -text -LCS/Common/share/sub2.clusterdesc -text -LCS/Common/share/sub3.clusterdesc -text -LCS/Common/share/sub4.clusterdesc -text -LCS/Common/share/sub5.clusterdesc -text -LCS/Common/share/sub6.clusterdesc -text -LCS/Common/share/sub7.clusterdesc -text -LCS/Common/share/sub8.clusterdesc -text LCS/Common/src/Common-Model.cat -text LCS/Common/src/NewHandler.cc -text LCS/Common/src/Thread/Cancellation.cc -text diff --git a/CEP/LMWCommon/CMakeLists.txt b/CEP/LMWCommon/CMakeLists.txt index a23f9ab13a3780c25daf55681e0e15007073b599..6b8c6814bb5bcdafcf517be79d853718145aa18b 100644 --- a/CEP/LMWCommon/CMakeLists.txt +++ b/CEP/LMWCommon/CMakeLists.txt @@ -7,5 +7,6 @@ lofar_find_package(Boost REQUIRED) lofar_find_package(Casacore COMPONENTS casa REQUIRED) add_subdirectory(include/LMWCommon) +add_subdirectory(share) add_subdirectory(src) add_subdirectory(test) diff --git a/LCS/Common/share/CMakeLists.txt b/CEP/LMWCommon/share/CMakeLists.txt similarity index 100% rename from LCS/Common/share/CMakeLists.txt rename to CEP/LMWCommon/share/CMakeLists.txt diff --git a/LCS/Common/share/cep2.clusterdesc b/CEP/LMWCommon/share/cep2.clusterdesc similarity index 100% rename from LCS/Common/share/cep2.clusterdesc rename to CEP/LMWCommon/share/cep2.clusterdesc diff --git a/LCS/Common/share/development.clusterdesc b/CEP/LMWCommon/share/development.clusterdesc similarity index 100% rename from LCS/Common/share/development.clusterdesc rename to CEP/LMWCommon/share/development.clusterdesc diff --git a/LCS/Common/share/full.clusterdesc b/CEP/LMWCommon/share/full.clusterdesc similarity index 100% rename from LCS/Common/share/full.clusterdesc rename to CEP/LMWCommon/share/full.clusterdesc diff --git a/LCS/Common/share/imaging.clusterdesc b/CEP/LMWCommon/share/imaging.clusterdesc similarity index 100% rename from LCS/Common/share/imaging.clusterdesc rename to CEP/LMWCommon/share/imaging.clusterdesc diff --git a/LCS/Common/share/local.clusterdesc b/CEP/LMWCommon/share/local.clusterdesc similarity index 100% rename from LCS/Common/share/local.clusterdesc rename to CEP/LMWCommon/share/local.clusterdesc diff --git a/LCS/Common/share/production.clusterdesc b/CEP/LMWCommon/share/production.clusterdesc similarity index 100% rename from LCS/Common/share/production.clusterdesc rename to CEP/LMWCommon/share/production.clusterdesc diff --git a/LCS/Common/share/pulsar.clusterdesc b/CEP/LMWCommon/share/pulsar.clusterdesc similarity index 100% rename from LCS/Common/share/pulsar.clusterdesc rename to CEP/LMWCommon/share/pulsar.clusterdesc diff --git a/LCS/Common/share/sub1.clusterdesc b/CEP/LMWCommon/share/sub1.clusterdesc similarity index 100% rename from LCS/Common/share/sub1.clusterdesc rename to CEP/LMWCommon/share/sub1.clusterdesc diff --git a/LCS/Common/share/sub2.clusterdesc b/CEP/LMWCommon/share/sub2.clusterdesc similarity index 100% rename from LCS/Common/share/sub2.clusterdesc rename to CEP/LMWCommon/share/sub2.clusterdesc diff --git a/LCS/Common/share/sub3.clusterdesc b/CEP/LMWCommon/share/sub3.clusterdesc similarity index 100% rename from LCS/Common/share/sub3.clusterdesc rename to CEP/LMWCommon/share/sub3.clusterdesc diff --git a/LCS/Common/share/sub4.clusterdesc b/CEP/LMWCommon/share/sub4.clusterdesc similarity index 100% rename from LCS/Common/share/sub4.clusterdesc rename to CEP/LMWCommon/share/sub4.clusterdesc diff --git a/LCS/Common/share/sub5.clusterdesc b/CEP/LMWCommon/share/sub5.clusterdesc similarity index 100% rename from LCS/Common/share/sub5.clusterdesc rename to CEP/LMWCommon/share/sub5.clusterdesc diff --git a/LCS/Common/share/sub6.clusterdesc b/CEP/LMWCommon/share/sub6.clusterdesc similarity index 100% rename from LCS/Common/share/sub6.clusterdesc rename to CEP/LMWCommon/share/sub6.clusterdesc diff --git a/LCS/Common/share/sub7.clusterdesc b/CEP/LMWCommon/share/sub7.clusterdesc similarity index 100% rename from LCS/Common/share/sub7.clusterdesc rename to CEP/LMWCommon/share/sub7.clusterdesc diff --git a/LCS/Common/share/sub8.clusterdesc b/CEP/LMWCommon/share/sub8.clusterdesc similarity index 100% rename from LCS/Common/share/sub8.clusterdesc rename to CEP/LMWCommon/share/sub8.clusterdesc diff --git a/LCS/Common/CMakeLists.txt b/LCS/Common/CMakeLists.txt index bfc72f3d98959618ef0c54044f0e150df77fbfa5..8d998fa18d0b5b10ed70186ca27f05a3f5d24e24 100644 --- a/LCS/Common/CMakeLists.txt +++ b/LCS/Common/CMakeLists.txt @@ -9,5 +9,4 @@ lofar_find_package(Readline) add_subdirectory(include/Common) add_subdirectory(src) -add_subdirectory(share) add_subdirectory(test)