Skip to content

Commit cf2b799

Browse files
autermannautermann
committed
import v15.12.1.4cadab5
1 parent 3afe9f5 commit cf2b799

File tree

862 files changed

+45103
-16992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

862 files changed

+45103
-16992
lines changed

‎3rdparty/scidb-ant.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Version: 0
44
Release: 1
55
License: GPLv3
66
Group: System Environment/Base
7-
URL: http://downloads.paradigm4.com
7+
URL: https://downloads.paradigm4.com
88
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
99
BuildArch: noarch
1010

‎3rdparty/ubuntu/mpich2/patches/control

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Source: scidb-15.3-mpich2
1+
Source: scidb-15.12-mpich2
22
Section: devel
33
Priority: extra
44
Maintainer: Debian Science Maintainers <[email protected]>
@@ -9,10 +9,10 @@ Homepage: http://www.mcs.anl.gov/research/projects/mpich2/
99
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/mpich2.git;a=summary
1010
Vcs-Git: git://git.debian.org/debian-science/packages/mpich2.git
1111

12-
Package: scidb-15.3-mpich2
12+
Package: scidb-15.12-mpich2
1313
Architecture: any
14-
Depends: scidb-15.3-libmpich2-1.2 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
15-
Recommends: scidb-15.3-libmpich2-dev (= ${binary:Version})
14+
Depends: scidb-15.12-libmpich2-1.2 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
15+
Recommends: scidb-15.12-libmpich2-dev (= ${binary:Version})
1616
Conflicts: mpd
1717
Description: Implementation of the MPI Message Passing Interface standard
1818
MPICH2 is a high-performance and widely portable implementation of the
@@ -23,7 +23,7 @@ Description: Implementation of the MPI Message Passing Interface standard
2323
.
2424
This package includes the program binaries necessary to run MPICH2 programs.
2525

26-
Package: scidb-15.3-libmpich2-1.2
26+
Package: scidb-15.12-libmpich2-1.2
2727
Architecture: any
2828
Section: libs
2929
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -36,11 +36,11 @@ Description: Shared libraries for MPICH2
3636
.
3737
This package includes the MPICH2 shared libraries.
3838

39-
Package: scidb-15.3-libmpich2-dev
39+
Package: scidb-15.12-libmpich2-dev
4040
Architecture: any
4141
Section: libdevel
42-
Depends: scidb-15.3-libmpich2-1.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
43-
Recommends: scidb-15.3-mpich2 (= ${binary:Version})
42+
Depends: scidb-15.12-libmpich2-1.2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
43+
Recommends: scidb-15.12-mpich2 (= ${binary:Version})
4444
Description: Development files for MPICH2
4545
MPICH2 is a high-performance and widely portable implementation of the
4646
Message Passing Interface (MPI) standard (both MPI-1 and MPI-2). It

‎3rdparty/ubuntu/mpich2/patches/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ export DH_VERBOSE=1
1717
# Fix Ubuntu 12.04 compile
1818
CFLAGS+=-Wno-format-security
1919

20-
NAME_PREFIX=scidb-15.3
21-
PREFIX=/opt/scidb/15.3/3rdparty/mpich2
20+
NAME_PREFIX=scidb-15.12
21+
PREFIX=/opt/scidb/15.12/3rdparty/mpich2
2222
export LD_LIBRARY_PATH := $(PREFIX)/lib:$(LD_LIBRARY_PATH)
2323
DEB_CONFIGURE_EXTRA_FLAGS := \
2424
--enable-sharedlibs=gcc \

‎CMakeLists.txt

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ else()
4141
endif()
4242

4343
project(SciDB C CXX Fortran)
44+
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
4445

4546

4647
file(READ "${CMAKE_SOURCE_DIR}/version" _SCIDB_VERSION)
@@ -68,25 +69,10 @@ if(NOT CMAKE_BUILD_TYPE)
6869
set(CMAKE_BUILD_TYPE RelWithDebInfo) # Default value
6970
endif(NOT CMAKE_BUILD_TYPE)
7071

71-
find_package(Subversion)
72-
if (${CMAKE_VERSION} VERSION_GREATER 2.8 OR ${CMAKE_VERSION} VERSION_EQUAL 2.8)
73-
find_package(Git)
74-
endif()
75-
if(Subversion_SVN_EXECUTABLE)
76-
EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} info . OUTPUT_VARIABLE Subversion_INFO_OUT
77-
ERROR_VARIABLE Subversion_svn_info_error RESULT_VARIABLE Subversion_svn_info_result
78-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE)
79-
if (Subversion_svn_info_result EQUAL 0)
80-
# Get version from SVN working copy by default
81-
Subversion_WC_INFO(${CMAKE_SOURCE_DIR} SciDB)
82-
set(SCIDB_REVISION "${SciDB_WC_REVISION}")
83-
message(STATUS "Reading revision from svn: ${SCIDB_REVISION}")
84-
file(WRITE "${CMAKE_BINARY_DIR}/revision" ${SCIDB_REVISION})
85-
endif()
86-
endif()
87-
if(NOT SCIDB_REVISION AND GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git/svn/.metadata")
88-
# Get version from git-svn working copy
89-
execute_process(COMMAND ${GIT_EXECUTABLE} svn find-rev master
72+
find_package(Git)
73+
if(GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
74+
# Get revision from git working copy
75+
execute_process(COMMAND ${GIT_EXECUTABLE} rev-list --abbrev-commit -1 HEAD
9076
OUTPUT_VARIABLE SCIDB_REVISION
9177
RESULT_VARIABLE GIT_EXEC_RES
9278
OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -97,7 +83,7 @@ if(NOT SCIDB_REVISION AND GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git/sv
9783
MESSAGE(FATAL_ERROR "Can not invoke GIT ${GIT_EXECUTABLE}. Check binary!")
9884
endif()
9985

100-
message(STATUS "Reading revision from git-svn: ${SCIDB_REVISION}")
86+
message(STATUS "Reading revision from git: ${SCIDB_REVISION}")
10187

10288
file(WRITE "${CMAKE_BINARY_DIR}/revision" ${SCIDB_REVISION})
10389
endif()
@@ -131,8 +117,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -pedantic -W -Wextra -Wall -W
131117
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-system-headers -isystem /opt/local/include/ -isystem /usr/local/include/")
132118
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_LIMIT_MACROS")
133119
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROJECT_ROOT=\\\"${CMAKE_SOURCE_DIR}/\\\"")
120+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wconversion")
134121

135-
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O3 -fno-omit-frame-pointer -g -ggdb3")
122+
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DNDEBUG -O3 -fno-omit-frame-pointer -g -ggdb3 -Wno-error")
136123
set(CMAKE_CXX_FLAGS_PROFILE "-O2 -pg -DNDEBUG")
137124
set(CMAKE_CXX_FLAGS_CC "-fprofile-arcs -ftest-coverage -g -O0 -DCLEAN_EXIT")
138125
set(CMAKE_CXX_FLAGS_VALGRIND "-g -O0 -DCLEAN_EXIT")
@@ -364,7 +351,7 @@ include_directories("${CMAKE_SOURCE_DIR}/include")
364351
include_directories("${CMAKE_SOURCE_DIR}/utils")
365352
include_directories("${CMAKE_CURRENT_BINARY_DIR}/src")
366353
include_directories("${CMAKE_CURRENT_BINARY_DIR}/utils")
367-
include_directories(${Boost_INCLUDE_DIRS})
354+
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
368355
include_directories(${PROTOBUF_INCLUDE_DIR})
369356
include_directories(${LOG4CXX_INCLUDE_DIRS})
370357
include_directories(${LIBPQXX_INCLUDE_DIRS})
@@ -427,6 +414,9 @@ if (CDASH_CONFIG)
427414
ADD_TEST(P4Install "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/p4/install.sh ${CDASH_CONFIG})
428415
ADD_TEST(P4Test "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/scidb/harness.sh ${CDASH_CONFIG} "prepare_run")
429416
ADD_TEST(P4Result "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/scidb/harness.sh ${CDASH_CONFIG} "collect_cleanup")
417+
ADD_TEST(NamespaceInstall "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/p4/install_namespace.sh ${CDASH_CONFIG})
418+
ADD_TEST(NamespaceTest "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/scidb/harness.sh ${CDASH_CONFIG} "prepare_run")
419+
ADD_TEST(NamespaceResult "/bin/bash" ${CMAKE_BINARY_DIR}/cdash2/scidb/harness.sh ${CDASH_CONFIG} "collect_cleanup")
430420
#
431421
# TEST INSTALL TIMEOUT
432422
#
@@ -451,10 +441,13 @@ if (CDASH_CONFIG)
451441

452442
set_tests_properties (ScidbInstall PROPERTIES TIMEOUT ${INSTALL_TIMEOUT})
453443
set_tests_properties (P4Install PROPERTIES TIMEOUT ${INSTALL_TIMEOUT})
444+
set_tests_properties (NamespaceInstall PROPERTIES TIMEOUT ${INSTALL_TIMEOUT})
454445
set_tests_properties (ScidbTest PROPERTIES TIMEOUT ${HARNESS_TEST_TIMEOUT})
455446
set_tests_properties (P4Test PROPERTIES TIMEOUT ${HARNESS_TEST_TIMEOUT})
447+
set_tests_properties (NamespaceTest PROPERTIES TIMEOUT ${HARNESS_TEST_TIMEOUT})
456448
set_tests_properties (ScidbResult PROPERTIES TIMEOUT ${RESULTS_COLLECTION_TIMEOUT})
457449
set_tests_properties (P4Result PROPERTIES TIMEOUT ${RESULTS_COLLECTION_TIMEOUT})
450+
set_tests_properties (NamespaceResult PROPERTIES TIMEOUT ${RESULTS_COLLECTION_TIMEOUT})
458451
endif()
459452
#
460453
# Custom uninstall target

‎debian/changelog.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
PKGNAME-VERSION_MAJOR.VERSION_MINOR (VERSION_PATCH-BUILD) stable; urgency=low
1+
PKGNAME-VERSION_MAJOR.VERSION_MINOR (VERSION_PATCH-1) stable; urgency=low
22

3-
* Release version VERSION_MAJOR.VERSION_MINOR (VERSION_PATCH-BUILD)
3+
* Release version VERSION_MAJOR.VERSION_MINOR (VERSION_PATCH-1)
44

55
-- SciDB support list <[email protected]> Mon, 1 Oct 2012 15:00:00 +0400

‎debian/control.precise.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,78 +22,94 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python-paramiko, python-crypto
2222
Recommends: postgresql-client-8.4
2323
Suggests: postgresql-8.4, postgresql-contrib-8.4
2424
Description: SciDB - database for extra large data processing
25+
BUILD
2526

2627
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dbg
2728
Architecture: any
2829
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), gdb
2930
Description: SciDB - database for extra large data processing (debug symbols)
31+
BUILD
3032

3133
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client
3234
Architecture: any
3335
Depends: ${shlibs:Depends}, ${misc:Depends}
3436
Description: SciDB client library
37+
BUILD
3538

3639
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-dbg
3740
Architecture: any
3841
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), gdb
3942
Description: SciDB client library (debug symbols)
43+
BUILD
4044

4145
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils
4246
Architecture: any
4347
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~), scidb-VERSION_MAJOR.VERSION_MINOR-libcsv
4448
Description: SciDB querying tool and other utilities
49+
BUILD
4550

4651
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils-dbg
4752
Architecture: any
4853
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), gdb
4954
Description: SciDB querying tool and other utilities (debug symbols)
55+
BUILD
5056

5157
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools
5258
Architecture: any
5359
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~), time, valgrind, lsof
5460
Description: SciDB developer and tester utilities
61+
BUILD
5562

5663
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools-dbg
5764
Architecture: any
5865
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools (= ${binary:Version}), gdb
5966
Description: SciDB developer and tester utilities (debug symbols)
67+
BUILD
6068

6169
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins
6270
Architecture: any
6371
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), libscalapack-mpi1 (>=1.8.0), libscalapack-mpi1 (<<1.8.1), libopenmpi1.3 (>=1.4.3), libopenmpi1.3 (<<1.4.4), openmpi-bin (>=1.4.3), openmpi-bin (<<1.4.4), openmpi-common (>=1.4.3), openmpi-common (<<1.4.4), scidb-VERSION_MAJOR.VERSION_MINOR-libmpich2-1.2, scidb-VERSION_MAJOR.VERSION_MINOR-mpich2, openssh-client
6472
Description: SciDB server and client plugins
73+
BUILD
6574

6675
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins-dbg
6776
Architecture: any
6877
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), gdb
6978
Description: SciDB server and client plugins (debug symbols)
79+
BUILD
7080

7181
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python
7282
Architecture: any
7383
Depends: ${shlibs:Depends}, ${misc:Depends}, python, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~)
7484
Description: SciDB client library python connector
85+
BUILD
7586

7687
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python-dbg
7788
Architecture: any
7889
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version}), gdb
7990
Description: SciDB client library python connector (debug symbols)
91+
BUILD
8092

8193
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev
8294
Architecture: all
8395
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version})
8496
Description: SciDB headers
97+
BUILD
8598

8699
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-jdbc
87100
Architecture: all
88101
Depends: openjdk-8-jdk, libprotobuf-java, junit
89102
Description: SciDB Java connector
103+
BUILD
90104

91105
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-all
92106
Architecture: any
93107
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version})
94108
Description: Install entire SciDB
109+
BUILD
95110

96111
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-all-coord
97112
Architecture: any
98113
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version}), postgresql-client-8.4, postgresql-8.4, postgresql-contrib-8.4, sudo
99114
Description: Install entire SciDB and PostgreSQL
115+
BUILD

‎debian/control.trusty.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,78 +22,94 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python-paramiko, python-crypto
2222
Recommends: postgresql-client-9.3
2323
Suggests: postgresql-9.3, postgresql-contrib-9.3
2424
Description: SciDB - database for extra large data processing
25+
BUILD
2526

2627
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dbg
2728
Architecture: any
2829
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), gdb
2930
Description: SciDB - database for extra large data processing (debug symbols)
31+
BUILD
3032

3133
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client
3234
Architecture: any
3335
Depends: ${shlibs:Depends}, ${misc:Depends}
3436
Description: SciDB client library
37+
BUILD
3538

3639
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-dbg
3740
Architecture: any
3841
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), gdb
3942
Description: SciDB client library (debug symbols)
43+
BUILD
4044

4145
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils
4246
Architecture: any
4347
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~), scidb-VERSION_MAJOR.VERSION_MINOR-libcsv
4448
Description: SciDB querying tool and other utilities
49+
BUILD
4550

4651
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils-dbg
4752
Architecture: any
4853
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), gdb
4954
Description: SciDB querying tool and other utilities (debug symbols)
55+
BUILD
5056

5157
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools
5258
Architecture: any
5359
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~), time, valgrind, lsof
5460
Description: SciDB developer and tester utilities
61+
BUILD
5562

5663
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools-dbg
5764
Architecture: any
5865
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev-tools (= ${binary:Version}), gdb
5966
Description: SciDB developer and tester utilities (debug symbols)
67+
BUILD
6068

6169
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins
6270
Architecture: any
6371
Depends: ${shlibs:Depends}, ${misc:Depends}, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), libscalapack-mpi1 (>=1.8.0), libscalapack-mpi1 (<<1.8.1), scidb-VERSION_MAJOR.VERSION_MINOR-libmpich2-1.2, scidb-VERSION_MAJOR.VERSION_MINOR-mpich2, openssh-client
6472
Description: SciDB server and client plugins
73+
BUILD
6574

6675
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins-dbg
6776
Architecture: any
6877
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), gdb
6978
Description: SciDB server and client plugins (debug symbols)
79+
BUILD
7080

7181
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python
7282
Architecture: any
7383
Depends: ${shlibs:Depends}, ${misc:Depends}, python, PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (>= ${source:Upstream-Version}~)
7484
Description: SciDB client library python connector
85+
BUILD
7586

7687
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python-dbg
7788
Architecture: any
7889
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version}), gdb
7990
Description: SciDB client library python connector (debug symbols)
91+
BUILD
8092

8193
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-dev
8294
Architecture: all
8395
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version})
8496
Description: SciDB headers
97+
BUILD
8598

8699
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-jdbc
87100
Architecture: all
88101
Depends: openjdk-8-jdk, libprotobuf-java, junit
89102
Description: SciDB Java connector
103+
BUILD
90104

91105
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-all
92106
Architecture: any
93107
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version})
94108
Description: Install entire SciDB
109+
BUILD
95110

96111
Package: PKGNAME-VERSION_MAJOR.VERSION_MINOR-all-coord
97112
Architecture: any
98113
Depends: PKGNAME-VERSION_MAJOR.VERSION_MINOR (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-utils (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-plugins (= ${binary:Version}), PKGNAME-VERSION_MAJOR.VERSION_MINOR-client-python (= ${binary:Version}), postgresql-client-9.3, postgresql-9.3, postgresql-contrib-9.3, sudo
99114
Description: Install entire SciDB and PostgreSQL
115+
BUILD

‎deployment/common/prepare_toolchain.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ${INSTALL} ccache
5353
${INSTALL} fop docbook-xsl
5454

5555
# Testing:
56+
${INSTALL} bc
5657
${INSTALL} postgresql-8.4 postgresql-contrib-8.4
5758

5859
# ScaLAPACK tests:
@@ -92,6 +93,7 @@ ${INSTALL} ccache
9293
${INSTALL} fop docbook-xsl
9394

9495
# Testing:
96+
${INSTALL} bc
9597
${INSTALL} postgresql-9.3 postgresql-contrib-9.3
9698

9799
# ScaLAPACK tests:
@@ -131,6 +133,7 @@ ${INSTALL} ccache
131133
${INSTALL} fop libxslt docbook-style-xsl
132134

133135
# Testing:
136+
${INSTALL} bc
134137
${INSTALL} postgresql postgresql-server postgresql-contrib python-argparse
135138

136139
# ScaLAPACK tests:

‎deployment/common/scidb_start.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,20 @@ set -u
2424

2525
database=${1}
2626
SCIDB_VER="${2}"
27-
/opt/scidb/${SCIDB_VER}/bin/scidb.py startall ${database} &&
28-
until /opt/scidb/${SCIDB_VER}/bin/iquery -aq "list()" > /dev/null 2>&1; do sleep 1; done
27+
shift 2
28+
29+
if [ $# -ne 0 ]; then
30+
/opt/scidb/${SCIDB_VER}/bin/scidb.py startall ${database} --auth-file ${1}
31+
rc=$?
32+
else
33+
/opt/scidb/${SCIDB_VER}/bin/scidb.py startall ${database}
34+
rc=$?
35+
fi
36+
if [ $rc -eq 0 ]; then
37+
if [ $# -ne 0 ]; then
38+
until /opt/scidb/${SCIDB_VER}/bin/iquery --auth-file ${1} -aq "list()" > /dev/null 2>&1; do sleep 1; done
39+
else
40+
until /opt/scidb/${SCIDB_VER}/bin/iquery -aq "list()" > /dev/null 2>&1; do sleep 1; done
41+
fi
42+
fi
43+

0 commit comments

Comments
 (0)