diff options
| -rw-r--r-- | cpp/demo/Ice/plugin/Makefile | 4 | ||||
| -rw-r--r-- | cpp/demo/Ice/plugin/README | 6 | ||||
| -rwxr-xr-x | cpp/demo/Ice/plugin/expect.py | 7 | ||||
| -rw-r--r-- | cpp/test/Ice/Makefile.mak | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/cpp/demo/Ice/plugin/Makefile b/cpp/demo/Ice/plugin/Makefile index 7b3a455c85c..ad8c2fa0960 100644 --- a/cpp/demo/Ice/plugin/Makefile +++ b/cpp/demo/Ice/plugin/Makefile @@ -52,7 +52,7 @@ $(SERVER): $(OBJS) $(SOBJS) $(LOGGERFILENAME): $(LOBJS) rm -f $@ - $(call mkshlib,$@,$(SONAME),$(LOBJS),$(LIBS)) + $(call mkshlib,$@,$(LOGGERSONAME),$(LOBJS),$(LIBS)) $(LOGGERSONAME): $(LOGGERFILENAME) rm -f $@ @@ -60,7 +60,7 @@ $(LOGGERSONAME): $(LOGGERFILENAME) $(HELLOFILENAME): $(OBJS) $(HOBJS) rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS) $(HOBJS),$(LIBS)) + $(call mkshlib,$@,$(HELLOSONAME),$(OBJS) $(HOBJS),$(LIBS)) $(HELLOSONAME): $(HELLOFILENAME) rm -f $@ diff --git a/cpp/demo/Ice/plugin/README b/cpp/demo/Ice/plugin/README index 5972f3052b9..9943295c71b 100644 --- a/cpp/demo/Ice/plugin/README +++ b/cpp/demo/Ice/plugin/README @@ -16,4 +16,8 @@ servant for this demo. Please look in the client and sever configuration files to see the plugin configuration. -Note that in linux the plugin directory should be in your LD_LIBRARY_PATH +For the server or client to be able to find the library containing the +plugin, you must add the current directory to your shared library +search path (e.g., LD_LIBRARY_PATH on Linux, DYLD_LIBRARY_PATH on Mac +OS X, etc.). Alternatively, you can copy the library to a directory +that is already in the search path. diff --git a/cpp/demo/Ice/plugin/expect.py b/cpp/demo/Ice/plugin/expect.py index 1c80743a4a9..f35e50a72ca 100755 --- a/cpp/demo/Ice/plugin/expect.py +++ b/cpp/demo/Ice/plugin/expect.py @@ -22,9 +22,7 @@ sys.path.append(path[0]) from demoscript import * from demoscript.Ice import plugin -libraryPath = os.environ["LD_LIBRARY_PATH"]; -if Util.isLinux(): - os.environ["LD_LIBRARY_PATH"] = libraryPath + ":." +Util.addLdPath(os.getcwd()) server = Util.spawn('./server --Ice.PrintAdapterReady --Ice.Warn.Connections=0') server.expect('.* ready') @@ -32,6 +30,3 @@ client = Util.spawn('./client --Ice.Warn.Connections=0') client.expect('.*==>') plugin.run(client, server) - -if Util.isLinux(): - os.environ["LD_LIBRARY_PATH"] = libraryPath
\ No newline at end of file diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 1e8b353a9e8..b0cf59456b5 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -49,3 +49,4 @@ $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \
@echo "making $@ in %i" && \
cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
+q
\ No newline at end of file |