Merge branch 'master' into luasocket

README.md

@@ -1,6 +1,9 @@
 # PREMAKE 5 (core)
 <img src="https://github.com/premake/premake-core/wiki/linux-widget.jpeg" width="24" height="24"/> [![Build Status](https://travis-ci.org/premake/premake-core.svg?branch=master)](https://travis-ci.org/premake/premake-core)
  <img src="https://github.com/premake/premake-core/wiki/windows-widget.jpeg" width="24" height="24"/> [![Build status](https://ci.appveyor.com/api/projects/status/lc9g332y2lqvel8h?svg=true)](https://ci.appveyor.com/project/PremakeOrganization/premake-core)
+ [![Latest release](https://img.shields.io/github/release/premake/premake-core/all.svg)]()
+ [![Release date of last release](https://img.shields.io/github/release-date-pre/premake/premake-core.svg)]()
+ [![Commits since last release](https://img.shields.io/github/commits-since/premake/premake-core/v5.0.0-alpha12.svg)]()
 
 <img src="http://premake.github.io/premake-logo.png" width="200" height="200" />
 

modules/xcode/tests/test_xcode_project.lua

@@ -968,10 +968,6 @@
 		targetextension ".xyz"
 		prepare()
 		xcode.XCBuildConfiguration_Target(tr, tr.products.children[1], tr.configs[1])
-
-		--ms removed for now
-		--EXECUTABLE_EXTENSION = xyz;
-
 		test.capture [[
 		[libMyProject.xyz:Debug] /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -979,6 +975,7 @@
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CONFIGURATION_BUILD_DIR = bin/Debug;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_EXTENSION = xyz;
 				EXECUTABLE_PREFIX = lib;
 				GCC_DYNAMIC_NO_PIC = NO;
 				INSTALL_PATH = /usr/local/lib;

modules/xcode/xcode_common.lua

@@ -431,9 +431,10 @@
 
 				-- is this the product node, describing the output target?
 				if node.kind == "product" then
+					local name = iif(tr.project.kind ~= "ConsoleApp", node.name, node.cfg.buildtarget.prefix .. node.cfg.buildtarget.basename)
 					settings[node.id] = function(level)
 						_p(level,'%s /* %s */ = {isa = PBXFileReference; explicitFileType = %s; includeInIndex = 0; name = %s; path = %s; sourceTree = BUILT_PRODUCTS_DIR; };',
-							node.id, node.name, xcode.gettargettype(node), stringifySetting(node.name), stringifySetting(path.getname(node.cfg.buildtarget.bundlename ~= "" and node.cfg.buildtarget.bundlename or node.cfg.buildtarget.relpath)))
+							node.id, node.name, xcode.gettargettype(node), stringifySetting(name), stringifySetting(path.getname(node.cfg.buildtarget.bundlename ~= "" and node.cfg.buildtarget.bundlename or node.cfg.buildtarget.relpath)))
 					end
 				-- is this a project dependency?
 				elseif node.parent.parent == tr.projects then
@@ -892,11 +893,15 @@
 			settings['EXECUTABLE_PREFIX'] = cfg.buildtarget.prefix
 		end
 
-		--[[if cfg.targetextension then
+		if cfg.kind ~= "ConsoleApp" and cfg.targetextension then
 			local ext = cfg.targetextension
 			ext = iif(ext:startswith('.'), ext:sub(2), ext)
+			if cfg.kind == "WindowedApp" and ext ~= "app" then
+				settings['WRAPPER_EXTENSION'] = ext
+			elseif (cfg.kind == "StaticLib" and ext ~= "a") or (cfg.kind == "SharedLib" and ext ~= "dylib") then
 				settings['EXECUTABLE_EXTENSION'] = ext
-		end]]
+			end
+		end
 
 		local outdir = path.getrelative(tr.project.location, path.getdirectory(cfg.buildtarget.relpath))
 		if outdir ~= "." then

scripts/RELEASE.txt

@@ -9,6 +9,10 @@ PREP
 
  * Update CHANGES.txt (`git log release-branch-name ^release --merges`)
 
+ * Update README.md
+
+   * "Commits since last release" badge - once out of prerelease replace `v5.0.0-alphaXX` with `latest`
+
  * Update version in src/host/premake.h and commit
 
  * Push release branch to GitHub; wait for CI to pass

src/_premake_init.lua

@@ -1719,6 +1719,9 @@
 
 	-- Add variations for other Posix-like systems.
 
+	filter { "system:MacOSX", "kind:WindowedApp" }
+		targetextension ".app"
+
 	filter { "system:MacOSX", "kind:SharedLib" }
 		targetextension ".dylib"
 

src/base/api.lua

@@ -674,10 +674,23 @@
 -- individual test runs.
 ---
 
+	local numBuiltInGlobalBlocks
+
 	function api.reset()
+		if numBuiltInGlobalBlocks == nil then
+			numBuiltInGlobalBlocks = #api.scope.global.blocks
+		end
+
 		for containerClass in p.container.eachChildClass(p.global) do
 			api.scope.global[containerClass.pluralName] = {}
 		end
+
+		api.scope.current = api.scope.global
+
+		local currentGlobalBlockCount = #api.scope.global.blocks
+		for i = currentGlobalBlockCount, numBuiltInGlobalBlocks + 1, -1 do
+			table.remove(api.scope.global.blocks, i)
+		end
 	end
 
 

src/base/config.lua

@@ -49,7 +49,7 @@
 		local bundlepath = ""
 
 		if cfg.system == p.MACOSX and kind == p.WINDOWEDAPP then
-			bundlename = basename .. ".app"
+			bundlename = basename .. extension
 			bundlepath = path.join(bundlename, "Contents/MacOS")
 		end