[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas/src mac/geas-mac.pbproj/project.pbxpr...
|
From: |
Neil Tiffin |
|
Subject: |
gnue/geas/src mac/geas-mac.pbproj/project.pbxpr... |
|
Date: |
Sat, 15 Sep 2001 10:45:02 -0400 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/09/15 10:45:02
Modified files:
geas/src/mac/geas-mac.pbproj: project.pbxproj
geas/src/methods: methods.c methods.h methods_python.c
methods_python.h
Log message:
Getting closer to compiling.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.c.diff?cvsroot=OldCVS&tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods.h.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.c.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/methods/methods_python.h.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj
diff -u gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.3
gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.4
--- gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj:1.3 Sat Sep 15
08:57:31 2001
+++ gnue/geas/src/mac/geas-mac.pbproj/project.pbxproj Sat Sep 15 10:45:01 2001
@@ -601,6 +601,10 @@
01105B9B00C7D20E7F000001,
5B886B1100CEF4727F000001,
F5FE2AEB0153872301000001,
+ F5FE2AED015389BB01000001,
+ F5FE2AEF0153952301000001,
+ F5FE2AF10153965301000001,
+ F5FE2AF30153970101000001,
);
isa = PBXGroup;
name = Libraries;
@@ -682,7 +686,7 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS =
"/Volumes/AnagadaII/gnue/geas/src/oql
/Volumes/AnagadaII/gnue/geas/src/objectcache
/Volumes/AnagadaII/gnue/geas/src/objectstore
/Volumes/AnagadaII/gnue/geas/src/lib /Volumes/AnagadaII/gnue/geas/src/config
/Volumes/AnagadaII/gnue/geas/src/methods /Volumes/AnagadaII/gnue/geas/src
/Volumes/AnagadaII/sw/include";
INSTALL_PATH = /Volumes/AnagadaII/gnue/geas/src;
- LIBRARY_SEARCH_PATHS =
"/Volumes/AnagadaII/sw/lib /usr/local/pgsql/lib /Volumes/AnagadaII/sw/lib/mysql
/Volumes/AnagadaII/sw/lib/python2.1/config";
+ LIBRARY_SEARCH_PATHS =
"/Volumes/AnagadaII/sw/lib /usr/local/pgsql/lib /Volumes/AnagadaII/sw/lib/mysql
/Volumes/AnagadaII/sw/lib/python2.1/config /usr/X11R6/lib";
OPTIMIZATION_CFLAGS = "";
OTHER_CFLAGS = "-traditional-cpp -g
-DHAVE_GETOPT_H -DHAVE_CONFIG_H -DUSE_SERVANT_MANAGER
-DGEAS_DATA_DIR=\\\\\\\"../../\\\\\\\"
-DGEAS_SYSRC=\\\\\\\"../../geas.conf\\\\\\\" -DGEAS_PID_DIR=\\\\\\\"../\\\\\\\"
-DGEAS_IOR_DIR=\\\\\\\"../\\\\\\\"";
OTHER_LDFLAGS = "";
@@ -797,6 +801,10 @@
F575A87F0135697001000001,
F575A881013569A201000001,
F5FE2AEC0153872301000001,
+ F5FE2AEE015389BB01000001,
+ F5FE2AF00153952301000001,
+ F5FE2AF20153965301000001,
+ F5FE2AF40153970201000001,
);
isa = PBXFrameworksBuildPhase;
name = "Frameworks & Libraries";
@@ -1420,6 +1428,54 @@
};
F5FE2AEC0153872301000001 = {
fileRef = F5FE2AEB0153872301000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5FE2AED015389BB01000001 = {
+ isa = PBXFileReference;
+ name = libreadline.4.dylib;
+ path = /Volumes/AnagadaII/sw/lib/libreadline.4.dylib;
+ refType = 0;
+ };
+ F5FE2AEE015389BB01000001 = {
+ fileRef = F5FE2AED015389BB01000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5FE2AEF0153952301000001 = {
+ isa = PBXFileReference;
+ name = libtcl8.3.dylib;
+ path = /Volumes/AnagadaII/sw/lib/libtcl8.3.dylib;
+ refType = 0;
+ };
+ F5FE2AF00153952301000001 = {
+ fileRef = F5FE2AEF0153952301000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5FE2AF10153965301000001 = {
+ isa = PBXFileReference;
+ name = libtk8.3.dylib;
+ path = /Volumes/AnagadaII/sw/lib/libtk8.3.dylib;
+ refType = 0;
+ };
+ F5FE2AF20153965301000001 = {
+ fileRef = F5FE2AF10153965301000001;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5FE2AF30153970101000001 = {
+ isa = PBXFileReference;
+ name = libX11.6.2.dylib;
+ path = /usr/X11R6/lib/libX11.6.2.dylib;
+ refType = 0;
+ };
+ F5FE2AF40153970201000001 = {
+ fileRef = F5FE2AF30153970101000001;
isa = PBXBuildFile;
settings = {
};
Index: gnue/geas/src/methods/methods.c
diff -u gnue/geas/src/methods/methods.c:1.14
gnue/geas/src/methods/methods.c:1.15
--- gnue/geas/src/methods/methods.c:1.14 Sat Sep 15 08:57:31 2001
+++ gnue/geas/src/methods/methods.c Sat Sep 15 10:45:01 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods.c,v 1.14 2001/09/15 12:57:31 ntiffin Exp $
+ $Id: methods.c,v 1.15 2001/09/15 14:45:01 ntiffin Exp $
*/
#include "config.h"
@@ -36,11 +36,6 @@
#include "methods_python.h"
#include "methods_glibmodule.h"
-
-static provider_t *alloc_provider_data (const char *classname,
- const char *cid,
- const char *methodname, void *extra);
-
static void free_provider_data (provider_t * p);
gboolean
@@ -53,11 +48,12 @@
#endif
#if USE_GLIBMODULE_METHODS
- //status = status || glibmodule_initialise_method_handling (configuration
config);
- gmod_init_method_handling(config);
+ status = status || gmod_init_method_handling (config);
#endif
-#if ! USE_PYTHON_METHODS && ! USE_GLIBMODULE_METHODS
+#if USE_PYTHON_METHODS || USE_GLIBMODULE_METHODS
+ /* good your are using methods */
+#else
criticalerror ("No method code handling has been compiled.");
message ("No business class methods will work.");
#endif
Index: gnue/geas/src/methods/methods.h
diff -u gnue/geas/src/methods/methods.h:1.8 gnue/geas/src/methods/methods.h:1.9
--- gnue/geas/src/methods/methods.h:1.8 Fri Sep 14 21:47:25 2001
+++ gnue/geas/src/methods/methods.h Sat Sep 15 10:45:01 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods.h,v 1.8 2001/09/15 01:47:25 ntiffin Exp $
+ $Id: methods.h,v 1.9 2001/09/15 14:45:01 ntiffin Exp $
*/
#ifndef METHODS_H
@@ -52,4 +52,7 @@
const char *methodname,
GEAS_Arguments * args, CORBA_Environment * ev);
+static provider_t *alloc_provider_data (const char *classname,
+ const char *cid,
+ const char *methodname, void *extra);
#endif
Index: gnue/geas/src/methods/methods_python.c
diff -u gnue/geas/src/methods/methods_python.c:1.2
gnue/geas/src/methods/methods_python.c:1.3
--- gnue/geas/src/methods/methods_python.c:1.2 Fri Sep 14 21:47:25 2001
+++ gnue/geas/src/methods/methods_python.c Sat Sep 15 10:45:01 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods_python.c,v 1.2 2001/09/15 01:47:25 ntiffin Exp $
+ $Id: methods_python.c,v 1.3 2001/09/15 14:45:01 ntiffin Exp $
*/
/*
@@ -126,7 +126,7 @@
* python_initialise_method_handling
\* ------------------------------------------------------------------------- */
gboolean
-python_initialise_method_handling(configuration config)
+python_init_method_handling(configuration config)
{
char *buf = NULL;
PyObject *m, *py_dict;
@@ -460,7 +460,7 @@
* python_load_python_binding
\* ------------------------------------------------------------------------- */
static int
-python_load_python_binding(configuration config)
+load_python_binding(configuration config)
{
gpointer gsym;
CORBA_to_Python_func = NULL;
Index: gnue/geas/src/methods/methods_python.h
diff -u gnue/geas/src/methods/methods_python.h:1.2
gnue/geas/src/methods/methods_python.h:1.3
--- gnue/geas/src/methods/methods_python.h:1.2 Sat Sep 15 08:57:31 2001
+++ gnue/geas/src/methods/methods_python.h Sat Sep 15 10:45:01 2001
@@ -19,7 +19,7 @@
along with GEAS; if not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- $Id: methods_python.h,v 1.2 2001/09/15 12:57:31 ntiffin Exp $
+ $Id: methods_python.h,v 1.3 2001/09/15 14:45:01 ntiffin Exp $
*/
#ifndef METHODS_PYTHON_H
@@ -29,7 +29,7 @@
/* ------------------------------------------------------------------------- *\
* python_initialise_method_handling
\* ------------------------------------------------------------------------- */
-gboolean python_initialise_method_handling(configuration config);
+gboolean python_init_method_handling(configuration config);
/* ------------------------------------------------------------------------- *\