Changeset 51f563 in git

Timestamp:

Dec 6, 2012, 3:52:36 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

7e18d198148353f88708cfa20f738ac338cb1f55

Parents:

35a0c12b6003b7ecc3cca7a1072c5f0d145a1829

git-author:

Alexander Dreyer <adreyer@gmx.de>2012-12-06 15:52:36+01:00

git-committer:

Alexander Dreyer <adreyer@gmx.de>2012-12-06 16:20:28+01:00

Message:

Simplified compile-time cases for pyobject embed xor load

Files:

• Singular/pyobject.cc (modified) (2 diffs)
• Singular/pyobject_setup.cc (modified) (3 diffs)
• configure.ac (modified) (1 diff)

Singular/pyobject.cc

@@ -714 +714 @@
 
 
-void pyobject_init() 
+#define PYOBJECT_ADD_C_PROC(name) \
+  add_C_proc(currPack->libname, (char*)#name, FALSE, name);
+
+typedef  BOOLEAN (*func_type)(leftv, leftv);
+void pyobject_init(int (*add_C_proc)(const char*, const char*, BOOLEAN,
+                                     func_type) )
 {
   int tok = -1;
@@ -732 +737 @@
     
     PythonInterpreter::init(tok);
-  }
-}
-
-#define PYOBJECT_ADD_C_PROC(name) \
-  psModulFunctions->iiAddCproc(currPack->libname, (char*)#name, FALSE, name);
-
+
+    PYOBJECT_ADD_C_PROC(python_import);
+    PYOBJECT_ADD_C_PROC(python_eval);
+    PYOBJECT_ADD_C_PROC(python_run); 
+  }
+}
+#undef PYOBJECT_ADD_C_PROC
+
+#ifndef EMBED_PYTHON
 extern "C" { 
   void mod_init(SModulFunctions* psModulFunctions)
   { 
-    pyobject_init(); 
-
-    PYOBJECT_ADD_C_PROC(python_import);
-    PYOBJECT_ADD_C_PROC(python_eval);
-    PYOBJECT_ADD_C_PROC(python_run);   
-  }
-}
-#undef PYOBJECT_ADD_C_PROC
+    pyobject_init(psModulFunctions->iiAddCproc); 
+  }
+}
+#endif

Singular/pyobject_setup.cc

@@ -20 +20 @@
 
 /* whether pyobject module is linked statically or dynamically */
+
+#ifdef EMBED_PYTHON // Case: we include the pyobject interface in the binary
+
 #ifdef HAVE_PYTHON
+#include "pyobject.cc"
+static BOOLEAN pyobject_load()
+{
+   pyobject_init(iiAddCproc);
+   return FALSE;
+}
 
-  #if defined(HAVE_STATIC) 
-    #ifdef HAVE_STATIC_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #endif
-  #else
-    #ifdef EMBED_PYTHON
-      #define HAVE_STATIC_PYOBJECT
-    #else
-      #define HAVE_DYNAMIC_PYOBJECT
-    #endif
-  #endif 
+#else // Forced embedding, but no (development version of) python available!
+static BOOLEAN pyobject_load() { return TRUE; } 
 #endif
 
-# ifdef HAVE_STATIC_PYOBJECT // Case: link pyobject interface statically
-#include "pyobject.cc"
-void pyobject_setup() { pyobject_init(); }
 
+# else // Case: pyobject may be loaded from a dynamic module (prefered variant)
+// Note: we do not need python at compile time.
+static BOOLEAN pyobject_load()
+{
+  BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
+  return jjLOADLIB("pyobject.so", TRUE);
+}
+#endif
 
-# elif defined(HAVE_DYNAMIC_PYOBJECT) // Case: pyobject is dynamic module (prefered variant)
 
 
@@ -46 +50 @@
 void* pyobject_autoload(blackbox* bbx)
 {
-  BOOLEAN jjLOADLIB(const char* libname, BOOLEAN autoexport);
-  if (jjLOADLIB("pyobject.so", TRUE)) return NULL;
-
+  if (pyobject_load()) return NULL;
   return bbx->blackbox_Init(bbx);
 }
@@ -65 +67 @@
   setBlackboxStuff(bbx, "pyobject");
 }
- 
-#else                // Case: no python
-void pyobject_setup() { }
 
-#endif  // HAVE_PYTHON
-

configure.ac

@@ -61 +61 @@
 LB_CHECK_FLINT(2.3,,AC_MSG_WARN([Unable to find FLINT (which is strongly recommended) on your machine: please use --with-flint=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
 
+AX_PYTHON_ENABLE()
 AX_PYTHON_WITH()
 AX_PYTHON_VERSION_ENSURE( [2.4] )