Changeset 394d507 in git

Timestamp:

Oct 31, 2013, 3:33:58 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

763c4ddb0c6304b684b9b52b91d2713df4bbb4ee

Parents:

b71c90b0435ff0a26e3081e93b19ece9c2262807

Message:

chg: use LIBEXEC_DIR/PREFIX for resources

Files:

• libpolys/polys/mod_raw.cc (modified) (2 diffs)
• resources/feResource.cc (modified) (3 diffs)

libpolys/polys/mod_raw.cc

@@ -17 +17 @@
 #include <sys/stat.h>
 #include <errno.h>
+#include <unistd.h>
 
 
@@ -61 +62 @@
   void* handle = NULL;
   char* binary_name_so=NULL;
-
-  // try %b/MOD first
-  {
-    const char* bin_dir = feGetResource('b');
-    const int binary_name_so_length = 6 + strlen(DL_TAIL)
-               + strlen(binary_name)
-               +strlen(DIR_SEPP)*2
-               +strlen(bin_dir);
+  BOOLEAN found=FALSE;
+
+  // try P_PROCS_DIR (%P)
+  char* proc_path = feGetResource('P');
+  if (proc_path != NULL)
+  {
+    char *p;
+    char *q;
+    p=proc_path;
+    int binary_name_so_length = 3 + strlen(DL_TAIL) + strlen(binary_name) + strlen(DIR_SEPP) + strlen(proc_path);
     binary_name_so = (char *)omAlloc0( binary_name_so_length * sizeof(char) );
-    snprintf(binary_name_so, binary_name_so_length, "%s%s%s%s%s%s", bin_dir, DIR_SEPP,"MOD",DIR_SEPP,binary_name, DL_TAIL);
-    handle = dynl_open(binary_name_so);
-
-  }
-
-  // try P_PROCS_DIR (%P)
-  if (handle == NULL)
-  {
-    const char* proc_dir = feGetResource('P');
-    if (proc_dir != NULL)
+    while((p!=NULL)&&(*p!='\0'))
     {
-      if (binary_name_so!=NULL) omFree(binary_name_so);
-      const int binary_name_so_length = 3 + strlen(DL_TAIL) + strlen(binary_name) + strlen(DIR_SEPP) + strlen(proc_dir);
-      binary_name_so = (char *)omAlloc0( binary_name_so_length * sizeof(char) );
-      snprintf(binary_name_so, binary_name_so_length, "%s%s%s%s", proc_dir, DIR_SEPP, binary_name, DL_TAIL);
-      handle = dynl_open(binary_name_so);
+      q=strchr(p,fePathSep);
+      if (q!=NULL) *q='\0';
+      strcpy(binary_name_so,p);
+      if (q!=NULL) *q=fePathSep;
+      strcat(binary_name_so,DIR_SEPP);
+      strcat(binary_name_so,binary_name);
+      strcat(binary_name_so,DL_TAIL);
+      if(!access(binary_name_so, R_OK)) { found=TRUE; break; }
+      if (q!=NULL) p=q+1; else p=NULL;
     }
+    if (found) handle = dynl_open(binary_name_so);
   }
 
   if (handle == NULL && ! warn_handle)
   {
-      Warn("Could not find dynamic library: %s%s (tried %s)",
-              binary_name, DL_TAIL,binary_name_so);
-      Warn("Error message from system: %s", dynl_error());
-      if (msg != NULL) Warn("%s", msg);
-      Warn("See the INSTALL section in the Singular manual for details.");
-      warn_handle = TRUE;
+    Warn("Could not find dynamic library: %s%s (path %s)",
+            binary_name, DL_TAIL,proc_path);
+    if (found) Warn("Error message from system: %s", dynl_error());
+    if (msg != NULL) Warn("%s", msg);
+    Warn("See the INSTALL section in the Singular manual for details.");
+    warn_handle = TRUE;
   }
   omfree((ADDRESS)binary_name_so );

resources/feResource.cc

@@ -42 +42 @@
 // #define RESOURCE_DEBUG
 
-#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"
+#define SINGULAR_DEFAULT_DIR PREFIX
 
 /*****************************************************************
@@ -63 +63 @@
    "%r/share/singular/LIB;"
    "%b/../share/singular/LIB;"
+   // gftables:
    "%D/factory;"
    "%r/share/factory;"
-   "%b/../share/factory;"
-   "%r/libexec/singular/MOD;"
-   "%b/../libexec/singular/MOD;"
    "%b/LIB;"
-   "%r/LIB;"
-   "%d/LIB;"
+   "%b/../factory;"
+   // path for dynamic modules, should match ProcDir:
    "%b/MOD;"
-   "%r/MOD;"
-   "%d/MOD;"
-   "%b;"
-   "%b/../factory;"
-   "%b/../../factory",
-   ""},
+   LIBEXEC_DIR "/singular/MOD;"
+   "%b",
+   (char *)""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "",                  (char *)""},
-  // should be changed to %b/../libexec/singular/pProcs/:
-  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%r/libexec/singular/MOD/",                  (char *)""},
+  // should be changed to %b/../lib/singular/pProcs/:
+  {"ProcDir",   'P',    feResPath,  "SINGULAR_PROCS_DIR",
+     "%b/MOD;"
+     LIBEXEC_DIR "/singular/MOD;"
+     "%r/libexec/singular/MOD",                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share/",          (char *)""},
@@ -188 +186 @@
   // don't complain about stuff when initializing SingularPath
   feResource('s',0);
+  feResource('P');
 
 #if defined(HAVE_SETENV) || defined(HAVE_PUTENV)