diff options
| author | Jose <jose@zeroc.com> | 2014-11-06 16:41:07 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-11-06 16:41:07 +0100 |
| commit | 9a3d730fbbc70b693e936c6ff3013323ec84c556 (patch) | |
| tree | 8d706f1fbd834191548ce19e2a259418454355da /scripts/TestUtil.py | |
| parent | Some minor fixes to the demo distributions (diff) | |
| download | ice-9a3d730fbbc70b693e936c6ff3013323ec84c556.tar.bz2 ice-9a3d730fbbc70b693e936c6ff3013323ec84c556.tar.xz ice-9a3d730fbbc70b693e936c6ff3013323ec84c556.zip | |
Fixed (ICE-5832) - Versioning of Jar files
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index e25a9082cb8..acbe750e4b5 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1638,14 +1638,15 @@ def getTestEnv(lang, testdir): # The Ice.jar and Freeze.jar comes from the installation # directory or the toplevel dir. javaDir = os.path.join(getIceDir("java", testdir), "lib") - addClasspath(os.path.join(javaDir, "Ice.jar"), env) - addClasspath(os.path.join(javaDir, "Glacier2.jar"), env) - addClasspath(os.path.join(javaDir, "Freeze.jar"), env) - addClasspath(os.path.join(javaDir, "IceBox.jar"), env) - addClasspath(os.path.join(javaDir, "IceStorm.jar"), env) - addClasspath(os.path.join(javaDir, "IceGrid.jar"), env) - addClasspath(os.path.join(javaDir, "IcePatch2.jar"), env) - addClasspath(os.path.join(javaDir, "IceDiscovery.jar"), env) + jarSuffix = "-" + getIceVersion() + ".jar" + addClasspath(os.path.join(javaDir, "Ice" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "Glacier2" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "Freeze" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceBox" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceStorm" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceGrid" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IcePatch2" + jarSuffix), env) + addClasspath(os.path.join(javaDir, "IceDiscovery" + jarSuffix), env) addClasspath(os.path.join(javaDir), env) # |