- Timestamp:
- 2001-03-07T11:44:59+13:00 (23 years ago)
- Location:
- trunk/gsdl
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/packages/Makefile.in
r2113 r2122 50 50 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 51 51 done 52 for idir in $(PACKAGEDIRS); do \ 53 echo installing $$idir; \ 54 (cd $$idir && $(MAKE) install) || exit 1; \ 55 done 56 52 cp -f mico/bin/* ../bin/linux 53 cp -f mico/lib/* ../lib/ 54 cp -fr mico/include/* ../include 55 cp -fr mico/man ../man 57 56 58 57 install: -
trunk/gsdl/packages/configure
r2113 r2122 56 56 tar -xzf mico-2.3.5.tar.gz 57 57 cd mico 58 ./configure $CACHE_FILE --prefix=$PACKAGES/mico --bindir=$bindir/linux --prefix=$PACKAGES/mico 58 # --exec-prefix=$GSDLHOME/bin/linux 59 ./configure $CACHE_FILE --prefix=$PACKAGES/mico/ 59 60 sed 's/tools//' $PACKAGES/mico/mico/Makefile >$PACKAGES/mico/mico/Makefile.out 60 61 mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile -
trunk/gsdl/src/recpt/corbaproto.mpp
r2113 r2122 378 378 corbatext_t corbaKey; 379 379 corbatext_tarray corbaCfgline; 380 gsdlInterface::corbaComError error; 380 381 381 382 // get the corba client reference … … 388 389 389 390 // execute the corba transaction 390 lclient->configure(corbaKey, corbaCfgline); 391 lclient->configure(corbaKey, corbaCfgline, error); 392 393 391 394 392 395 if (key=="gsdlhome") … … 397 400 gsdlhome = cfgline[0]; 398 401 } 402 err = (comerror_t) error; 399 403 } 400 404 … … 402 406 bool corbaproto::init (comerror_t &err, ostream &logout) { 403 407 // cout << "Corbaproto::Init" << endl; 404 405 // get the corba client reference 406 // corbaiface_var lclient = this->getCorbaClient(); // **** 407 corbaiface_var lclient = client; 408 409 // execute the corba transaction 410 return lclient->initialise(); 408 gsdlInterface::corbaComError error; 409 410 // get the corba client reference 411 // corbaiface_var lclient = this->getCorbaClient(); // **** 412 corbaiface_var lclient = client; 413 414 // execute the corba transaction 415 return lclient->initialise(error); 411 416 } 412 417 … … 495 500 corbatext_tarray corba_collist; 496 501 text_tarray tcollist; 497 498 // get the corba client reference 499 // corbaiface_var lclient = this->getCorbaClient(); // **** 500 corbaiface_var lclient = client; 501 502 // execute the corba transaction 503 lclient->collectionList(corba_collist); 502 gsdlInterface::corbaComError error; 503 504 // get the corba client reference 505 // corbaiface_var lclient = this->getCorbaClient(); // **** 506 corbaiface_var lclient = client; 507 508 // execute the corba transaction 509 lclient->collectionList(corba_collist,error); 504 510 505 511 // convert the response back to normal form … … 507 513 collist = tcollist; 508 514 509 err = noError;515 err = (comerror_t) error; 510 516 } 511 517
Note:
See TracChangeset
for help on using the changeset viewer.