Changeset 2122

Timestamp:

2001-03-07T11:44:59+13:00 (23 years ago)

Author:

say1

Message:

(more) corba fixes. hopefully now compiles directly from the box ...

Location:

trunk/gsdl

Files:

• cgi-bin/getior (added)
• packages/Makefile.in (modified) (1 diff)
• packages/configure (modified) (1 diff)
• src/recpt/corbaproto.mpp (modified) (6 diffs)

trunk/gsdl/packages/Makefile.in

@@ -50 +50 @@
           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
         done
-    for idir in $(PACKAGEDIRS); do \
-          echo installing $$idir; \
-          (cd $$idir && $(MAKE) install) || exit 1; \
-        done
-
+    cp -f mico/bin/* ../bin/linux
+    cp -f mico/lib/* ../lib/
+    cp -fr mico/include/* ../include
+    cp -fr mico/man ../man
 
 install:

trunk/gsdl/packages/configure

@@ -56 +56 @@
   tar -xzf mico-2.3.5.tar.gz
   cd mico
-  ./configure $CACHE_FILE --prefix=$PACKAGES/mico --bindir=$bindir/linux --prefix=$PACKAGES/mico
+#  --exec-prefix=$GSDLHOME/bin/linux
+  ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/
   sed 's/tools//' $PACKAGES/mico/mico/Makefile >$PACKAGES/mico/mico/Makefile.out
   mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile

trunk/gsdl/src/recpt/corbaproto.mpp

@@ -378 +378 @@
   corbatext_t      corbaKey;
   corbatext_tarray corbaCfgline;
+  gsdlInterface::corbaComError error;
 
   // get the corba client reference
@@ -388 +389 @@
 
   // execute the corba transaction
-  lclient->configure(corbaKey, corbaCfgline);  
+  lclient->configure(corbaKey, corbaCfgline, error);  
+
+  
 
   if (key=="gsdlhome")
@@ -397 +400 @@
       gsdlhome = cfgline[0];
     }
+  err = (comerror_t) error;
 }
 
@@ -402 +406 @@
 bool corbaproto::init (comerror_t &err, ostream &logout) {
 //  cout << "Corbaproto::Init" << endl;
-
-  // get the corba client reference
-  // corbaiface_var lclient = this->getCorbaClient(); // ****
-  corbaiface_var lclient = client;
-
-  // execute the corba transaction
-  return lclient->initialise();
+  gsdlInterface::corbaComError error;
+
+  // get the corba client reference
+  // corbaiface_var lclient = this->getCorbaClient(); // ****
+  corbaiface_var lclient = client;
+
+  // execute the corba transaction
+  return lclient->initialise(error);
 }
 
@@ -495 +500 @@
   corbatext_tarray corba_collist;
   text_tarray      tcollist;
-
-  // get the corba client reference
-  // corbaiface_var lclient = this->getCorbaClient(); // ****
-  corbaiface_var lclient = client;
-
-  // execute the corba transaction
-  lclient->collectionList(corba_collist);
+  gsdlInterface::corbaComError error;
+
+  // get the corba client reference
+  // corbaiface_var lclient = this->getCorbaClient(); // ****
+  corbaiface_var lclient = client;
+
+  // execute the corba transaction
+  lclient->collectionList(corba_collist,error);
 
   // convert the response back to normal form
@@ -507 +513 @@
   collist = tcollist;
 
-  err = noError;
+  err = (comerror_t) error;
 }