diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-03-25 09:11:59 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-03-25 09:11:59 -0230 |
| commit | c606554cfcf0898ebaec9aa7927e61311c434b80 (patch) | |
| tree | f64258673c0745d0aa2a1bc8ad5edb4dc84306fe /java/src/ant/SliceTask.java | |
| parent | Fixed bug 2892 and bug where symlink wasn't created (diff) | |
| download | ice-c606554cfcf0898ebaec9aa7927e61311c434b80.tar.bz2 ice-c606554cfcf0898ebaec9aa7927e61311c434b80.tar.xz ice-c606554cfcf0898ebaec9aa7927e61311c434b80.zip | |
Bug 2887 - check if srcdist when setting shared libpaths
Diffstat (limited to 'java/src/ant/SliceTask.java')
| -rw-r--r-- | java/src/ant/SliceTask.java | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/java/src/ant/SliceTask.java b/java/src/ant/SliceTask.java index a1d10414938..97e1693467f 100644 --- a/java/src/ant/SliceTask.java +++ b/java/src/ant/SliceTask.java @@ -336,6 +336,7 @@ public class SliceTask extends org.apache.tools.ant.Task addLdLibraryPath(ExecTask task) { String iceInstall = getIceHome(); + boolean srcdist = getProject().getProperties().containsKey("ice.src.dist"); if(iceInstall != null) { String ldLibPathEnv = null; @@ -356,7 +357,14 @@ public class SliceTask extends org.apache.tools.ant.Task { ldLibPathEnv = "SHLIB_PATH"; ldLib64PathEnv = "LD_LIBRARY_PATH"; - lib64Path = new File(iceInstall + File.separator + "lib" + File.separator + "pa20_64").toString(); + if(srcdist) + { + lib64Path = libPath; + } + else + { + lib64Path = new File(iceInstall + File.separator + "lib" + File.separator + "pa20_64").toString(); + } } else if(os.startsWith("Windows")) { @@ -371,11 +379,15 @@ public class SliceTask extends org.apache.tools.ant.Task ldLibPathEnv = "LD_LIBRARY_PATH"; ldLib64PathEnv = "LD_LIBRARY_PATH_64"; String arch = System.getProperty("os.arch"); - if(arch.equals("x86")) + if(srcdist) + { + lib64Path = libPath; + } + else if(arch.equals("x86")) { lib64Path = new File(iceInstall + File.separator + "lib" + File.separator + "amd64").toString(); } - else + else // Sparc { lib64Path = new File(iceInstall + File.separator + "lib" + File.separator + "sparcv9").toString(); } @@ -384,7 +396,14 @@ public class SliceTask extends org.apache.tools.ant.Task { ldLibPathEnv = "LD_LIBRARY_PATH"; ldLib64PathEnv = "LD_LIBRARY_PATH"; - lib64Path = new File(iceInstall + File.separator + "lib64").toString(); + if(srcdist) + { + lib64Path = libPath; + } + else + { + lib64Path = new File(iceInstall + File.separator + "lib64").toString(); + } } if(ldLibPathEnv != null) |