Project

Profile

Help

Revision f62330e8

Added by O'Neil Delpratt almost 6 years ago

Saxon/C bug fix and minor things

View differences:

latest9.6/hec/Saxon.C.API/PEC/SaxonCGlue.h
53 53

  
54 54
EXTERN_C
55 55

  
56
 
56 57

  
58
static char tempDllname[] =
59
#if defined (__linux__)
60
        "/libsaxonpec.so";  
61
    #elif  defined (__APPLE__) && defined(__MACH__)
62
        "/libsaxonpec.dylib";
63
    #else
64
         "\\libsaxonpec.dll";
65
    #endif
66

  
67
static char tempResources_dir[] = 
68
     #ifdef __linux__
69
        "/saxon-data";
70
    #elif  defined (__APPLE__) && defined(__MACH__)
71
        "/saxon-data";
72
    #else
73
         "\\saxon-data";
74
    #endif
57 75

  
58 76

  
59
static char dllname[] =
77
static char * dllname;/*[] =
60 78
    #ifdef __linux__
61
        "/usr/lib/libsaxonpec.so";  //rename according to product edition (hec or pec) Also make change in the c file
79
        "/usr/lib/libsaxonhec.so";  //rename according to product edition (hec or pec) Also make change in the c file
62 80
    #elif  defined (__APPLE__) && defined(__MACH__)
63
        "/usr/lib/libsaxonpec.dylib";
81
        "/usr/lib/libsaxoneec.dylib";
64 82
    #else
65
         "C:\\Program Files\\Saxonica\\SaxonPEC1.0.1\\libsaxonpec.dll";
66
    #endif
83
         "C:\\Program Files\\Saxonica\\SaxonHEC1.0.1\\libsaxonhec.dll";
84
    #endif*/
67 85

  
68
static char resources_dir[] = 
86
static char *resources_dir;/*[] = 
69 87
     #ifdef __linux__
70 88
        "/usr/lib/saxon-data";
71 89
    #elif  defined (__APPLE__) && defined(__MACH__)
72 90
        "/usr/lib/saxon-data";
73 91
    #else
74 92
         "C:\\Program Files\\Saxonica\\SaxonHEC1.0.1\\saxon-data";
75
    #endif
93
    #endif*/
76 94

  
77 95
// Static variable used to track when jvm has been created. Used to prevent creation more than once.
78 96
static int jvmCreated =0;
......
126 144

  
127 145

  
128 146
/*
147
* Get Dll name.
148
*/
149

  
150
char * getResourceDirectory();
151

  
152
/*
129 153
* Set Dll name. Also set the saxon resources directory. 
130 154
* If the SAXON_HOME environmental variable is set then use that as base.
131 155
*/

Also available in: Unified diff