Changeset 1083 for framspy

Timestamp:

02/18/21 18:58:55 (4 years ago)

Author:

Maciej Komosinski

Message:

Allowed to override the default name of frams-objects.dll/so

Location:

framspy

Files:

• frams-test.py (modified) (1 diff)
• frams.py (modified) (2 diffs)

framspy/frams-test.py

@@ -2 +2 @@
 import frams
 
-framspath = sys.argv[1] # set to the directory where Framsticks binaries and libraries exist
-frams.init(framspath, "-Ddata")  # "-D"+os.path.join(framspath,"data")) # not possible (maybe python windows issue) because of the need for os.chdir(). So we assume "data" is where the dll/so is
+frams_path = sys.argv[1] # set to the directory where Framsticks binaries and libraries exist
+frams.init(frams_path, sys.argv[2] if len(sys.argv) > 2 else None, "-Ddata")  # "-D"+os.path.join(framspath,"data")) # not possible (maybe python windows issue) because of the need for os.chdir(). So we assume "data" is where the dll/so is
 
 print('Available objects:', dir(frams))

framspy/frams.py

@@ -20 +20 @@
 
 class ExtValue(object):
-        """All Framsticks objects and values are instances of this class."""
+        """All Framsticks objects and values are instances of this class. Read the documentation of the 'frams' module for more information."""
 
         _reInsideParens = re.compile('\((.*)\)')
@@ -248 +248 @@
 
 
-def init(lib_path, *args):
+def init(lib_path, lib_name, *args):
+        """
+        Initializes the connection to Framsticks dll/so.
+
+        :param lib_path: the path where the dll/so file can be found
+        :param lib_name: the name of the dll/so (a complete name including file name extension) or None if you want to use the default name
+        :param args: optional arguments to pass to Framsticks initialization (try "-h")
+        """
         original_dir = os.getcwd()
-        os.chdir(lib_path)  # because under Windows, frams.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found while loading the main dll
-        global c_api  # access global variable
-        c_api = ctypes.CDLL('frams-objects.so' if os.name == 'posix' else 'frams-objects.dll')
+        os.chdir(lib_path)  # because under Windows, frams-objects.dll requires other dll's which reside in the same directory, so we must change current dir for them to be found while loading the main dll
+        global c_api  # access global variable to initialize it
+        c_api = ctypes.CDLL(lib_name if lib_name is not None else 'frams-objects.so' if os.name == 'posix' else 'frams-objects.dll')
         os.chdir(original_dir)