Copy shared Python libraries instead of creating a symbolic link (#1987)

Jürgen Knödlseder
1 parent 9c23d585
Showing 4 changed files with 34 additions and 15 deletions
ChangeLog
NEWS
inst/cta/src/GCTACubeExposure.cpp
pyext/setup.py.in
-2017-04-04
+2017-04-05
  
         * Version 1.3.0 released
         =========================
  
+        Copy shared Python libraries instead of creating a symbolic link (#1987)
         Added FITS image conversion operators (#1986)
         If code originates from Git, always compile the Python bindings (#1985)
         Raise exception instead of exiting with return code in Python tests (#1983)
 New Features and Important Changes in GammaLib 1.3.0.dev1
  
-4 April 2017
+5 April 2017
  
  
 1. Introduction
@@ -54,6 +54,10 @@ This solves the problem that occured for developers that could not get rid
 of existing Python wrappers, even if they modified the Python interface
 (#1985).
  
+The shared libraries needed by the Python wrappers are now copied into a
+build/gammalib directory for unit testing instead of creating a symbolic
+link since on shared VM file systems symbolic links may not work (#1987).
+
  
 4. Application module
 ---------------------
@@ -701,11 +701,9 @@ void GCTACubeExposure::fill_cube(const GCTAObservation&amp; obs, GLog* log)
                     // approximation, but probably the only we can really do.
                     // We allow here for a small margin in case of rounding
                     // errors in the energy boundaries.
-//std::cout << obs_ebounds.emin() << " <= " << m_energies[iebin] << " <= " << obs_ebounds.emax() << std::endl;
                     if (!(obs_ebounds.contains(m_energies[iebin])        ||
                           obs_ebounds.contains(m_energies[iebin]-margin) ||
                           obs_ebounds.contains(m_energies[iebin]+margin))) {
-//std::cout << "Skip" << std::endl;
                         continue;
                     }
  
 #############################################################################
 # Disutils setup file for gammalib Python extension module                  #
 # ------------------------------------------------------------------------- #
-# Copyright (C) 2011-2016 Juergen Knoedlseder                               #
+# Copyright (C) 2011-2017 Juergen Knoedlseder                               #
 # ------------------------------------------------------------------------- #
 #                                                                           #
 #  This program is free software: you can redistribute it and/or modify     #
@@ -24,6 +24,7 @@ import glob
 import os
 import sys
 import re
+import shutil
  
 # Define package name
 pkg_name = 'gammalib'
@@ -228,19 +229,34 @@ setup(name=&#39;@PACKAGE_NAME@&#39;,
       platforms=['Linux', 'Solaris', 'Mac OS-X', 'Unix', 'BSD'],
       )
  
-# Post-processing. A symbolic link is created to the directory containing the
-# shared wrapper libraries so that we can add this directory to the PYTHONPATH
-# for testing.
+# Post-processing. The shared wrapper libraries are copied into the
+# build/gammalib directory and this directory is appended to the PYTHONPATH
+# so that shared libraries can be accessed during unit testing. This kluge
+# is needed since the name of the build directory where the shared libraries
+# reside is not known when building the Makefile.
 if is_build:
+
+    # Remove existing build/gammalib directory
     try:
-        os.chdir('build')
-        os.remove('gammalib')
-        print('Removed symbolic link build/gammalib.')
+        os.remove('build/gammalib')
+        print('Removed "build/gammalib" directory.')
     except:
         pass
+
+    # Create build/gammalib directory
     try:
-        path = glob.glob('lib.*/gammalib')
-        os.symlink(path[0], 'gammalib')
-        print('Created symbolic link build/gammalib.')
+        os.mkdir('build/gammalib')
+        print('Created "build/gammalib" directory.')
+    except (OSError):
+        print('Directory "build/gammalib" exists already.')
     except:
-        print('WARNING: Failed to create symbolic link build/gammalib.')
+        print('ERROR: Failed to create directory "build/gammalib".')
+        raise
+
+    # Copy over shared libraries from lib.*/gammalib folder
+    files = glob.glob('build/lib.*/gammalib/_*.so')
+    for file in files:
+        dst = os.path.join('build/gammalib', os.path.basename(file))
+        shutil.copy2(file, dst)
+        print('Copied %s -> %s' % (file, dst))
+    print('Copied shared libraries into "build/gammalib" directory.')