diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-12 12:45:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-12 12:45:52 +0000 |
| commit | 55f29175971c6a15532f22a25ed1243eccfd32da (patch) | |
| tree | 2810200df3dc15a24ef6fe1b14b04a2159703944 /cpp/src | |
| parent | Fixed bug 1045 (diff) | |
| download | ice-55f29175971c6a15532f22a25ed1243eccfd32da.tar.bz2 ice-55f29175971c6a15532f22a25ed1243eccfd32da.tar.xz ice-55f29175971c6a15532f22a25ed1243eccfd32da.zip | |
Fixed IceGrid python scripts
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorParser.cpp | 11 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Makefile | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp index 8e7768b23d7..8d1b715cad6 100644 --- a/cpp/src/IceGrid/DescriptorParser.cpp +++ b/cpp/src/IceGrid/DescriptorParser.cpp @@ -9,6 +9,7 @@ #include <Ice/Ice.h> #include <IceXML/Parser.h> +#include <IcePatch2/Util.h> #include <IceGrid/Admin.h> #include <IceGrid/DescriptorParser.h> #include <IceGrid/DescriptorBuilder.h> @@ -856,17 +857,19 @@ DescriptorParser::parseDescriptor(const string& descriptor, const Ice::CommunicatorPtr& communicator, const IceGrid::AdminPrx& admin) { - DescriptorHandler handler(descriptor, communicator); + string filename = IcePatch2::simplify(descriptor); + DescriptorHandler handler(filename, communicator); handler.setAdmin(admin); handler.setVariables(variables, targets); - IceXML::Parser::parse(descriptor, handler); + IceXML::Parser::parse(filename, handler); return handler.getApplicationDescriptor(); } ApplicationDescriptor DescriptorParser::parseDescriptor(const string& descriptor, const Ice::CommunicatorPtr& communicator) { - DescriptorHandler handler(descriptor, communicator); - IceXML::Parser::parse(descriptor, handler); + string filename = IcePatch2::simplify(descriptor); + DescriptorHandler handler(filename, communicator); + IceXML::Parser::parse(filename, handler); return handler.getApplicationDescriptor(); } diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index ac1efca9084..fae55ccf30c 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -135,12 +135,13 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME) $(ADMIN): $(ADMIN_OBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid $(LIBS) $(READLINE_LIBS) + $(CXX) $(LDFLAGS) -o $@ $(ADMIN_OBJS) -lGlacier2 $(EXPAT_RPATH_LINK) -lIceXML -lIceGrid -lIcePatch2 \ + $(LIBS) $(READLINE_LIBS) $(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(LIBTARGETS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStormService -lGlacier2 $(DB_RPATH_LINK) -lFreeze \ - -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIceGrid -lIceStormService -lGlacier2 -lIcePatch2 \ + $(DB_RPATH_LINK) -lFreeze -lIceBox $(EXPAT_RPATH_LINK) -lIceXML -lIceSSL $(OPENSSL_LIBS) $(LIBS) $(NODE_SERVER): $(NODE_SVR_OBJS) $(LIBTARGETS) rm -f $@ |