summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/Make.rules2
-rw-r--r--cpp/include/IceUtil/Config.h2
-rw-r--r--cpp/include/IceUtil/ResourceConfig.h2
-rw-r--r--csharp/src/Ice/Util.cs2
-rw-r--r--java-compat/src/Ice/src/main/java/Ice/Util.java2
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/Ice/Util.java2
-rw-r--r--js/package-lock.json10
-rw-r--r--js/package.json3
-rw-r--r--js/src/Ice/Initialize.js2
-rw-r--r--objective-c/config/Make.rules7
-rw-r--r--scripts/Util.py4
-rw-r--r--swift/src/Ice/Initialize.swift2
12 files changed, 19 insertions, 21 deletions
diff --git a/config/Make.rules b/config/Make.rules
index 88e194055a4..c858994c959 100644
--- a/config/Make.rules
+++ b/config/Make.rules
@@ -100,7 +100,7 @@ supported-languages ?= $(strip cpp java java-compat python ruby php \
$(if $(filter %/node,$(nodejs)),js) \
$(if $(filter %/dotnet,$(dotnet)),csharp) \
$(if $(filter Darwin,$(os)),objective-c swift))
-supported-configs ?= shared
+supported-configs ?= cpp98-shared
version = 3.8.0
mmversion = 3.8
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 973ffd6ad9e..6af457ea621 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -283,7 +283,7 @@
//
// The Ice version.
//
-#define ICE_STRING_VERSION "3.8.0-alpha.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_STRING_VERSION "3.8.0" // "A.B.C", with A=major, B=minor, C=patch
#define ICE_INT_VERSION 30800 // AABBCC, with AA=major, BB=minor, CC=patch
#define ICE_SO_VERSION "38" // "ABC", with A=major, B=minor, C=patch
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h
index 76a1b41f686..87a2e1069d5 100644
--- a/cpp/include/IceUtil/ResourceConfig.h
+++ b/cpp/include/IceUtil/ResourceConfig.h
@@ -8,7 +8,7 @@
#include "winver.h"
#define ICE_VERSION 3,8,0,0
-#define ICE_STRING_VERSION "3.8.0-alpha.0\0"
+#define ICE_STRING_VERSION "3.8.0\0"
#define ICE_SO_VERSION "38\0"
#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
#define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"
diff --git a/csharp/src/Ice/Util.cs b/csharp/src/Ice/Util.cs
index c0ff1afc65b..3e6314e1e35 100644
--- a/csharp/src/Ice/Util.cs
+++ b/csharp/src/Ice/Util.cs
@@ -515,7 +515,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static string stringVersion()
{
- return "3.8.0-alpha.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.8.0"; // "A.B.C", with A=major, B=minor, C=patch
}
/// <summary>
diff --git a/java-compat/src/Ice/src/main/java/Ice/Util.java b/java-compat/src/Ice/src/main/java/Ice/Util.java
index 80d949648d2..40120b23cba 100644
--- a/java-compat/src/Ice/src/main/java/Ice/Util.java
+++ b/java-compat/src/Ice/src/main/java/Ice/Util.java
@@ -563,7 +563,7 @@ public final class Util
public static String
stringVersion()
{
- return "3.8.0-alpha.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.8.0"; // "A.B.C", with A=major, B=minor, C=patch
}
/**
diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
index d7f1c945381..1b1252c796b 100644
--- a/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
+++ b/java/src/Ice/src/main/java/com/zeroc/Ice/Util.java
@@ -529,7 +529,7 @@ public final class Util
**/
public static String stringVersion()
{
- return "3.8.0-alpha.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.8.0"; // "A.B.C", with A=major, B=minor, C=patch
}
/**
diff --git a/js/package-lock.json b/js/package-lock.json
index 8670085e879..b25bb573f85 100644
--- a/js/package-lock.json
+++ b/js/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "ice",
- "version": "3.7.5",
+ "version": "3.8.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "ice",
- "version": "3.7.5",
+ "version": "3.8.0",
"license": "GPL-2.0",
"devDependencies": {
"@babel/cli": "^7.12.10",
@@ -54,8 +54,6 @@
"integrity": "sha512-+y4ZnePpvWs1fc/LhZRTHkTesbXkyBYuOB+5CyodZqrEuETXi3zOVfpAQIdgC3lXbHLTDG9dQosxR9BhvLKDLQ==",
"dev": true,
"dependencies": {
- "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents",
- "chokidar": "^3.4.0",
"commander": "^4.0.1",
"convert-source-map": "^1.1.0",
"fs-readdir-recursive": "^1.1.0",
@@ -2261,7 +2259,6 @@
"anymatch": "^2.0.0",
"async-each": "^1.0.1",
"braces": "^2.3.2",
- "fsevents": "^1.2.7",
"glob-parent": "^3.1.0",
"inherits": "^2.0.3",
"is-binary-path": "^1.0.0",
@@ -6518,9 +6515,6 @@
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.36.1.tgz",
"integrity": "sha512-eAfqho8dyzuVvrGqpR0ITgEdq0zG2QJeWYh+HeuTbpcaXk8vNFc48B7bJa1xYosTCKx0CuW+447oQOW8HgBIZQ==",
"dev": true,
- "dependencies": {
- "fsevents": "~2.1.2"
- },
"bin": {
"rollup": "dist/bin/rollup"
},
diff --git a/js/package.json b/js/package.json
index f83077480c0..c5ee8af0495 100644
--- a/js/package.json
+++ b/js/package.json
@@ -56,6 +56,5 @@
"build": "gulp",
"dist": "gulp dist",
"clean": "gulp clean"
- },
- "dependencies": {}
+ }
}
diff --git a/js/src/Ice/Initialize.js b/js/src/Ice/Initialize.js
index 88877439b91..f422b38223a 100644
--- a/js/src/Ice/Initialize.js
+++ b/js/src/Ice/Initialize.js
@@ -103,7 +103,7 @@ Ice.currentEncoding = function()
Ice.stringVersion = function()
{
- return "3.8.0-alpha.0"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.8.0"; // "A.B.C", with A=major, B=minor, C=patch
};
Ice.intVersion = function()
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules
index ce29ab5d561..ffc05d02690 100644
--- a/objective-c/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -17,13 +17,18 @@ endif
ifneq ($(filter arc-%,$(CONFIGS)),)
# Make sure that the non-ARC configuration is also enabled
-override CONFIGS := $(call unique,$(CONFIGS) $(patsubst arc-%,%,$(CONFIGS)))
+override CONFIGS := $(call unique,$(CONFIGS) $(patsubst arc-%,cpp98-%,$(CONFIGS)))
endif
# Validate platforms and configs
$(eval $(call validate-config))
#
+# Projects which are built with C++98
+#
+cpp98_projects = %
+
+#
# Build only few components with the static configuration (libraries)
#
static_components = Ice IceSSL IceIAP IceObjC IceSSLObjC IceIAPObjC Glacier2ObjC IceStormObjC IceGridObjC
diff --git a/scripts/Util.py b/scripts/Util.py
index a9d24326960..7d7f03a40f8 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -3187,8 +3187,8 @@ class CppMapping(Mapping):
def __init__(self, options=[]):
Mapping.Config.__init__(self, options)
- # if self.buildConfig == platform.getDefaultBuildConfig():
- # self.buildConfig = "cpp98-shared"
+ if self.buildConfig == platform.getDefaultBuildConfig():
+ self.buildConfig = "cpp98-shared"
# Derive from the build config the cpp11 option. This is used by canRun to allow filtering
# tests on the cpp11 value in the testcase options specification
diff --git a/swift/src/Ice/Initialize.swift b/swift/src/Ice/Initialize.swift
index 35e768e7fb7..13b2280ee6e 100644
--- a/swift/src/Ice/Initialize.swift
+++ b/swift/src/Ice/Initialize.swift
@@ -234,7 +234,7 @@ public let intVersion: Int = 30800
/// The Ice version in the form A.B.C, where A indicates the major version,
/// B indicates the minor version, and C indicates the patch level.
-public let stringVersion: String = "3.8.0-alpha.0"
+public let stringVersion: String = "3.8.0"
public let Encoding_1_0 = EncodingVersion(major: 1, minor: 0)
public let Encoding_1_1 = EncodingVersion(major: 1, minor: 1)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 17:02:17 +0000