link database library into /cvmfs/delphi.cern.ch/releases/ubuntu-x86_64-24/dstana/161018/lib

Makefile

@@ -28,7 +28,7 @@ clean:
 	rm -rf /tmp/swcd build
 
 # build the full stack
-all: clean setup cernlib dstana ddb des examples docs openphigs delgra idea simana export
+all: clean setup cernlib ddb dstana des examples docs openphigs delgra idea simana export
 
 swcd:
 	./GetCodeFromGitlab.sh $(DELPHI_SWCD)

make_ddb

@@ -36,8 +36,12 @@ if [ $rc -eq 0  ]; then
 	if [ $rc -eq 0 ]; then
 	    echo "All database executables created"
 	    cd $DELPHI_BIN
+	    mv ../ddb/bin/Linux/* ../ddb/bin
+	    rmdir ../ddb/bin/Linux
+	    mkdir ../ddb/lib
+	    mv ../ddb/src/lib/Linux/* ../ddb/lib
 	    for x in dedit  dlist  dplot  dtobcd  dtobin; do
-		ln -s ../ddb/bin/Linux/$x
+		ln -s ../ddb/bin/$x
 	    done
 	    exit 0
 	else

make_dstana

@@ -71,8 +71,10 @@ make_dellib -p dstana -v $VERS -o compile -batch
 rc=$?
 if [ $rc -eq 0 ]; then
     echo "Build succeeded"
+    # link database
+    cd $DELPHI_LIB; ln -s ../../../ddb/lib/libddappxx.a
 else
     echo "Build FAILED"
-
 fi
+
 exit $rc

scripts/dellib

@@ -44,7 +44,7 @@ if (defined $ENV{DELPHI_LIB}){
 #
 
 my ($skelana,$bsaurus,$dstana,$vdclap,$vfclap,$phdst,$pxtag);
-my ($trigger,$ufield,$uhlib,$herlib,$ux,$pxdst,$tanagra);
+my ($trigger,$ufield,$uhlib,$herlib,$ux,$pxdst,$tanagra,$ddapp);
 
 while ($_ = shift @ARGV){
     if      ( /^skelana(?:xx){0,1}$/ ){
@@ -76,10 +76,12 @@ while ($_ = shift @ARGV){
         $phdst = 1;
     }elsif ( /^herlib(?:xx){0,1}$/ ){
         $herlib = 1;
+    }elsif ( /^ddapp(?:xx){0,1}$/ ){
+        $ddapp = 1;
     }else{
         print STDERR "USAGE:\n";
         print STDERR "  dellib [skelana bsaurus dstana vdclap vfclap phdst pxtag \n";
-        print STDERR "          trigger ufield  uhlib  herlib ux     pxdst tanagra ]\n\n";
+        print STDERR "          trigger ufield  uhlib  herlib ux pxdst tanagra ddapp ]\n\n";
         exit 1;
     }
 }
@@ -107,6 +109,7 @@ push(@liblist,"uhlibxx")   if defined $uhlib;
 push(@liblist,"herlibxx")  if defined $herlib;
 push(@liblist,"uxxx")      if defined $ux;
 push(@liblist,"tanagraxx") if defined $tanagra;
+push(@liblist,"ddappxx")   if defined $ddapp;
 
 map {$_ = "-l$_"} @liblist; # prepend each library with "-l"
 

tests/check_install.sh

@@ -21,7 +21,7 @@ if [[ ! -z "${GROUP_DIR}" ]]; then
 	rc=2
     fi
     # count testing libraries
-    elibs=597
+    elibs=600
     flibs=`find . -name \*.a | wc -l`
     if [ "x$elibs" = "x$flibs" ]; then
 	echo "All expected $elibs libraries have been created"