Changeset f230d92 in git

Timestamp:

Mar 1, 2017, 5:47:39 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dc29160a567b9e04c172ea21b48f03a654afd0a8

Parents:

4d24f6272fb2b5388b2a23b455a78b4439e1eece

Message:

dyn_mod/python: adapt to autoconf/automake

Files:

• Singular/dyn_modules/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/python/Makefile.am (added)
• Singular/dyn_modules/python/Makefile.bsp (moved) (moved from Singular/dyn_modules/python/Makefile)
• Singular/dyn_modules/python/interpreter_support.cc (modified) (1 diff)
• Singular/dyn_modules/python/python.mod (deleted)
• Singular/dyn_modules/python/python_module.cc (moved) (moved from Singular/dyn_modules/python/python.cc) (2 diffs)
• Singular/dyn_modules/python/python_module.pl (deleted)
• Singular/dyn_modules/python/ring_wrap.h (modified) (1 diff)
• configure.ac (modified) (1 diff)
• m4/options.m4 (modified) (3 diffs)

Singular/dyn_modules/Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I ../m4
 
-SUBDIRS=staticdemo bigintm syzextra pyobject customstd gfanlib polymake singmathic Order
+SUBDIRS=staticdemo bigintm syzextra pyobject customstd gfanlib python polymake singmathic Order

Singular/dyn_modules/python/interpreter_support.cc

@@ -3 +3 @@
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 #include <kernel/mod2.h>
-#include "subexpr.h"
+#include "Singular/subexpr.h"
 #include "Poly.h"
 #include "Ideal.h"

Singular/dyn_modules/python/python_module.cc

@@ -9 +9 @@
 #include <Python.h>
 #include <kernel/mod2.h>
-#include <tok.h>
+#include <Singular/tok.h>
 #include <kernel/structs.h>
 #include <Singular/mod_lib.h>
-#include <ipid.h>
+#include <Singular/ipid.h>
 
-#include <locals.h>
+#include <Singular/locals.h>
 #include <omalloc/omalloc.h>
 
@@ -58 +58 @@
 extern "C" int SI_MOD_INIT(python_module)(SModulFunctions* psModulFunctions)
 {
+  char *py=getenv("PYTHONPATH");
+  char buf[1024];
+  if (py!=NULL)
+  {
+    strcpy(buf,py);
+    strcat(buf,":");
+    strcat(buf,feResource('s',FALSE));
+  }
+  else
+    strcpy(buf,feResource('s',FALSE));
+  Print("setting PYTHONAPTH to %s\n",buf);
+  setenv("PYTHONPATH",buf,1);
+
   Py_Initialize();
   PyRun_SimpleString("from sys import path\n\

Singular/dyn_modules/python/ring_wrap.h

@@ -2 +2 @@
 #define RING_WRAP_HEADER
 #include "polys/monomials/ring.h"
-#include "grammar.h"
-#include "subexpr.h"
-#include "ipid.h"
+#include "Singular/grammar.h"
+#include "Singular/subexpr.h"
+#include "Singular/ipid.h"
 #include <boost/intrusive_ptr.hpp>
 #include "Number.h"

configure.ac

@@ -237 +237 @@
 AC_CONFIG_FILES([Singular/dyn_modules/gfanlib/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/polymake/Makefile])
+AC_CONFIG_FILES([Singular/dyn_modules/python/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/customstd/Makefile])
 AC_CONFIG_FILES([Singular/dyn_modules/pyobject/Makefile])

m4/options.m4

@@ -308 +308 @@
   bi_gfanlib=false
   bi_polymake=false
+  bi_python=false
   bi_customstd=false
   bi_singmathic=false
@@ -339 +340 @@
        gfanlib ) bi_gfanlib=true ;;
        polymake ) bi_polymake=true ;;
+       python_module ) bi_python=true ;;
        customstd ) bi_customstd=true ;;
        singmathic ) bi_singmathic=true ;;
@@ -373 +375 @@
  AM_CONDITIONAL([SI_BUILTIN_GFANLIB], [test x$bi_gfanlib = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_POLYMAKE], [test x$bi_polymake = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_PYTHON_MODULE], [test x$bi_python = xtrue])
+ AM_CONDITIONAL([HAVE_PYTHON_MODULE], [test x$bi_python = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_CUSTOMSTD], [test x$bi_customstd = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_SINGMATHIC], [test x$bi_singmathic = xtrue])