diff options
-rw-r--r-- | cpp/README | 4 | ||||
-rw-r--r-- | cpp/config/Make.rules | 2 | ||||
-rw-r--r-- | cpp/include/IceUtil/Config.h | 4 | ||||
-rw-r--r-- | cpp/src/Freeze/freeze.dsp | 8 | ||||
-rw-r--r-- | cpp/src/Glacier/glacier.dsp | 8 | ||||
-rw-r--r-- | cpp/src/Ice/ice.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceBox/icebox.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IcePatch/icepatch.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceSSL/icessl.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceStorm/icestorm.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceStorm/icestormS.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceUtil/Time.cpp | 2 | ||||
-rw-r--r-- | cpp/src/IceUtil/iceutil.dsp | 8 | ||||
-rw-r--r-- | cpp/src/IceXML/icexml.dsp | 8 | ||||
-rw-r--r-- | cpp/src/Slice/slice.dsp | 8 | ||||
-rw-r--r-- | cpp/src/XMLTransform/xmltransform.dsp | 8 | ||||
-rw-r--r-- | java/INSTALL | 4 | ||||
-rw-r--r-- | java/README | 2 | ||||
-rw-r--r-- | java/src/IceUtil/Version.java | 4 |
19 files changed, 59 insertions, 59 deletions
diff --git a/cpp/README b/cpp/README index a78cb002c53..86ae431834f 100644 --- a/cpp/README +++ b/cpp/README @@ -1,2 +1,2 @@ -Please see the files INSTALL.LINUX or INSTALL.WINDOWS for installation
-instructions.
+Please see the files INSTALL.LINUX or INSTALL.WINDOWS for installation +instructions. diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index aaee3139eca..ce6e8ab143f 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -71,7 +71,7 @@ OPENSSL_HOME ?= /opt/openssl # ---------------------------------------------------------------------- SHELL = /bin/sh -VERSION = 1.0.0 +VERSION = 1.0.1 bindir = $(top_srcdir)/bin libdir = $(top_srcdir)/lib includedir = $(top_srcdir)/include diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index f0235c83b44..40041c405df 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -134,7 +134,7 @@ const Int64 Int64Max = 0x7fffffffffffffffLL; // // The Ice version. // -#define ICE_STRING_VERSION "1.0.0" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 10000 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "1.0.1" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 10001 // AABBCC, with AA=major, BB=minor, CC=patch #endif diff --git a/cpp/src/Freeze/freeze.dsp b/cpp/src/Freeze/freeze.dsp index ce305e9d864..4d46bd976ef 100644 --- a/cpp/src/Freeze/freeze.dsp +++ b/cpp/src/Freeze/freeze.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/freeze100.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/freeze101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\freeze100.lib ..\..\lib copy $(OutDir)\freeze100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\freeze101.lib ..\..\lib copy $(OutDir)\freeze101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "Freeze - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/freeze100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/freeze101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\freeze100d.lib ..\..\lib copy $(OutDir)\freeze100d.pdb ..\..\lib copy $(OutDir)\freeze100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\freeze101d.lib ..\..\lib copy $(OutDir)\freeze101d.pdb ..\..\lib copy $(OutDir)\freeze101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/Glacier/glacier.dsp b/cpp/src/Glacier/glacier.dsp index 301af965f92..e67a1e79141 100644 --- a/cpp/src/Glacier/glacier.dsp +++ b/cpp/src/Glacier/glacier.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier100.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/glacier101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacier100.lib ..\..\lib copy $(OutDir)\glacier100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacier101.lib ..\..\lib copy $(OutDir)\glacier101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "Glacier - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/glacier101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\glacier100d.lib ..\..\lib copy $(OutDir)\glacier100d.pdb ..\..\lib copy $(OutDir)\glacier100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\glacier101d.lib ..\..\lib copy $(OutDir)\glacier101d.pdb ..\..\lib copy $(OutDir)\glacier101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp index 0e76814a507..269c7824db7 100644 --- a/cpp/src/Ice/ice.dsp +++ b/cpp/src/Ice/ice.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ws2_32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/ice100.dll"
+# ADD LINK32 ws2_32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/ice101.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\ice100.lib ..\..\lib copy $(OutDir)\ice100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\ice101.lib ..\..\lib copy $(OutDir)\ice101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "Ice - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice100d.dll" /pdbtype:sept
+# ADD LINK32 ws2_32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/ice101d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\ice100d.lib ..\..\lib copy $(OutDir)\ice100d.pdb ..\..\lib copy $(OutDir)\ice100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\ice101d.lib ..\..\lib copy $(OutDir)\ice101d.pdb ..\..\lib copy $(OutDir)\ice101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceBox/icebox.dsp b/cpp/src/IceBox/icebox.dsp index b159badd1b7..5ee89e58944 100644 --- a/cpp/src/IceBox/icebox.dsp +++ b/cpp/src/IceBox/icebox.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icebox100.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icebox101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icebox100.lib ..\..\lib copy $(OutDir)\icebox100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icebox101.lib ..\..\lib copy $(OutDir)\icebox101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceBox - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icebox101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icebox100d.lib ..\..\lib copy $(OutDir)\icebox100d.pdb ..\..\lib copy $(OutDir)\icebox100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icebox101d.lib ..\..\lib copy $(OutDir)\icebox101d.pdb ..\..\lib copy $(OutDir)\icebox101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IcePatch/icepatch.dsp b/cpp/src/IcePatch/icepatch.dsp index 552e8850bb2..deb3b8be668 100644 --- a/cpp/src/IcePatch/icepatch.dsp +++ b/cpp/src/IcePatch/icepatch.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch100.dll" /libpath:"../../../lib"
+# ADD LINK32 libeay32.lib ssleay32.lib libbz2.lib /nologo /dll /machine:I386 /out:"Release/icepatch101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepatch100.lib ..\..\lib copy $(OutDir)\icepatch100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepatch101.lib ..\..\lib copy $(OutDir)\icepatch101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IcePatch - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 libeay32.lib ssleay32.lib libbz2d.lib /nologo /dll /debug /machine:I386 /out:"Debug/icepatch101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icepatch100d.lib ..\..\lib copy $(OutDir)\icepatch100d.pdb ..\..\lib copy $(OutDir)\icepatch100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icepatch101d.lib ..\..\lib copy $(OutDir)\icepatch101d.pdb ..\..\lib copy $(OutDir)\icepatch101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceSSL/icessl.dsp b/cpp/src/IceSSL/icessl.dsp index 20d427fecda..e6d4197ef54 100644 --- a/cpp/src/IceSSL/icessl.dsp +++ b/cpp/src/IceSSL/icessl.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/icessl100.dll"
+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/icessl101.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icessl100.lib ..\..\lib copy $(OutDir)\icessl100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icessl101.lib ..\..\lib copy $(OutDir)\icessl101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceSSL - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl100d.dll" /pdbtype:sept
+# ADD LINK32 ws2_32.lib libeay32.lib ssleay32.lib xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/icessl101d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icessl100d.lib ..\..\lib copy $(OutDir)\icessl100d.pdb ..\..\lib copy $(OutDir)\icessl100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icessl101d.lib ..\..\lib copy $(OutDir)\icessl101d.pdb ..\..\lib copy $(OutDir)\icessl101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceStorm/icestorm.dsp b/cpp/src/IceStorm/icestorm.dsp index 116707f3d30..b521db67cc9 100644 --- a/cpp/src/IceStorm/icestorm.dsp +++ b/cpp/src/IceStorm/icestorm.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm100.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestorm101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestorm100.lib ..\..\lib copy $(OutDir)\icestorm100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestorm101.lib ..\..\lib copy $(OutDir)\icestorm101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceStorm - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestorm101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestorm100d.lib ..\..\lib copy $(OutDir)\icestorm100d.pdb ..\..\lib copy $(OutDir)\icestorm100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestorm101d.lib ..\..\lib copy $(OutDir)\icestorm101d.pdb ..\..\lib copy $(OutDir)\icestorm101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceStorm/icestormS.dsp b/cpp/src/IceStorm/icestormS.dsp index eb1986d4225..3e20c6d8a81 100644 --- a/cpp/src/IceStorm/icestormS.dsp +++ b/cpp/src/IceStorm/icestormS.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormservice100.dll" /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/icestormservice101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestormservice100.lib ..\..\lib copy $(OutDir)\icestormservice100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestormservice101.lib ..\..\lib copy $(OutDir)\icestormservice101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceStormS - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormservice100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/icestormservice101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icestormservice100d.lib ..\..\lib copy $(OutDir)\icestormservice100d.pdb ..\..\lib copy $(OutDir)\icestormservice100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icestormservice101d.lib ..\..\lib copy $(OutDir)\icestormservice101d.pdb ..\..\lib copy $(OutDir)\icestormservice101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index 69d11e93725..678b9a8f8f0 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -137,7 +137,7 @@ IceUtil::Time::operator timeval() const IceUtil::Time::operator double() const { - return _usec / 1000000; + return _usec / 1000000.0L; } Time::Time(Int64 usec) : diff --git a/cpp/src/IceUtil/iceutil.dsp b/cpp/src/IceUtil/iceutil.dsp index c7ed47a25a9..146da953868 100644 --- a/cpp/src/IceUtil/iceutil.dsp +++ b/cpp/src/IceUtil/iceutil.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil100.dll"
+# ADD LINK32 rpcrt4.lib /nologo /dll /machine:I386 /out:"Release/iceutil101.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceutil100.lib ..\..\lib copy $(OutDir)\iceutil100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iceutil101.lib ..\..\lib copy $(OutDir)\iceutil101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceUtil - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil100d.dll" /pdbtype:sept
+# ADD LINK32 rpcrt4.lib /nologo /dll /debug /machine:I386 /out:"Debug/iceutil101d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceutil100d.lib ..\..\lib copy $(OutDir)\iceutil100d.pdb ..\..\lib copy $(OutDir)\iceutil100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\iceutil101d.lib ..\..\lib copy $(OutDir)\iceutil101d.pdb ..\..\lib copy $(OutDir)\iceutil101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/IceXML/icexml.dsp b/cpp/src/IceXML/icexml.dsp index 4eb2804b4d9..81f5807d4d3 100644 --- a/cpp/src/IceXML/icexml.dsp +++ b/cpp/src/IceXML/icexml.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/icexml100.dll"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/icexml101.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icexml100.lib ..\..\lib copy $(OutDir)\icexml100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icexml101.lib ..\..\lib copy $(OutDir)\icexml101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "IceXML - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml100d.dll" /pdbtype:sept
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/icexml101d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\icexml100d.lib ..\..\lib copy $(OutDir)\icexml100d.pdb ..\..\lib copy $(OutDir)\icexml100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\icexml101d.lib ..\..\lib copy $(OutDir)\icexml101d.pdb ..\..\lib copy $(OutDir)\icexml101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/Slice/slice.dsp b/cpp/src/Slice/slice.dsp index 9cd375d953c..90b8a032a1e 100644 --- a/cpp/src/Slice/slice.dsp +++ b/cpp/src/Slice/slice.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice100.dll"
+# ADD LINK32 /nologo /dll /machine:I386 /out:"Release/slice101.dll"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\slice100.lib ..\..\lib copy $(OutDir)\slice100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\slice101.lib ..\..\lib copy $(OutDir)\slice101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "Slice - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice100d.dll" /pdbtype:sept
+# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"Debug/slice101d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\slice100d.lib ..\..\lib copy $(OutDir)\slice100d.pdb ..\..\lib copy $(OutDir)\slice100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\slice101d.lib ..\..\lib copy $(OutDir)\slice101d.pdb ..\..\lib copy $(OutDir)\slice101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/cpp/src/XMLTransform/xmltransform.dsp b/cpp/src/XMLTransform/xmltransform.dsp index 097c3fa0f21..6acbc26a842 100644 --- a/cpp/src/XMLTransform/xmltransform.dsp +++ b/cpp/src/XMLTransform/xmltransform.dsp @@ -54,12 +54,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/xmltransform100.dll" /libpath:"../../../lib"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /machine:I386 /out:"Release/xmltransform101.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /debug /nodefaultlib
# Begin Special Build Tool
OutDir=.\Release
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\xmltransform100.lib ..\..\lib copy $(OutDir)\xmltransform100.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\xmltransform101.lib ..\..\lib copy $(OutDir)\xmltransform101.dll ..\..\bin
# End Special Build Tool
!ELSEIF "$(CFG)" == "XMLTransform - Win32 Debug"
@@ -87,12 +87,12 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/xmltransform100d.dll" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"Debug/xmltransform101d.dll" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /nodefaultlib
# Begin Special Build Tool
OutDir=.\Debug
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\xmltransform100d.lib ..\..\lib copy $(OutDir)\xmltransform100d.pdb ..\..\lib copy $(OutDir)\xmltransform100d.dll ..\..\bin
+PostBuild_Cmds=copy $(OutDir)\xmltransform101d.lib ..\..\lib copy $(OutDir)\xmltransform101d.pdb ..\..\lib copy $(OutDir)\xmltransform101d.dll ..\..\bin
# End Special Build Tool
!ENDIF
diff --git a/java/INSTALL b/java/INSTALL index 1c3f8de6a92..b5509b70299 100644 --- a/java/INSTALL +++ b/java/INSTALL @@ -46,8 +46,8 @@ server, or you can build Ice for C++ yourself. The pre-compiled archives are available for Linux and Windows 2000/XP: -Linux: ftp://ftp.zeroc.com/pub/Ice/1.0/Ice-1.0.0-bin-linux.tar.gz -Windows 2000/XP: ftp://ftp.zeroc.com/pub/Ice/1.0/Ice-1.0.0-bin-win32.zip +Linux: ftp://ftp.zeroc.com/pub/Ice/1.0/Ice-1.0.1-bin-linux.tar.gz +Windows 2000/XP: ftp://ftp.zeroc.com/pub/Ice/1.0/Ice-1.0.1-bin-win32.zip After downloading an archive, extract it into a directory of your choosing, and add the 'bin' subdirectory to your PATH. diff --git a/java/README b/java/README index 56393e27d69..76a25f08f48 100644 --- a/java/README +++ b/java/README @@ -1 +1 @@ -Please see the file INSTALL for installation instructions.
+Please see the file INSTALL for installation instructions. diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index 852ff320755..41779730b30 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -19,6 +19,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "1.0.0"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 10000; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "1.0.1"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 10001; // AABBCC, with AA=major, BB=minor, CC=patch } |