Merge branch 'release-5.0-alpha12' into release

.gitignore

@@ -26,6 +26,8 @@ Makefile
 *.ncb
 *.vcproj*
 *.vcxproj*
+*.VC.opendb
+*.VC.db
 *.opensdf
 *.workspace
 *.project

.travis.yml

@@ -4,5 +4,6 @@ os:
 
 script:
  - make -f Bootstrap.mak $TRAVIS_OS_NAME
+ - make -C build/bootstrap -j config=debug
  - bin/release/premake5 test
 

Bootstrap.mak

@@ -1,37 +1,42 @@
-MSDEV	= vs2012
-LUA_DIR	= contrib/lua/src
+MSDEV       = vs2012
+LUA_DIR     = contrib/lua/src
+LUASHIM_DIR = contrib/luashim
 
 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)/lbitlib.c	\
+		$(LUA_DIR)/lcode.c		\
+		$(LUA_DIR)/lcorolib.c	\
+		$(LUA_DIR)/lctype.c		\
 		$(LUA_DIR)/ldblib.c		\
+		$(LUA_DIR)/ldebug.c		\
 		$(LUA_DIR)/ldo.c		\
+		$(LUA_DIR)/ldump.c		\
 		$(LUA_DIR)/lfunc.c		\
+		$(LUA_DIR)/lgc.c		\
 		$(LUA_DIR)/linit.c		\
+		$(LUA_DIR)/liolib.c		\
 		$(LUA_DIR)/llex.c		\
+		$(LUA_DIR)/lmathlib.c	\
 		$(LUA_DIR)/lmem.c		\
+		$(LUA_DIR)/loadlib.c	\
 		$(LUA_DIR)/lobject.c	\
+		$(LUA_DIR)/lopcodes.c	\
 		$(LUA_DIR)/loslib.c		\
+		$(LUA_DIR)/lparser.c	\
 		$(LUA_DIR)/lstate.c		\
+		$(LUA_DIR)/lstring.c	\
 		$(LUA_DIR)/lstrlib.c	\
+		$(LUA_DIR)/ltable.c		\
 		$(LUA_DIR)/ltablib.c	\
+		$(LUA_DIR)/ltm.c		\
 		$(LUA_DIR)/lundump.c	\
-		$(LUA_DIR)/lzio.c
+		$(LUA_DIR)/lutf8lib.c	\
+		$(LUA_DIR)/lvm.c		\
+		$(LUA_DIR)/lzio.c		\
 
-PLATFORM = none
+PLATFORM= none
 default: $(PLATFORM)
 
 none:
@@ -42,33 +47,60 @@ none:
 	@echo "or"
 	@echo "   make -f Bootstrap.mak HOST_PLATFORM"
 	@echo "where HOST_PLATFORM is one of these:"
-	@echo "   osx linux"
+	@echo "   osx linux bsd"
 
 mingw: $(SRC)
+	$(SILENT) rm -rf ./bin
+	$(SILENT) rm -rf ./build
+	$(SILENT) rm -rf ./obj
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" $? -lole32
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lole32
 	./build/bootstrap/premake_bootstrap embed
 	./build/bootstrap/premake_bootstrap --os=windows --to=build/bootstrap gmake
 	$(MAKE) -C build/bootstrap
 
 osx: $(SRC)
+	$(SILENT) rm -rf ./bin
+	$(SILENT) rm -rf ./build
+	$(SILENT) rm -rf ./obj
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -framework CoreServices $?
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $?
 	./build/bootstrap/premake_bootstrap embed
 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
 	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
 
 linux: $(SRC)
+	$(SILENT) rm -rf ./bin
+	$(SILENT) rm -rf ./build
+	$(SILENT) rm -rf ./obj
+	mkdir -p build/bootstrap
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm -ldl -lrt
+	./build/bootstrap/premake_bootstrap embed
+	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
+	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
+
+bsd: $(SRC)
+	$(SILENT) rm -rf ./bin
+	$(SILENT) rm -rf ./build
+	$(SILENT) rm -rf ./obj
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" $? -lm -ldl -lrt
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
 	./build/bootstrap/premake_bootstrap embed
 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
 	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
 
-windows: $(SRC)
+windows-base: $(SRC)
+	$(SILENT) if exist .\bin rmdir /s /q .\bin
+	$(SILENT) if exist .\build rmdir /s /q .\build
+	$(SILENT) if exist .\obj rmdir /s /q .\obj
 	if not exist build\bootstrap (mkdir build\bootstrap)
-	cl /Fo.\build\bootstrap\ /Fe.\build\bootstrap\premake_bootstrap.exe /DPREMAKE_NO_BUILTIN_SCRIPTS /I"$(LUA_DIR)" user32.lib ole32.lib $**
+	cl /Fo.\build\bootstrap\ /Fe.\build\bootstrap\premake_bootstrap.exe /DPREMAKE_NO_BUILTIN_SCRIPTS /I"$(LUA_DIR)" /I"$(LUASHIM_DIR)" user32.lib ole32.lib advapi32.lib $**
 	.\build\bootstrap\premake_bootstrap.exe embed
 	.\build\bootstrap\premake_bootstrap --to=build/bootstrap $(MSDEV)
+
+windows: windows-base
 	devenv .\build\bootstrap\Premake5.sln /Upgrade
 	devenv .\build\bootstrap\Premake5.sln /Build Release
+
+windows-msbuild: windows-base
+	msbuild /p:Configuration=Release /p:Platform=Win32 .\build\bootstrap\Premake5.sln

CHANGES.txt

@@ -5,6 +5,131 @@
 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-alpha11:
+
+* PR #617 fix switch/separator in rules_xml (@Blizzard)
+* PR #639 Add MSBuild target to Bootstrap.mak (@nta)
+* PR #644 Don't treat "dependson" libraries as "links" libraries in Xcode (@macsforme)
+* PR #659 Add C11 flag support for GCC (@resetnow)
+* PR #668 Fix sporadic failures when using make -j# (@UmbraSoftware)
+* PR #672 Fix issue with msc.getlinks and vstudio.getLinks returning different results when 'explicit' is true. (@Blizzard)
+* PR #673 Add additional tokens to fileconfig and vs2010+. (@Blizzard)
+* PR #675 update semver.lua (@Blizzard)
+* PR #678 Escape string literals passed to defines() for Xcode (@macsforme)
+* PR #679 Better detect debug build (@TurkeyMan)
+* PR #685 Detect native source files. (@TurkeyMan)
+* PR #686 Refactor language flags to go through the language API. (@Blizzard)
+* PR #687 Windows Registry (@tvandijck)
+* PR #690 make buffered_io available for c code too. (@Blizzard)
+* PR #707 Fix missing CA certs on Windows (@Jusonex)
+* PR #718 Adding support for NotSet characterset in VS2010+ (#79) (@Blizzard)
+* PR #721 Fix CodeLite linking issues (@Blizzard)
+* PR #728 Add support of UTF-8 for Windows (@DrLynix)
+* PR #732 Fix VS2013 and older always rebuilding when debug symbols explicitly … (@jstewart)
+* PR #733 Generated project files are now correctly located beside script (@LORgames)
+* PR #734 NuGet fixes (@aleksijuvani)
+* PR #735 Fixed issue with Clang not actually supporting floatingpoint 'strict' (@LORgames)
+* PR #736 Fixed issue where VS2010+ projects didn't support floatingpoint 'Default' (@LORgames)
+* PR #737 Add string.escapepattern function (@aleksijuvani)
+* PR #738 Update curl to 7.53.1 (@aleksijuvani)
+* PR #739 Refactor _OS, os.get() & os.is() (@Blizzard)
+* PR #740 Properly deprecate WinMain flag (@LORgames)
+* PR #742 Added BSD support (@LORgames)
+* PR #743 Clean up the deprecated APIs (@industriousone)
+* PR #745 Fixed issue with using startproject API in CodeLite (@LORgames)
+* PR #746 Fixed erroneous escape usages in VS2010+ (@LORgames)
+* PR #747 Bootstrap makefile now cleans up previous builds before building (@LORgames)
+* PR #748 os.translateCommands now supports multiple tokens (@LORgames)
+* PR #749 Updated packaging script (@LORgames)
+* PR #751 CompileAs element handles C++ now (@LORgames)
+* PR #752 Fixed various issues with compiling with VS2012 (@LORgames)
+* PR #753 Added proxy URL to http options (@LORgames)
+* PR #754 Fixed issue with the OBJDIR value not being escaped (@LORgames)
+* PR #755 Add 'supports_language' callback to action (@Blizzard)
+* PR #756 Fix a call to deprecated os.get() (@Blizzard)
+* PR #757 Increased consistency of p. usage (@LORgames)
+* PR #758 Cleaned up inconsistencies in whitespace (@LORgames)
+* PR #760 Adding ARM support for Visual Studio. (@Blizzard)
+* PR #761 Removed echo off in VS rules prop generator (@LORgames)
+* PR #763 [core] Print warnings in purple (@Blizzard)
+* PR #764 [core] get file/line information on deprecated API's. (@Blizzard)
+* PR #768 [core] Fix Visual Studio ExecutablePath settings. (@Blizzard)
+* PR #769 [core] new cmd path decorations with %[] syntax (@Blizzard)
+* PR #771 [core] Use 'compileAs' API (@Blizzard)
+* PR #772 [core] Don't set default entrypoint, rely on visual studio default. (@Blizzard)
+* PR #774 Assure a default toolset is always set. (@Blizzard)
+* PR #776 [core] Use 'cdialect' and 'cppdialect' instead of 'language'. (@Blizzard)
+* PR #778 Added support at the file level for the NoPCH flag in VS200x projects (@LORgames)
+* PR #779 add os.findheader() (@noresources)
+* PR #781 Allow filters to be written as tables: (@Blizzard)
+* PR #785 Unicode file functions for Windows (@DrLynix)
+* PR #786 Fix typo in embed.lua (@DrLynix)
+* PR #787 os.comparefiles function (@DrLynix)
+* PR #788 Provide a way to 'tag' systems, and filter on those tags. (@Blizzard)
+* PR #789 Add 'tags' filter api. (@Blizzard)
+* PR #790 [self-test] fix nil dereference crash in test.isequal (@Blizzard)
+* PR #798 create object directory before generating precompiled header (@noresources)
+* PR #801 Groups in XCode workspace working. (@ricka)
+* PR #802 Suppress mkdir warning on Windows if the folder already exists (@aleksijuvani)
+* PR #803 Gmake2 module (@Blizzard)
+* PR #804 Update to Lua 5.3.4 (@Blizzard)
+* PR #805 Add --insecure option for SSL curl requests. (@Blizzard)
+* PR #806 Add premake.isSemVer function (@Blizzard)
+* PR #807 Added visual studio support for dot net .tt files (@Blizzard)
+* PR #808 Added per file rtti generation for Visual Studio (@Blizzard)
+* PR #809 Added os touchfile and a workaround for vs2010 reloading (@Blizzard)
+* PR #810 Added masm handling of seh exception handling for VS2010 and above (@Blizzard)
+* PR #811 Add 'preferredtoolarchitecture' API (@Blizzard)
+* PR #812 Add support for cppdialect in VS2015 & VS2017 actions. (@Blizzard)
+* PR #813 Add json.encode_pretty wrapper. (@Blizzard)
+* PR #814 Add premake.info message function. (@Blizzard)
+* PR #815 Errors in red. (@Blizzard)
+* PR #816 Fixed C++17 flag to work with current versions of Clang. (@Blizzard)
+* PR #817 A few gmake2 fixes due to it moving into a module. (@premake)
+* PR #818 Make module of 'gmake' action. (@Blizzard)
+* PR #821 Attempt at colors on linux (@Blizzard)
+* PR #822 Move VStudio action into a module. (@Blizzard)
+* PR #824 Set default toolsets for vs2005 and vs2008. (@Blizzard)
+* PR #825 Use workspace everywhere (@Blizzard)
+* PR #826 Escape '&' -> '&' (@Mikhael)
+* PR #827 Added option to create bundle and frameworks on macOS. (@Blizzard)
+* PR #828 Normalize path in 'getfileinfo' for local host. (@Blizzard)
+* PR #829 Reduced vs2010+ file sizes by removing redundant config settings (@Blizzard)
+* PR #830 Resource generator access (@Blizzard)
+* PR #831 Fix in oven, for options that are not strings. (@Blizzard)
+* PR #832 Fix a few compiler warnings (@Blizzard)
+* PR #833 Fix empty rules. (@Blizzard)
+* PR #834 Allow modules to register C code too. (@Blizzard)
+* PR #836 Hook setTextColor in tests, so on linux/mac we don't get random color… (@Blizzard)
+* PR #837 Removed "installer" kinds from vs2017. (@premake)
+* PR #838 Fix bug in 'action.isConfigurable' not checking for onWorkspace. (@Blizzard)
+* PR #839 Expand {...} macros in pre|post build commands for codelite (@Mikhael)
+* PR #840 Proof of concept for binary modules. (@tvandijck)
+* PR #842 Add bsd to the output of possible platforms (@ejb1123)
+* PR #843 fix bug in testing framework leaving tests in random working folders. (@tvandijck)
+* PR #844 fix unreferenced argument warning. (@tvandijck)
+* PR #849 Write out build log element for VS utility projects (@mendsley)
+* PR #851 Fix handling of unconventional NuGet .NET Framework folders (@aleksijuvani)
+* PR #854 [core] Add High as a new warning level (@Blizzard)
+* PR #855 Add filter for <Image> files (#135) (@Blizzard)
+* PR #856 Fix path_getrelative for Windows (@Blizzard)
+* PR #857 Fix action override targetos (@Blizzard)
+* PR #858 Fix Nuget package handling to support Unix-style paths (@tritao)
+* PR #859 Use NuGet package cache instead of the API if possible (@aleksijuvani)
+* PR #860 fix for build failure on macOS in debug. (@Blizzard)
+* PR #861 Allow embedding of binary resources. (@Blizzard)
+* PR #862 small optimization in oven. (@Blizzard)
+* PR #863 fix for duplicate 'allowed'. (@Blizzard)
+* PR #864 move tags into globally accessible table, so we don't have to overload… (@Blizzard)
+* PR #865 Remove "test.print" calls. (@Blizzard)
+* PR #866 fix os.istarget and os.ishost to use the systemTags table as well. (@Blizzard)
+* PR #867 Fix path translate (@Blizzard)
+* PR #868 Filters always have to use \ regardless of target platform. (@Blizzard)
+* PR #870 Fix prj.system bug in oven. (@Blizzard)
+* PR #872 Rework binmodule example to silence unit test console output (@starkos)
+* PR #874 Disable failing `os.findheader()` unit test on macOS (@starkos)
+
+
 Since 5.0-alpha10:
 
 * PR 523 New API symbols() replaces and extends "Symbols" flag
@@ -34,7 +159,7 @@ Since 5.0-alpha10:
 * PR 613 Fix os.match() detection of dot files
 * PR 607 Remove support for deprecated MonoDevelop project formats
 * PR 600 Fix VS support for symbolpath()
-* PR 512 Make Clang default toolset for macOS
+* PR 521 Make Clang default toolset for macOS
 * PR 624 GCC support for C90 and C99
 * PR 628 New API linkbuildoutputs() disables automatic linking of *.obj files
 * PR 635 Improved parallelization of Makefile builds

CONTRIBUTORS.txt

@@ -1,3 +1,12 @@
+As the number of Premake contributors has grown, this list has become more
+difficult to manage in a meaningful way. I'm leaving it here as part of the
+historical records. If you find yourself in need of a list of contributors,
+consider running:
+
+     git shortlog -sn
+
+--------------------------------------------------------------------------
+
 This file contains a list of people who've made non-trivial contributions
 to Premake 5.  People who commit code to the project are encouraged to
 add their names here. And many thanks to those who contributed fixes and

binmodules/example/main.c

@@ -0,0 +1,28 @@
+#include <luashim.h>
+
+
+static int example_test(lua_State* L)
+{
+	lua_pushstring(L, "hello ");
+	lua_pushvalue(L, 1);
+	lua_concat(L, 2);
+	return 1;
+}
+
+
+static const luaL_Reg example_functions[] = {
+	{ "test",  example_test },
+	{ NULL, NULL }
+};
+
+
+#ifdef _WIN32
+__declspec(dllexport) int luaopen_example(lua_State *L)
+#else
+int luaopen_example(lua_State *L)
+#endif
+{
+	shimInitialize(L);
+	luaL_register(L, "example", example_functions);
+	return 0;
+}

binmodules/example/premake5.lua

@@ -0,0 +1,28 @@
+project "example"
+	language     "C"
+	kind         "SharedLib"
+	warnings     "extra"
+
+	includedirs { 
+		"../../contrib/lua/src",
+		"../../contrib/luashim"
+	}
+
+	links { 'luashim-lib' }
+
+	files
+	{
+		"*.c",
+		"*.lua"
+	}
+
+	filter "system:not windows"
+		targetprefix    ""
+		targetextension ".so"
+		pic             "on"
+
+	filter "configurations:Release"
+		targetdir "../../bin/release"
+
+	filter "configurations:Debug"
+		targetdir "../../bin/debug"

contrib/curl/include/README

@@ -37,7 +37,7 @@ The following notes apply to libcurl version 7.19.0 and later.
   also distribute along with it the generated curl/curlbuild.h which has been
   used to compile it. Otherwise the library will be of no use for the users of
   the library that you have built. It is _your_ responsibility to provide this
-  file. No one at the cURL project can know how you have built the library.
+  file. No one at the curl project can know how you have built the library.
 
 * File curl/curlbuild.h includes platform and configuration dependent info,
   and must not be modified by anyone. Configure script generates it for you.