Ice-E fixes:

- Updated fixVersion.py
- Changed version to 1.3.0
- Removed IceUtil.Version
- Added Ice.Util.stringVersion and Ice.Util.intVersion

9 files changed, 43 insertions, 45 deletions

diff --git a/cpp/src/slice2cppe/Gen.h b/cpp/src/slice2cppe/Gen.h
index 3cba14ccee6..4be9f0a052f 100644
--- a/cpp/src/slice2cppe/Gen.h
+++ b/cpp/src/slice2cppe/Gen.h
@@ -16,8 +16,8 @@
 //
 // The Ice-E version.
 //
-#define ICEE_STRING_VERSION "1.2.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICEE_INT_VERSION 10200      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICEE_STRING_VERSION "1.3.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICEE_INT_VERSION 10300      // AABBCC, with AA=major, BB=minor, CC=patch
 
 namespace Slice
 {
diff --git a/cpp/src/slice2javae/Gen.h b/cpp/src/slice2javae/Gen.h
index a09f3937b45..4c4283688ab 100644
--- a/cpp/src/slice2javae/Gen.h
+++ b/cpp/src/slice2javae/Gen.h
@@ -16,8 +16,8 @@
 //
 // The Ice-E version.
 //
-#define ICEE_STRING_VERSION "1.2.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICEE_INT_VERSION 10200      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICEE_STRING_VERSION "1.3.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICEE_INT_VERSION 10300      // AABBCC, with AA=major, BB=minor, CC=patch
 
 namespace Slice
 {
diff --git a/cppe/config/Make.rules b/cppe/config/Make.rules
index b6fa4f0b512..9c9431ee263 100644
--- a/cppe/config/Make.rules
+++ b/cppe/config/Make.rules
@@ -58,8 +58,8 @@ prefix			= /opt/IceE-$(VERSION)
 # ----------------------------------------------------------------------
 
 SHELL			= /bin/sh
-VERSION			= 1.2.0
-SOVERSION		= 12
+VERSION			= 1.3.0
+SOVERSION		= 13
 bindir			= $(top_srcdir)/bin
 libdir			= $(top_srcdir)/lib
 includedir		= $(top_srcdir)/include
diff --git a/cppe/config/Make.rules.mak b/cppe/config/Make.rules.mak
index a08a7b7d944..71999de27dc 100644
--- a/cppe/config/Make.rules.mak
+++ b/cppe/config/Make.rules.mak
@@ -70,8 +70,8 @@ MT = "$(PDK_HOME)\bin\mt.exe"
 # ----------------------------------------------------------------------

 

 SHELL			= /bin/sh

-VERSION			= 1.2.0

-SOVERSION		= 12

+VERSION			= 1.3.0

+SOVERSION		= 13

 bindir			= $(top_srcdir)\bin

 libdir			= $(top_srcdir)\lib

 includedir		= $(top_srcdir)\include

diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h
index 6367a27a3a4..18c3450c9d6 100644
--- a/cppe/include/IceE/Config.h
+++ b/cppe/include/IceE/Config.h
@@ -292,8 +292,8 @@ typedef long long Int64;
 //
 // The Ice-E version.
 //
-#define ICEE_STRING_VERSION "1.2.0" // "A.B.C", with A=major, B=minor, C=patch
-#define ICEE_INT_VERSION 10200      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICEE_STRING_VERSION "1.3.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICEE_INT_VERSION 10300      // AABBCC, with AA=major, BB=minor, CC=patch
 
 //
 // Some include files we need almost everywhere
diff --git a/fixVersion.py b/fixVersion.py
index cbfd82701dc..a7cccf50055 100755
--- a/fixVersion.py
+++ b/fixVersion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os, sys, shutil, fnmatch, re, glob, getopt
+import os, sys, shutil, fnmatch, re, glob, getopt, stat
 
 #
 # version pattern
@@ -115,7 +115,7 @@ def find(path, patt):
 #
 def fileMatchAndReplace(filename, matchAndReplaceExps, warn=True):
 
-    mode = os.stat(filename)[ST_MODE]
+    mode = os.stat(filename).st_mode
     oldConfigFile = open(filename, "r")
     newConfigFile = open(filename + ".new", "w")
 
@@ -148,7 +148,7 @@ def fileMatchAndReplace(filename, matchAndReplaceExps, warn=True):
     if updated:
         print "updated " + filename
         os.rename(filename + ".new", filename)
-        os.chmod(filename, S_IMODE(mode))
+        os.chmod(filename, stat.S_IMODE(mode))
     elif warn:
         print "warning: " + filename + " didn't contain any version"
         os.unlink(filename + ".new")
@@ -400,22 +400,24 @@ if patchIceE:
         fileMatchAndReplace(os.path.join(icee_home, "config", "Make.rules"),
                             [("VERSION[\t\s]*= ([0-9]*\.[0-9]*\.[0-9]*)", version),
                              ("SOVERSION[\t\s]*= ([0-9]*)", soVersion(version))])
-    
-        fileMatchAllAndReplace(os.path.join(icee_home, "src", "IceE", "ice.dsp"),
-                               [("icee([0-9][0-9])d?\.((dll)|(pdb))", soVersion(version))])
-        fileMatchAllAndReplace(os.path.join(icee_home, "src", "IceEC", "icec.dsp"),
-                               [("iceec([0-9][0-9])d?\.((dll)|(pdb))", soVersion(version))])
-        fileMatchAllAndReplace(os.path.join(icee_home, "test", "Common", "testCommon.dsp"),
-                               [("testCommon([0-9][0-9])d?\.((dll)|(pdb))", soVersion(version))])
+        fileMatchAndReplace(os.path.join(icee_home, "config", "Make.rules.mak"),
+                            [("VERSION[\t\s]*= ([0-9]*\.[0-9]*\.[0-9]*)", version),
+                             ("SOVERSION[\t\s]*= ([0-9]*)", soVersion(version))])
 
-    #
-    # Fix version in IceJ sources
-    #
     iceje_home = os.path.join(ice_dir, "javae")
     if iceje_home:
-        fileMatchAndReplace(os.path.join(iceje_home, "src", "IceUtil", "Version.java"),
-                            [("ICEE_STRING_VERSION = \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
-                             ("ICEE_INT_VERSION = ([0-9]*)", intVersion(version))])
+        fileMatchAndReplace(os.path.join(iceje_home, "src", "Ice", "Util.java"),
+                            [("return \"" + vpatMatch +"\".*A=major", version), \
+                             ("return ([0-9]*).*AA=major", intVersion(version))])
+
+    ice_home = os.path.join(ice_dir, "cpp")
+    if ice_home:
+        fileMatchAndReplace(os.path.join(ice_home, "src", "slice2cppe", "Gen.h"),
+                            [("ICEE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
+                             ("ICEE_INT_VERSION ([0-9]*)", intVersion(version))])
+        fileMatchAndReplace(os.path.join(ice_home, "src", "slice2javae", "Gen.h"),
+                            [("ICEE_STRING_VERSION \"([0-9]*\.[0-9]*\.[0-9]*)\"", version), \
+                             ("ICEE_INT_VERSION ([0-9]*)", intVersion(version))])
 
     sys.exit(0)
 
diff --git a/javae/CHANGES b/javae/CHANGES
index 821f326f97f..339eae51893 100644
--- a/javae/CHANGES
+++ b/javae/CHANGES
@@ -1,6 +1,9 @@
 Changes since version 1.2.0
 ---------------------------
 
+- Replaced IceUtil.Version with the methods Ice.Util.stringVersion
+  and Ice.Util.intVersion.
+
 - The use of sequences (and structs containing sequences) as valid 
   dictionary keys has been deprecated and will be removed in a future
   release.
diff --git a/javae/src/Ice/Util.java b/javae/src/Ice/Util.java
index c65ac9fea92..1e39b314765 100644
--- a/javae/src/Ice/Util.java
+++ b/javae/src/Ice/Util.java
@@ -207,6 +207,18 @@ public final class Util
         }
     }
 
+    public static String
+    stringVersion()
+    {
+        return "1.3.0"; // "A.B.C", with A=major, B=minor, C=patch
+    }
+
+    public static int
+    intVersion()
+    {
+        return 10300; // AABBCC, with AA=major, BB=minor, CC=patch
+    }
+
     public static void
     throwBadMagicException(byte[] badMagic)
     {
diff --git a/javae/src/IceUtil/Version.java b/javae/src/IceUtil/Version.java
deleted file mode 100644
index 74f0c461e98..00000000000
--- a/javae/src/IceUtil/Version.java
+++ /dev/null
@@ -1,19 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice-E is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package IceUtil;
-
-public final class Version
-{
-    //
-    // The Ice version.
-    //
-    public final static String ICEE_STRING_VERSION = "1.2.0"; // "A.B.C", with A=major, B=minor, C=patch
-    public final static int ICEE_INT_VERSION = 10200;         // AABBCC, with AA=major, BB=minor, CC=patch
-}