From 01e29d5e32400cc3704089557df9ff6869a99ac3 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 23 Sep 2015 12:41:49 +0000
Subject: [PATCH] Task #8291 made lib and bin dir. added
ltastorageoverviewscraper executable wrapper script to bin. added copyrights.
---
.gitattributes | 3 ++-
LTA/ltastorageoverview/CMakeLists.txt | 7 ++++-
.../bin/ltastorageoverviewscraper | 26 +++++++++++++++++++
LTA/ltastorageoverview/{ => lib}/scraper.py | 17 ++++++++++++
4 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 LTA/ltastorageoverview/bin/ltastorageoverviewscraper
rename LTA/ltastorageoverview/{ => lib}/scraper.py (95%)
diff --git a/.gitattributes b/.gitattributes
index a76f1cec964..6c065caddad 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2826,7 +2826,8 @@ LTA/LTAIngest/test/test_ingest_pipeline.run eol=lf
LTA/LTAIngest/test/test_ingest_pipeline.sh eol=lf
LTA/LTAIngest/user_ingest_example -text
LTA/ltastorageoverview/CMakeLists.txt -text
-LTA/ltastorageoverview/scraper.py -text
+LTA/ltastorageoverview/bin/ltastorageoverviewscraper -text
+LTA/ltastorageoverview/lib/scraper.py -text
MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h -text
MAC/APL/APLCommon/src/AntennaField.cc -text
MAC/APL/APLCommon/src/StartDaemon_Protocol.prot -text svneol=native#application/octet-stream
diff --git a/LTA/ltastorageoverview/CMakeLists.txt b/LTA/ltastorageoverview/CMakeLists.txt
index 9c03d4794cc..2d1b045bf50 100644
--- a/LTA/ltastorageoverview/CMakeLists.txt
+++ b/LTA/ltastorageoverview/CMakeLists.txt
@@ -6,6 +6,11 @@ include(PythonInstall)
set(USE_PYTHON_COMPILATION Off)
python_install(
- scraper.py
+ lib/scraper.py
DESTINATION ltastorageoverview)
+
+install(PROGRAMS
+ bin/ltastorageoverviewscraper
+ DESTINATION bin)
+
diff --git a/LTA/ltastorageoverview/bin/ltastorageoverviewscraper b/LTA/ltastorageoverview/bin/ltastorageoverviewscraper
new file mode 100644
index 00000000000..94397565639
--- /dev/null
+++ b/LTA/ltastorageoverview/bin/ltastorageoverviewscraper
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+
+# Copyright (C) 2012-2015 ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+from ltastorageoverview import scraper
+
+''' Starts the scraper from ltastorageoverview'''
+if __name__ == "__main__":
+ scraper.main(sys.argv[1:])
+
diff --git a/LTA/ltastorageoverview/scraper.py b/LTA/ltastorageoverview/lib/scraper.py
similarity index 95%
rename from LTA/ltastorageoverview/scraper.py
rename to LTA/ltastorageoverview/lib/scraper.py
index 78e9cb6b974..bbdb3218373 100755
--- a/LTA/ltastorageoverview/scraper.py
+++ b/LTA/ltastorageoverview/lib/scraper.py
@@ -1,5 +1,22 @@
#!/usr/bin/python
+# Copyright (C) 2012-2015 ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O. Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+
import subprocess
import logging
import cPickle as pickle
--
GitLab