aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/qbs/imports/qbs/DarwinTools/darwin-tools.js4
-rw-r--r--share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs2
-rw-r--r--share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs2
-rw-r--r--share/qbs/imports/qbs/base/ApplicationExtension.qbs2
-rw-r--r--share/qbs/modules/archiver/archiver.qbs2
-rw-r--r--share/qbs/modules/bundle/BundleModule.qbs6
-rw-r--r--share/qbs/modules/bundle/bundle.js2
-rw-r--r--share/qbs/modules/cli/mono.qbs2
-rw-r--r--share/qbs/modules/cpp/CppModule.qbs10
-rw-r--r--share/qbs/modules/cpp/DarwinGCC.qbs10
-rw-r--r--share/qbs/modules/cpp/ios-gcc.qbs2
-rw-r--r--share/qbs/modules/cpp/macos-gcc.qbs (renamed from share/qbs/modules/cpp/osx-gcc.qbs)8
-rw-r--r--share/qbs/modules/cpp/tvos-gcc.qbs2
-rw-r--r--share/qbs/modules/cpp/watchos-gcc.qbs2
-rw-r--r--share/qbs/modules/java/JavaModule.qbs2
-rw-r--r--share/qbs/modules/java/utils.js2
-rw-r--r--share/qbs/modules/qbs/common.qbs12
17 files changed, 40 insertions, 32 deletions
diff --git a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
index 50605c84b..7e040b756 100644
--- a/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
+++ b/share/qbs/imports/qbs/DarwinTools/darwin-tools.js
@@ -42,14 +42,14 @@ var _deviceMap = {
var _platformMap = {
"ios": "iPhone",
- "osx": "MacOSX",
+ "macos": "MacOSX",
"tvos": "AppleTV",
"watchos": "Watch"
};
var _platformDeviceMap = {
"ios": ["iphone", "ipad"],
- "osx": ["mac"],
+ "macos": ["mac"],
"tvos": ["tv"],
"watchos": ["watch"]
}
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
index 98066a481..9f282c953 100644
--- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs
@@ -46,7 +46,7 @@ PathProbe {
if (qbs.hostOS.contains("windows"))
paths.push(FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"),
"Android", "sdk", "ndk-bundle"));
- if (qbs.hostOS.contains("osx"))
+ if (qbs.hostOS.contains("macos"))
paths.push(FileInfo.joinPaths(Environment.getEnv("HOME"),
"Library", "Android", "sdk", "ndk-bundle"));
if (qbs.hostOS.contains("linux"))
diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
index 0d10bbffe..acd5c0003 100644
--- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
@@ -39,7 +39,7 @@ PathProbe {
platformPaths: {
if (qbs.hostOS.contains("windows"))
return [FileInfo.joinPaths(Environment.getEnv("LOCALAPPDATA"), "Android", "sdk")];
- if (qbs.hostOS.contains("osx"))
+ if (qbs.hostOS.contains("macos"))
return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Library", "Android", "sdk")];
if (qbs.hostOS.contains("linux"))
return [FileInfo.joinPaths(Environment.getEnv("HOME"), "Android", "Sdk")];
diff --git a/share/qbs/imports/qbs/base/ApplicationExtension.qbs b/share/qbs/imports/qbs/base/ApplicationExtension.qbs
index c0bfe9406..1034f5095 100644
--- a/share/qbs/imports/qbs/base/ApplicationExtension.qbs
+++ b/share/qbs/imports/qbs/base/ApplicationExtension.qbs
@@ -38,7 +38,7 @@ XPCService {
cpp.entryPoint: "_NSExtensionMain"
cpp.frameworks: {
var frameworks = base.concat(["Foundation"]);
- if (qbs.targetOS.contains("osx") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 ||
+ if (qbs.targetOS.contains("macos") && parseInt(xcode.sdkVersion.split(".")[1], 10) < 11 ||
qbs.targetOS.contains("ios") && parseInt(xcode.sdkVersion.split(".")[0], 10) < 9) {
frameworks = base.concat(["/System/Library/PrivateFrameworks/PlugInKit.framework"]);
}
diff --git a/share/qbs/modules/archiver/archiver.qbs b/share/qbs/modules/archiver/archiver.qbs
index c05decb02..540d75f1d 100644
--- a/share/qbs/modules/archiver/archiver.qbs
+++ b/share/qbs/modules/archiver/archiver.qbs
@@ -159,7 +159,7 @@ Module {
args.push("-cfM", output.filePath, "@" + input.filePath);
} else if (binaryName === "zip") {
// The "zip" program included with most Linux and Unix distributions
- // (including OS X) is Info-ZIP's Zip, so this should be fairly portable.
+ // (including macOS) is Info-ZIP's Zip, so this should be fairly portable.
if (compression === "none") {
args.push("-0");
} else {
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index f1a80a668..bf30a687a 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -82,7 +82,7 @@ Module {
var reader = new Bundle.XcodeBuildSpecsReader(specsPath,
specsSeparator,
additionalSettings,
- !qbs.targetOS.contains("osx"));
+ !qbs.targetOS.contains("macos"));
var settings = reader.expandedSettings(_productTypeIdentifier);
if (settings) {
xcodeSettings = settings;
@@ -143,7 +143,7 @@ Module {
property var infoPlist
property bool processInfoPlist: true
property bool embedInfoPlist: product.type.contains("application") && !isBundle
- property string infoPlistFormat: qbs.targetOS.contains("osx") ? "same-as-input" : "binary1"
+ property string infoPlistFormat: qbs.targetOS.contains("macos") ? "same-as-input" : "binary1"
property string localizedResourcesFolderSuffix: ".lproj"
@@ -735,7 +735,7 @@ Module {
}
if (product.type.contains("application")
- && product.moduleProperty("qbs", "targetOS").contains("osx")) {
+ && product.moduleProperty("qbs", "targetOS").contains("macos")) {
cmd = new Command(ModUtils.moduleProperty(product, "lsregisterPath"),
["-f", bundles[i].filePath]);
cmd.description = "register " + ModUtils.moduleProperty(product, "bundleName");
diff --git a/share/qbs/modules/bundle/bundle.js b/share/qbs/modules/bundle/bundle.js
index 32307aa9e..71210b833 100644
--- a/share/qbs/modules/bundle/bundle.js
+++ b/share/qbs/modules/bundle/bundle.js
@@ -135,7 +135,7 @@ var XcodeBuildSpecsReader = (function () {
if (typesObject["BasedOn"]) {
// We'll only do the auto shallow substitution for wrapper package types...
// this ensures that in-app purchase content bundles are non-shallow on both
- // OS X and iOS, for example (which matches Xcode behavior)
+ // macOS and iOS, for example (which matches Xcode behavior)
var isWrapper = false;
if (typesObject["ProductReference"]) {
var fileType = typesObject["ProductReference"]["FileType"];
diff --git a/share/qbs/modules/cli/mono.qbs b/share/qbs/modules/cli/mono.qbs
index 6ce1ea3e6..792e24257 100644
--- a/share/qbs/modules/cli/mono.qbs
+++ b/share/qbs/modules/cli/mono.qbs
@@ -9,7 +9,7 @@ CLIModule {
fsharpCompilerName: "fsharpc"
toolchainInstallPath: {
- if (qbs.hostOS.contains("osx"))
+ if (qbs.hostOS.contains("macos"))
return "/Library/Frameworks/Mono.framework/Commands";
}
}
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 7dabab95e..be2057ef0 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -83,10 +83,12 @@ Module {
}
property string minimumOsxVersion
+
+ property string minimumMacosVersion: minimumOsxVersion
PropertyOptions {
- name: "minimumOsxVersion"
+ name: "minimumMacosVersion"
description: "a version number in the format [major].[minor] indicating the earliest \
- version of OS X that the product should run on. passes -mmacosx-version-min=<version> \
+ version of macOS that the product should run on. passes -mmacosx-version-min=<version> \
to the compiler. if undefined, compiler defaults will be used."
}
@@ -135,7 +137,7 @@ Module {
PropertyOptions {
name: "installNamePrefix"
description: "The prefix for the internal install name (LC_ID_DYLIB) of a dynamic library \
- on Darwin (OS X and iOS)."
+ on Darwin (macOS and iOS)."
}
property pathList includePaths
@@ -297,7 +299,7 @@ Module {
property stringList platformObjcxxFlags
property stringList platformLinkerFlags
- // OS X and iOS properties
+ // Apple platforms properties
property bool automaticReferenceCounting
PropertyOptions {
name: "automaticReferenceCounting"
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs
index 7232eb0d8..d4a5003ca 100644
--- a/share/qbs/modules/cpp/DarwinGCC.qbs
+++ b/share/qbs/modules/cpp/DarwinGCC.qbs
@@ -69,11 +69,11 @@ UnixGCC {
property var defaultInfoPlist: {
var dict = {};
- if (qbs.targetOS.contains("osx")) {
+ if (qbs.targetOS.contains("macos")) {
dict["NSPrincipalClass"] = "NSApplication"; // needed for Retina display support
- if (minimumOsxVersion)
- dict["LSMinimumSystemVersion"] = minimumOsxVersion;
+ if (minimumMacosVersion)
+ dict["LSMinimumSystemVersion"] = minimumMacosVersion;
}
if (qbs.targetOS.containsAny(["ios", "tvos"])) {
@@ -130,8 +130,8 @@ UnixGCC {
// because this indicates the default deployment target for that OS
if (qbs.targetOS.contains("ios"))
env["IPHONEOS_DEPLOYMENT_TARGET"] = minimumIosVersion || "";
- if (qbs.targetOS.contains("osx"))
- env["MACOSX_DEPLOYMENT_TARGET"] = minimumOsxVersion || "";
+ if (qbs.targetOS.contains("macos"))
+ env["MACOSX_DEPLOYMENT_TARGET"] = minimumMacosVersion || "";
if (qbs.targetOS.contains("watchos"))
env["WATCHOS_DEPLOYMENT_TARGET"] = minimumWatchosVersion || "";
if (qbs.targetOS.contains("tvos"))
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index 0708a22ef..49c7c645c 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -35,7 +35,7 @@ import qbs.FileInfo
import qbs.ModUtils
DarwinGCC {
- condition: qbs.hostOS.contains('osx') &&
+ condition: qbs.hostOS.contains('macos') &&
qbs.targetOS.contains('ios') &&
qbs.toolchain && qbs.toolchain.contains('gcc')
diff --git a/share/qbs/modules/cpp/osx-gcc.qbs b/share/qbs/modules/cpp/macos-gcc.qbs
index a6c674d2c..af107d738 100644
--- a/share/qbs/modules/cpp/osx-gcc.qbs
+++ b/share/qbs/modules/cpp/macos-gcc.qbs
@@ -32,13 +32,13 @@ import qbs 1.0
import qbs.ModUtils
DarwinGCC {
- condition: qbs.hostOS.contains('osx') &&
- qbs.targetOS.contains('osx') &&
+ condition: qbs.hostOS.contains('macos') &&
+ qbs.targetOS.contains('macos') &&
qbs.toolchain && qbs.toolchain.contains('gcc')
- targetSystem: "macosx" + (minimumOsxVersion || "")
+ targetSystem: "macosx" + (minimumMacosVersion || "")
- minimumDarwinVersion: minimumOsxVersion
+ minimumDarwinVersion: minimumMacosVersion
minimumDarwinVersionCompilerFlag: "-mmacosx-version-min"
minimumDarwinVersionLinkerFlag: "-macosx_version_min"
}
diff --git a/share/qbs/modules/cpp/tvos-gcc.qbs b/share/qbs/modules/cpp/tvos-gcc.qbs
index 0e5f059d3..5378fa1b7 100644
--- a/share/qbs/modules/cpp/tvos-gcc.qbs
+++ b/share/qbs/modules/cpp/tvos-gcc.qbs
@@ -31,7 +31,7 @@
import qbs
DarwinGCC {
- condition: qbs.hostOS.contains('osx') &&
+ condition: qbs.hostOS.contains('macos') &&
qbs.targetOS.contains('tvos') &&
qbs.toolchain && qbs.toolchain.contains('gcc')
diff --git a/share/qbs/modules/cpp/watchos-gcc.qbs b/share/qbs/modules/cpp/watchos-gcc.qbs
index e188eee8e..350cba02e 100644
--- a/share/qbs/modules/cpp/watchos-gcc.qbs
+++ b/share/qbs/modules/cpp/watchos-gcc.qbs
@@ -32,7 +32,7 @@
import qbs
DarwinGCC {
- condition: qbs.hostOS.contains('osx') &&
+ condition: qbs.hostOS.contains('macos') &&
qbs.targetOS.contains('watchos') &&
qbs.toolchain && qbs.toolchain.contains('gcc')
diff --git a/share/qbs/modules/java/JavaModule.qbs b/share/qbs/modules/java/JavaModule.qbs
index 69845adc9..89ff2857c 100644
--- a/share/qbs/modules/java/JavaModule.qbs
+++ b/share/qbs/modules/java/JavaModule.qbs
@@ -128,7 +128,7 @@ Module {
property path internalClassFilesDir: FileInfo.joinPaths(product.buildDirectory, ".classes")
property path runtimeJarPath: {
- if (qbs.hostOS.contains("osx") && compilerVersionMajor === 1 && compilerVersionMinor < 7)
+ if (qbs.hostOS.contains("macos") && compilerVersionMajor === 1 && compilerVersionMinor < 7)
return FileInfo.joinPaths(jdkPath, "bundle", "Classes", "classes.jar");
return FileInfo.joinPaths(jdkPath, "jre", "lib", "rt.jar");
}
diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js
index 18f0db033..4fdccf090 100644
--- a/share/qbs/modules/java/utils.js
+++ b/share/qbs/modules/java/utils.js
@@ -95,7 +95,7 @@ function findJdkPath(hostOS, arch, environmentPaths, searchPaths) {
return undefined;
}
- if (hostOS.contains("osx")) {
+ if (hostOS.contains("macos")) {
var p = new Process();
try {
// We filter by architecture here so that we'll get a compatible JVM for JNI use.
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 3732b91a7..9891cf407 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -42,7 +42,7 @@ Module {
property string optimization: (buildVariant == "debug" ? "none" : "fast")
readonly property stringList hostOS: undefined // set internally
property string hostOSVersion: {
- if (hostOS && hostOS.contains("osx")) {
+ if (hostOS && hostOS.contains("macos")) {
return Utilities.getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductVersion") ||
Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductVersion");
} else if (hostOS && hostOS.contains("windows")) {
@@ -52,7 +52,7 @@ Module {
}
property string hostOSBuildVersion: {
- if (hostOS.contains("osx")) {
+ if (hostOS.contains("macos")) {
return Utilities.getNativeSetting("/System/Library/CoreServices/ServerVersion.plist", "ProductBuildVersion") ||
Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductBuildVersion");
} else if (hostOS.contains("windows")) {
@@ -96,7 +96,13 @@ Module {
var validator = new ModUtils.PropertyValidator("qbs");
validator.setRequiredProperty("hostOS", hostOS);
validator.setRequiredProperty("targetOS", targetOS);
- if (hostOS && (hostOS.contains("windows") || hostOS.contains("osx"))) {
+ validator.addCustomValidator("targetOS", targetOS, function (value) {
+ if (!value || (value.contains("osx") && !value.contains("macos")))
+ return false;
+ return true;
+ }, "the value 'osx' has been replaced by 'macos'; use that instead and update "
+ + "hostOS and targetOS condition checks in your project accordingly");
+ if (hostOS && (hostOS.contains("windows") || hostOS.contains("macos"))) {
validator.setRequiredProperty("hostOSVersion", hostOSVersion,
"could not detect host operating system version; " +
"verify that system files and registry keys have not " +
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 03:30:15 +0000