cvs: php4 /ext/satellite README class.c class.h enum.c object.c struct.c
| From: | David Eriksson | Date: | Sun, 15 Oct 2000 17:27:29 +0000 |
| Subject: | cvs: php4 /ext/satellite README class.c class.h enum.c object.c struct.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2064@lists.php.net to get a copy of this message | ||
eriksson Sun Oct 15 10:27:29 2000 EDT
Modified files:
/php4/ext/satellite README class.c class.h enum.c object.c struct.c
Log:
Updated build instructions, changed E_ERRORs to E_WARNINGs
Index: php4/ext/satellite/README
diff -u php4/ext/satellite/README:1.2 php4/ext/satellite/README:1.3
--- php4/ext/satellite/README:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/README Sun Oct 15 10:27:28 2000
@@ -1,4 +1,4 @@
-$Id: README,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+$Id: README,v 1.3 2000/10/15 17:27:28 eriksson Exp $
About Satellite
---------------
@@ -36,10 +36,12 @@
What version of ORBit is required?
----------------------------------
-You need the CVS version of ORBit to use Satellite!
+You need a CVS version of ORBit to use Satellite!
This does NOT work with ORBit 0.5.3 or earlier.
+The latest version of ORBit in CVS requires glib-2.0 and has not been tested.
+Because of this we checkout a CVS version from a know safe date.
How to install ORBit from CVS
-----------------------------
@@ -48,12 +50,37 @@
CVS root: :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome
Password: Empty string
- Directory: ORBit
+ Directory: ORBit
+ Safe date: 2000-09-02 (yyyy-mm-dd)
More about GNOME:s CVS on http://www.gnome.org/start/source.html
+ Sample session at command line to checkout:
+
+ $ export CVSROOT=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome"
+
+ $ cvs login
+ (Logging in to anonymous@anoncvs.gnome.org)
+ CVS password:
+
+ $ cvs checkout -D "2000-09-02" ORBit
+ cvs server: Updating ORBit
+ .
+ .
+ .
+
(2) Set the environment variable CERTIFIED_GNOMIE to whatever you like.
(3) Run ./autogen.sh, gmake och gmake install
+
+How to install ORBit from snapshot
+----------------------------------
+
+(1) Download snapshot from one of these addresses:
+
+ http://download.2good.nu/satellite/ORBit-20000902.tgz
+ http://www.2good.com/satellite/ORBit-20000902.tgz
+
+(2) Run ./configure, gmake and gmake install
Index: php4/ext/satellite/class.c
diff -u php4/ext/satellite/class.c:1.2 php4/ext/satellite/class.c:1.3
--- php4/ext/satellite/class.c:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/class.c Sun Oct 15 10:27:28 2000
@@ -17,7 +17,7 @@
*/
/*
- * $Id: class.c,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+ * $Id: class.c,v 1.3 2000/10/15 17:27:28 eriksson Exp $
* vim: syntax=c tabstop=2 shiftwidth=2
*/
@@ -68,7 +68,7 @@
}
else
{
- zend_error(E_ERROR, "(Satellite) This class has no constructor");\
+ zend_error(E_WARNING, "(Satellite) This class has no constructor");\
}
}
else
@@ -84,7 +84,7 @@
* this means that the constructor has failed earlier!
* -- or should NULL be allowed here?
*/
- php_error(E_ERROR, "(Satellite) Class has no data!");
+ php_error(E_WARNING, "(Satellite) Class has no data!");
RETVAL_NULL();
goto orbit_class_function_call_exit;
}
@@ -95,7 +95,7 @@
}
else
{
- zend_error(E_ERROR, "(Satellite) Can't call functions in this class");\
+ zend_error(E_WARNING, "(Satellite) Can't call functions in this class");\
}
}
Index: php4/ext/satellite/class.h
diff -u php4/ext/satellite/class.h:1.2 php4/ext/satellite/class.h:1.3
--- php4/ext/satellite/class.h:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/class.h Sun Oct 15 10:27:28 2000
@@ -17,7 +17,7 @@
*/
/*
- * $Id: class.h,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+ * $Id: class.h,v 1.3 2000/10/15 17:27:28 eriksson Exp $
* vim: syntax=c tabstop=2 shiftwidth=2
*/
@@ -120,7 +120,7 @@
}\
else\
{\
- zend_error(E_ERROR, "(Satellite) Can't set members in class");\
+ zend_error(E_WARNING, "(Satellite) Can't set members in class");\
}\
return result;\
}
@@ -146,7 +146,7 @@
}\
else\
{\
- zend_error(E_ERROR, "(Satellite) Can't get members in class");\
+ zend_error(E_WARNING, "(Satellite) Can't get members in class");\
}\
return value;\
}
Index: php4/ext/satellite/enum.c
diff -u php4/ext/satellite/enum.c:1.2 php4/ext/satellite/enum.c:1.3
--- php4/ext/satellite/enum.c:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/enum.c Sun Oct 15 10:27:28 2000
@@ -17,7 +17,7 @@
*/
/*
- * $Id: enum.c,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+ * $Id: enum.c,v 1.3 2000/10/15 17:27:28 eriksson Exp $
* vim: syntax=c tabstop=2 shiftwidth=2
*/
@@ -103,7 +103,7 @@
p_enum->mpEnumType = TypeManager_FindEnum(ppParameters[0]->value.str.val);
if (p_enum->mpEnumType == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown enum '%s'",
ppParameters[0]->value.str.val);
+ zend_error(E_WARNING, "(Satellite) unknown enum '%s'",
ppParameters[0]->value.str.val);
goto error;
}
@@ -157,7 +157,7 @@
if (p_value == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown member '%s' in enum '%s'",
+ zend_error(E_WARNING, "(Satellite) unknown member '%s' in enum
'%s'",
pPropertyName, EnumType_GetRepositoryId(pEnum->mpEnumType));
ZVAL_NULL(pReturnValue);
Index: php4/ext/satellite/object.c
diff -u php4/ext/satellite/object.c:1.2 php4/ext/satellite/object.c:1.3
--- php4/ext/satellite/object.c:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/object.c Sun Oct 15 10:27:28 2000
@@ -17,7 +17,7 @@
*/
/*
- * $Id: object.c,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+ * $Id: object.c,v 1.3 2000/10/15 17:27:28 eriksson Exp $
* vim: syntax=c tabstop=2 shiftwidth=2
*/
@@ -139,7 +139,7 @@
if (pObject->mCorbaObject == NULL || orbit_caught_exception())
{
- zend_error(E_ERROR, "(Satellite) Unable to resolve IOR");
+ zend_error(E_WARNING, "(Satellite) Unable to resolve IOR");
goto error;
}
@@ -149,7 +149,7 @@
if (pObject->mpInterface == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown interface '%s'",
+ zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
pObject->mCorbaObject->type_id);
/* TODO: set exception */
goto error;
@@ -205,7 +205,7 @@
return;
error:
- zend_error(E_ERROR, "(Satellite) Invalid serialized object");
+ zend_error(E_WARNING, "(Satellite) Invalid serialized object");
OrbitObject_Destructor(p_object);
}
@@ -234,7 +234,7 @@
if (p_object->mpInterface == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown interface '%s'",
+ zend_error(E_WARNING, "(Satellite) unknown interface '%s'",
p_object->mCorbaObject->type_id);
goto error;
}
@@ -289,7 +289,7 @@
/* validate parameter types */
if (ppParameters[0]->type != IS_STRING)
{
- zend_error(E_ERROR, "(Satellite) IOR is not a string");
+ zend_error(E_WARNING, "(Satellite) IOR is not a string");
goto error;
}
@@ -506,7 +506,7 @@
if (p_operation == NULL)
{
/* no such operation */
- zend_error(E_ERROR, "(Satellite) unknown operation name '%s' in interface
'%s'",
+ zend_error(E_WARNING, "(Satellite) unknown operation name '%s' in interface
'%s'",
pFunctionName, pObject->mCorbaObject->type_id);
goto error;
}
@@ -655,7 +655,7 @@
{
/*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
/* no such atttribute */
- zend_error(E_ERROR, "(Satellite) unknown attribute name '%s' in interface
'%s'",
+ zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface
'%s'",
pPropertyName, pObject->mCorbaObject->type_id);
goto OrbitObject_PutProperty_error;
}
@@ -771,7 +771,7 @@
{
/*printf("InterfaceType_FindAttribute failed for property %s\n", pPropertyName);*/
/* no such atttribute */
- zend_error(E_ERROR, "(Satellite) unknown attribute name '%s' in interface
'%s'",
+ zend_error(E_WARNING, "(Satellite) unknown attribute name '%s' in interface
'%s'",
pPropertyName, pObject->mCorbaObject->type_id);
goto OrbitObject_GetProperty_error;
}
Index: php4/ext/satellite/struct.c
diff -u php4/ext/satellite/struct.c:1.2 php4/ext/satellite/struct.c:1.3
--- php4/ext/satellite/struct.c:1.2 Fri Sep 1 15:29:00 2000
+++ php4/ext/satellite/struct.c Sun Oct 15 10:27:28 2000
@@ -17,7 +17,7 @@
*/
/*
- * $Id: struct.c,v 1.2 2000/09/01 22:29:00 eriksson Exp $
+ * $Id: struct.c,v 1.3 2000/10/15 17:27:28 eriksson Exp $
* vim: syntax=c tabstop=2 shiftwidth=2
*/
@@ -179,7 +179,7 @@
pStruct->u.mpExceptionType = TypeManager_FindException(pId);
if (pStruct->u.mpExceptionType == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown struct or exception '%s'", pId);
+ zend_error(E_WARNING, "(Satellite) unknown struct or exception '%s'", pId);
goto error;
}
@@ -299,7 +299,7 @@
if (!result)
{
- zend_error(E_ERROR, "(Satellite) unknown member '%s' in struct
'%s'",
+ zend_error(E_WARNING, "(Satellite) unknown member '%s' in struct
'%s'",
pPropertyName, OrbitStruct_GetRepositoryId(pStruct));
}
@@ -313,7 +313,7 @@
if (p_value == NULL)
{
- zend_error(E_ERROR, "(Satellite) unknown member '%s' in struct
'%s'",
+ zend_error(E_WARNING, "(Satellite) unknown member '%s' in struct
'%s'",
pPropertyName, OrbitStruct_GetRepositoryId(pStruct));
ZVAL_NULL(pReturnValue);