Merge branch 'release-v5.0.0-alpha9' into release

# Conflicts:
#	modules/codelite
#	modules/xcode

.gitignore

@@ -8,7 +8,6 @@ syntax: glob
 
 build
 bin
-modules
 obj
 release
 ipch
@@ -19,6 +18,7 @@ src/scripts.c
 Makefile
 *.make
 *.xcodeproj
+*.xcworkspace
 *.swp
 *.sdf
 *.sln

Bootstrap.mak

@@ -1,37 +1,37 @@
-MSDEV=vs2012
-LUA_DIR=src/host/lua/src
+MSDEV	= vs2012
+LUA_DIR	= contrib/lua/src
 
-SRC= src/host/*.c 		\
-$(LUA_DIR)/lapi.c 		\
-$(LUA_DIR)/lcode.c		\
-$(LUA_DIR)/ldebug.c 	\
-$(LUA_DIR)/ldump.c		\
-$(LUA_DIR)/lgc.c		\
-$(LUA_DIR)/liolib.c 	\
-$(LUA_DIR)/lmathlib.c 	\
-$(LUA_DIR)/loadlib.c	\
-$(LUA_DIR)/lopcodes.c 	\
-$(LUA_DIR)/lparser.c	\
-$(LUA_DIR)/lstring.c	\
-$(LUA_DIR)/ltable.c 	\
-$(LUA_DIR)/ltm.c		\
-$(LUA_DIR)/lvm.c		\
-$(LUA_DIR)/lbaselib.c 	\
-$(LUA_DIR)/ldblib.c 	\
-$(LUA_DIR)/ldo.c		\
-$(LUA_DIR)/lfunc.c		\
-$(LUA_DIR)/linit.c		\
-$(LUA_DIR)/llex.c 		\
-$(LUA_DIR)/lmem.c 		\
-$(LUA_DIR)/lobject.c	\
-$(LUA_DIR)/loslib.c 	\
-$(LUA_DIR)/lstate.c 	\
-$(LUA_DIR)/lstrlib.c	\
-$(LUA_DIR)/ltablib.c	\
-$(LUA_DIR)/lundump.c	\
-$(LUA_DIR)/lzio.c
+SRC		= src/host/*.c			\
+		$(LUA_DIR)/lapi.c		\
+		$(LUA_DIR)/lcode.c		\
+		$(LUA_DIR)/ldebug.c		\
+		$(LUA_DIR)/ldump.c		\
+		$(LUA_DIR)/lgc.c		\
+		$(LUA_DIR)/liolib.c		\
+		$(LUA_DIR)/lmathlib.c	\
+		$(LUA_DIR)/loadlib.c	\
+		$(LUA_DIR)/lopcodes.c	\
+		$(LUA_DIR)/lparser.c	\
+		$(LUA_DIR)/lstring.c	\
+		$(LUA_DIR)/ltable.c		\
+		$(LUA_DIR)/ltm.c		\
+		$(LUA_DIR)/lvm.c		\
+		$(LUA_DIR)/lbaselib.c	\
+		$(LUA_DIR)/ldblib.c		\
+		$(LUA_DIR)/ldo.c		\
+		$(LUA_DIR)/lfunc.c		\
+		$(LUA_DIR)/linit.c		\
+		$(LUA_DIR)/llex.c		\
+		$(LUA_DIR)/lmem.c		\
+		$(LUA_DIR)/lobject.c	\
+		$(LUA_DIR)/loslib.c		\
+		$(LUA_DIR)/lstate.c		\
+		$(LUA_DIR)/lstrlib.c	\
+		$(LUA_DIR)/ltablib.c	\
+		$(LUA_DIR)/lundump.c	\
+		$(LUA_DIR)/lzio.c
 
-PLATFORM= none
+PLATFORM = none
 default: $(PLATFORM)
 
 none:

CHANGES.txt

@@ -5,6 +5,31 @@
 See https://github.com/premake/premake-core/wiki/What's-New-in-5.0
 for the complete list of changes from the Premake 4.x series.
 
+Since 5.0-alpha8:
+
+* New: `buildcustomizations()` imports custom .props files for VS
+* New: `frameworksdir()` for Xcode and Make OS X projects
+* New: `nuget()` to specify NuGet packages for VS projects
+* New: `systemversion()` to specify VS target platform
+* New: `io.readfile()` and `io.writefile()`
+* New: Configurations may now be filtered by toolset
+* New: HTTP calls now support authentication
+* New: Support for XSD files in VS C# projects
+* New: MASM file categorization for VS
+* New: Integrated test framework for Premake module developers
+* Fix: VS filter ordering is now deterministic
+* Fix: VS projects and groups may now have the same name
+* Fix: May now use '.' within shell variable tokens
+* Fix: path.translate() now defaults to target system separator
+* Fix: getextension() now handles multiple dots
+* Fix: replaceextension() no longer adds leading dot
+* Fix: Improved configuration baking performance
+* Fix: Use -O0 for Clang debug optimization level
+* Fix: CodeLite now uses portable path separators
+* Fix: Improved ability to find precompiled headers in Makefiles
+* Fix: Properly escape defines in Makefile projects
+* Fix: Correct casing of UTF8 marker on Visual Studio rule files
+
 Since 5.0-alpha7:
 
 * New API: characterset()

README.md

@@ -1,12 +1,12 @@
 # PREMAKE 5 (core) 
 * Linux: [![Build Status](https://travis-ci.org/premake/premake-core.svg?branch=master)](https://travis-ci.org/premake/premake-core)
-* Windows: [![Build Status](http://tomvandijck.org:8080/job/premake-core/badge/icon)](http://tomvandijck.org:8080/job/premake-core/)
+* Windows: [![Build Status](http://jenkins.tomvandijck.com/job/premake-core/badge/icon)](http://jenkins.tomvandijck.com/job/premake-core/)
 
 <img src="http://premake.github.io/premake-logo.png" width="200" height="200" />
 
 Premake is a command line utility which reads a scripted definition of a software project and, most commonly, uses it to generate project files for toolsets like Visual Studio, Xcode, or GNU Make. Built-in and Third-Party [Modules](https://github.com/premake/premake-core/wiki/Modules) add support for even more toolsets.
 
-Find out in detail [what Premake is](https://github.com/premake/premake-core/wiki/What_Is_Premake) and how to use it in the [wiki](https://github.com/premake/premake-core/wiki).
+Find out in detail [what Premake is](https://github.com/premake/premake-core/wiki/What-Is-Premake) and how to use it in the [wiki](https://github.com/premake/premake-core/wiki).
 
 ### Get started
 
@@ -26,7 +26,7 @@ Something not working quite as expected? Do you need a feature that has not been
 
 ### Contribute
 
-Awesome! If you would like to contribute with a new feature or submit a bugfix, fork this repo and send a pull request. Please, make sure all the [unit tests](https://github.com/premake/premake-core/wiki/Unit-Tests) are passing before submitting and add new ones in case you introduced new features.
+Awesome! View the [contribution guidelines](https://github.com/premake/premake-core/wiki/Contribution-Guidelines) before you contribute. If you would like to contribute with a new feature or submit a bugfix, fork this repo and send a pull request. Please, make sure all the unit tests are passing before submitting and add new ones in case you introduced new features.
 
 ### Copyright & License
 

contrib/curl/premake5.lua

@@ -1,52 +1,43 @@
-project 'curl-lib'
-	language    'C'
-	kind        'StaticLib'
-	includedirs { 'include', 'lib' }
-	defines     { 'BUILDING_LIBCURL', 'CURL_STATICLIB', 'HTTP_ONLY', 'CURL_DISABLE_LDAP' }
-	flags       { 'StaticRuntime' }
-	warnings    'off'
+project "curl-lib"
+	language    "C"
+	kind        "StaticLib"
+	includedirs { "include", "lib" }
+	defines     { "BUILDING_LIBCURL", "CURL_STATICLIB", "HTTP_ONLY", "CURL_DISABLE_LDAP" }
+	warnings    "off"
 
 	files
 	{
-		'**.h',
-		'**.c'
+		"**.h",
+		"**.c"
 	}
 
-	configuration { 'windows' }
-		defines { 'WIN32' }
-		defines { 'USE_SCHANNEL', 'USE_WINDOWS_SSPI' }
+	filter { "system:windows" }
+		defines { "WIN32" }
+		defines { "USE_SCHANNEL", "USE_WINDOWS_SSPI" }
 
-	configuration { 'linux' }
-		defines { 'CURL_HIDDEN_SYMBOLS' }
+	filter { "system:linux" }
+		defines { "CURL_HIDDEN_SYMBOLS" }
 
-		if os.findlib('ssl') then
-			defines { 'USE_OPENSSL', 'USE_SSLEAY' }
+		if os.findlib("ssl") then
+			defines { "USE_OPENSSL", "USE_SSLEAY" }
 
 			-- find the location of the ca bundle
 			local ca = nil
 			for _, f in ipairs {
-				'/etc/ssl/certs/ca-certificates.crt',
-				'/etc/pki/tls/certs/ca-bundle.crt',
-				'/usr/share/ssl/certs/ca-bundle.crt',
-				'/usr/local/share/certs/ca-root.crt',
-				'/etc/ssl/cert.pem' } do
+				"/etc/ssl/certs/ca-certificates.crt",
+				"/etc/pki/tls/certs/ca-bundle.crt",
+				"/usr/share/ssl/certs/ca-bundle.crt",
+				"/usr/local/share/certs/ca-root.crt",
+				"/etc/ssl/cert.pem" } do
 				if os.isfile(f) then
 					ca = f
 					break
 				end
 			end
 			if ca then
-				defines { 'CURL_CA_BUNDLE=\\"' .. ca .. '\\"' }
+				defines { 'CURL_CA_BUNDLE="' .. ca .. '"' }
 			end
 		end
 
-	configuration { 'macosx' }
-		defines { 'USE_DARWINSSL' }
-
-	configuration { 'Release' }
-		defines { 'NDEBUG' }
-		flags   { 'OptimizeSize' }
-
-	configuration { 'Debug' }
-		defines { '_DEBUG' }
-		flags   { 'Symbols' }
+	filter { "system:macosx" }
+		defines { "USE_DARWINSSL" }

contrib/libzip/premake5.lua

@@ -2,28 +2,20 @@ project "zip-lib"
 	language    "C"
 	kind        "StaticLib"
 	includedirs "include"
-	defines     {"N_FSEEKO", "_CRT_SECURE_NO_DEPRECATE"}
-	flags       { "StaticRuntime" }
+	defines     { "N_FSEEKO" }
+	warnings    "off"
 
 	files
 	{
 		"**.h",
 		"**.c"
 	}
 
-	configuration "linux"
-		defines {"HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H"}
+	filter "system:linux"
+		defines { "HAVE_SSIZE_T_LIBZIP", "HAVE_CONFIG_H" }
 
-	configuration "windows"
-		defines {"_WINDOWS"}
+	filter "system:windows"
+		defines { "_WINDOWS" }
 
-	configuration "macosx"
-		defines { 'HAVE_SSIZE_T_LIBZIP' }
-
-	configuration "Release"
-		defines {"NDEBUG"}
-		flags   { "OptimizeSize" }
-
-	configuration "Debug"
-		defines {"_DEBUG"}
-		flags   { "Symbols" }
+	filter "system:macosx"
+		defines { "HAVE_SSIZE_T_LIBZIP" }

contrib/lua/premake5.lua

@@ -0,0 +1,28 @@
+project "lua-lib"
+	language    "C"
+	kind        "StaticLib"
+	warnings    "off"
+
+	includedirs { "src" }
+
+	files
+	{
+		"**.h",
+		"**.c"
+	}
+
+	excludes
+	{
+		"src/lauxlib.c",
+		"src/lua.c",
+		"src/luac.c",
+		"src/print.c",
+		"**.lua",
+		"etc/*.c"
+	}
+
+	filter "system:linux or bsd or hurd or aix"
+		defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
+
+	filter "system:macosx"
+		defines     { "LUA_USE_MACOSX" }

contrib/zlib/premake5.lua

@@ -1,21 +1,14 @@
 project "zlib-lib"
 	language    "C"
 	kind        "StaticLib"
-	defines {"N_FSEEKO", "_CRT_SECURE_NO_DEPRECATE"}
-	flags   { "StaticRuntime" }
+	defines     { "N_FSEEKO" }
+	warnings    "off"
 
 	files
 	{
 		"**.h",
 		"**.c"
 	}
 
-	configuration "windows"
-		defines {"_WINDOWS"}
-
-	configuration "Release"
-		defines {"NDEBUG"}
-		flags   { "OptimizeSize" }
-
-	configuration "Debug"
-		defines {"_DEBUG"}		flags   { "Symbols" }
+	filter "system:windows"
+		defines { "_WINDOWS" }

modules/self-test/_manifest.lua

@@ -0,0 +1,7 @@
+return {
+	"self-test.lua",
+	"test_assertions.lua",
+	"test_declare.lua",
+	"test_helpers.lua",
+	"test_runner.lua"
+}