Separate functionality for binary and bundle extensions

Author: nickclark2016

modules/xcode/tests/test_xcode_project.lua

@@ -1908,9 +1908,9 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnWindowedAppTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnWindowedAppTargetBundleExtension()
 		kind "WindowedApp"
-		targetextension ".xyz"
+		targetbundleextension ".xyz"
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
@@ -1931,9 +1931,9 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnWindowedAppNoTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnWindowedAppNoTargetBundleExtension()
 		kind "WindowedApp"
-		targetextension ""
+		targetbundleextension ""
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
@@ -1954,10 +1954,10 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnOSXBundleTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnOSXBundleTargetBundleExtension()
 		kind "SharedLib"
 		sharedlibtype "OSXBundle"
-		targetextension ".xyz"
+		targetbundleextension ".xyz"
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
@@ -1978,10 +1978,10 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnOSXBundleNoTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnOSXBundleNoTargetBundleExtension()
 		kind "SharedLib"
 		sharedlibtype "OSXBundle"
-		targetextension ""
+		targetbundleextension ""
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
@@ -2002,10 +2002,10 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnOSXFrameworkTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnOSXFrameworkTargetBundleExtension()
 		kind "SharedLib"
 		sharedlibtype "OSXFramework"
-		targetextension ".xyz"
+		targetbundleextension ".xyz"
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[
@@ -2026,10 +2026,10 @@
 	end
 
 
-	function suite.XCBuildConfigurationTarget_OnOSXFrameworkNoTargetExtension()
+	function suite.XCBuildConfigurationTarget_OnOSXFrameworkNoTargetBundleExtension()
 		kind "SharedLib"
 		sharedlibtype "OSXFramework"
-		targetextension ""
+		targetbundleextension ""
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
 		test.capture [[

modules/xcode/xcode_common.lua

@@ -1255,7 +1255,7 @@
 			settings['EXECUTABLE_PREFIX'] = cfg.buildtarget.prefix
 		end
 
-		if cfg.buildtarget.extension then
+		if cfg.buildtarget.bundleextension then
 			local exts = {
 				WindowedApp  = "app",
 				SharedLib    = "dylib",
@@ -1264,7 +1264,7 @@
 				OSXFramework = "framework",
 				XCTest       = "xctest",
 			}
-			local ext = cfg.buildtarget.extension:sub(2)
+			local ext = iif(cfg.kind == "WindowedApp" or (cfg.kind == "SharedLib" and cfg.sharedlibtype), cfg.buildtarget.bundleextension:sub(2), cfg.buildtarget.extension:sub(2))
 			if ext ~= exts[iif(cfg.kind == "SharedLib" and cfg.sharedlibtype, cfg.sharedlibtype, cfg.kind)] then
 				if cfg.kind == "WindowedApp" or (cfg.kind == "SharedLib" and cfg.sharedlibtype) then
 					settings['WRAPPER_EXTENSION'] = ext

src/_premake_init.lua

@@ -1195,6 +1195,12 @@
 		kind = "boolean"
 	}
 
+	p.api.register {
+		name = "targetbundleextension",
+		scope = "config",
+		kind = "string"
+	}
+
 
 -----------------------------------------------------------------------------
 --
@@ -1402,22 +1408,22 @@
 	-- Add variations for other Posix-like systems.
 
 	filter { "system:darwin", "kind:WindowedApp" }
-		targetextension ".app"
+		targetbundleextension ".app"
 
 	filter { "system:darwin", "kind:SharedLib" }
 		targetextension ".dylib"
 
 	filter { "system:darwin", "kind:SharedLib", "sharedlibtype:OSXBundle" }
 		targetprefix ""
-		targetextension ".bundle"
+		targetbundleextension ".bundle"
 
 	filter { "system:darwin", "kind:SharedLib", "sharedlibtype:OSXFramework" }
 		targetprefix ""
-		targetextension ".framework"
+		targetbundleextension ".framework"
 
 	filter { "system:darwin", "kind:SharedLib", "sharedlibtype:XCTest" }
 		targetprefix ""
-		targetextension ".xctest"
+		targetbundleextension ".xctest"
 
 	-- Windows and friends.
 

src/base/config.lua

@@ -44,26 +44,28 @@
 		local prefix = cfg[field.."prefix"] or cfg.targetprefix or ""
 		local suffix = cfg[field.."suffix"] or cfg.targetsuffix or ""
 		local extension = cfg[field.."extension"] or cfg.targetextension or ""
+		local bundleextension = cfg[field.."bundleextension"] or cfg.targetbundleextension or ""
 
 		local bundlename = ""
 		local bundlepath = ""
 
 		if table.contains(os.getSystemTags(cfg.system), "darwin") and (kind == p.WINDOWEDAPP or (kind == p.SHAREDLIB and cfg.sharedlibtype)) then
-			bundlename = basename .. extension
+			bundlename = basename .. bundleextension
 			bundlepath = path.join(bundlename, iif(kind == p.SHAREDLIB and cfg.sharedlibtype == "OSXFramework", "Versions/A", "Contents/MacOS"))
 		end
 
 		local info = {}
-		info.directory  = directory
-		info.basename   = basename .. suffix
-		info.name       = prefix .. info.basename .. extension
-		info.extension  = extension
-		info.abspath    = path.join(directory, info.name)
-		info.fullpath   = info.abspath
-		info.bundlename = bundlename
-		info.bundlepath = path.join(directory, bundlepath)
-		info.prefix     = prefix
-		info.suffix     = suffix
+		info.directory       = directory
+		info.basename        = basename .. suffix
+		info.name            = prefix .. info.basename .. extension
+		info.extension       = extension
+		info.bundleextension = bundleextension
+		info.abspath         = path.join(directory, info.name)
+		info.fullpath        = info.abspath
+		info.bundlename      = bundlename
+		info.bundlepath      = path.join(directory, bundlepath)
+		info.prefix          = prefix
+		info.suffix          = suffix
 		return info
 	end
 

tests/config/test_targetinfo.lua

@@ -216,6 +216,7 @@
 		system "MacOSX"
 		i = prepare()
 		test.isequal("bin/Debug/MyProject.app/Contents/MacOS", path.getrelative(os.getcwd(), i.bundlepath))
+		test.isequal("", i.extension)
 	end
 
 
@@ -229,6 +230,7 @@
 		system "macosx"
 		i = prepare()
 		test.isequal("bin/Debug/MyProject.bundle/Contents/MacOS", path.getrelative(os.getcwd(), i.bundlepath))
+		test.isequal(".dylib", i.extension)
 	end
 
 --
@@ -241,6 +243,7 @@
 		system "macosx"
 		i = prepare()
 		test.isequal("bin/Debug/MyProject.xctest/Contents/MacOS", path.getrelative(os.getcwd(), i.bundlepath))
+		test.isequal(".dylib", i.extension)
 	end
 
 
@@ -254,6 +257,7 @@
 		system "macosx"
 		i = prepare()
 		test.isequal("bin/Debug/MyProject.framework/Versions/A", path.getrelative(os.getcwd(), i.bundlepath))
+		test.isequal(".dylib", i.extension)
 	end
 
 

website/docs/targetbundleextension.md

@@ -263,6 +263,7 @@ module.exports = {
 						'systemversion',
 						'tags',
 						'tailcalls',
+						'targetbundleextension',
 						'targetdir',
 						'targetextension',
 						'targetname',