Merge branch 'release-5.0.0-alpha7' into release

.gitignore

@@ -31,6 +31,9 @@ Makefile
 *.project
 *.tags
 *.sublime-*
+.cproject
+.settings
+.buildpath
 
 *.bbprojectsettings
 Scratchpad.txt

Bootstrap.mak

@@ -1,23 +1,23 @@
-LUA_DIR=src/host/lua-5.1.4/src
+LUA_DIR=src/host/lua/src
 
-SRC= src/host/*.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)/lgc.c		\
 $(LUA_DIR)/liolib.c 	\
-$(LUA_DIR)/lmathlib.c \
+$(LUA_DIR)/lmathlib.c 	\
 $(LUA_DIR)/loadlib.c	\
-$(LUA_DIR)/lopcodes.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)/ltm.c		\
+$(LUA_DIR)/lvm.c		\
+$(LUA_DIR)/lbaselib.c 	\
 $(LUA_DIR)/ldblib.c 	\
-$(LUA_DIR)/ldo.c			\
+$(LUA_DIR)/ldo.c		\
 $(LUA_DIR)/lfunc.c		\
 $(LUA_DIR)/linit.c		\
 $(LUA_DIR)/llex.c 		\
@@ -52,14 +52,14 @@ mingw: $(SRC)
 
 osx: $(SRC)
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" -framework CoreServices $?
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -framework CoreServices $?
 	./build/bootstrap/premake_bootstrap embed
 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
 	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN`
 
 linux: $(SRC)
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" $? -lm
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_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`

CHANGES.txt

@@ -5,6 +5,24 @@
 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-alpha6:
+
+* New API: additionalusingdirectories()
+* New API: largeaddressaware()
+* New: Embed bytecode to enable better debugging information
+* New: Display elapsed time at completion
+* New: Utility project support for Makefiles
+* New: Enabled SSL support in HTTP functions
+* Fix: Reduce memory usage during baking
+* Fix: Improve performance of wildcard processing
+* Fix: Preserve environment in recursive token expansion
+* Fix: Added missing defines in bootstrap script
+* Fix: Remove /usr/lib64 directories from Mac builds
+* Fix: Added newline after UTF-8 marker in Visual Studio projects
+* Fix: Duplicate escaping on include directories in Makefiles
+* Fix: os.isdir() now works with Windows symbolic links
+* Fix: Use correct path separators in C# response files
+
 Since 5.0-alpha5:
 
 * New API: ignoredefaultlibraries()

CONTRIBUTORS.txt

@@ -24,36 +24,33 @@ Patch contributors:
     * module loading fixes
     * bug fixes
   Gabi Davar <gabi.davar@discretix.com>
-    * Added file.directory to token environment
+    * added file.directory to token environment
   João Matos (joao@tritao.eu)
     * HTTP download support
     * C# / C++/CLI language support improvements and bugfixes
     * Visual Studio and Make improvements and bugfixes
-    * Response files support for Make backend
+    * response files support for Make backend
+    * numerous bug fixes and smaller features
   leeonix <real-like@yeah.net>
-    * Bug fixes
-  Lusito <core@roughael.net>
-    * path.join() fixes
-  João Matos (joao@tritao.eu)
-    * HTTP download support
-    * C# / C++/CLI language support improvements and bugfixes
-    * Visual Studio and Make improvements and bugfixes
-    * Response files support for Make backend
-  leeonix <real-like@yeah.net>
-    * Bug fixes
+    * bug fixes
   Lusito <core@roughael.net>
     * path.join() fixes
   Mark Chandler <https://bitbucket.org/mchandler_blizzard>
-    * Prevent self-linking
+    * prevent self-linking
+  Mark Sararu <mark.sararu@gmail.com>
+    * Makefile bug fixes
   Mihai Sebea <http://twitter.com/mihai_sebea>
     * Xcode exporter fixes and improvements
   M Skibbe
     * path.replaceextension()
   Renaud Guillard <https://bitbucket.org/noresources>
     * add library search paths argument to os.findlib()
     * return command exit code from os.outputof()
+    * bug fixes and smaller improvements
   rhuvendiek <rhuvendiek@schueco.com>
-    * VC 2010 IDL file support
+    * Visual C 2010 IDL file support
+  Sami Kankaristo <sami@indiumgames.fi>
+    * Utility project support for Makefiles
   tbasnoopy <tba-snoopy@gmx.de>
     * customtoolnamespace()
     * debuggertype()

contrib/curl/lib/curl_config.h

@@ -2,7 +2,7 @@
 /* lib/curl_config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Location of default ca bundle */
-#define CURL_CA_BUNDLE "/etc/pki/tls/certs/ca-bundle.crt"
+/* #undef CURL_CA_BUNDLE */
 
 /* Location of default ca path */
 /* #undef CURL_CA_PATH */

contrib/curl/premake5.lua

@@ -2,7 +2,7 @@ project "curl-lib"
 	language    "C"
 	kind        "StaticLib"
 	includedirs {"include", "lib"}
-	defines     {"BUILDING_LIBCURL", "CURL_STATICLIB", "CURL_HTTP_ONLY", "CURL_DISABLE_LDAP" }
+	defines     {"BUILDING_LIBCURL", "CURL_STATICLIB", "HTTP_ONLY", "CURL_DISABLE_LDAP" }
 	flags       { "StaticRuntime" }
 	location    "build"
 
@@ -14,12 +14,34 @@ project "curl-lib"
 
 	configuration { 'windows' }
 		defines {"WIN32"}
+		defines {"USE_SSL", "USE_SCHANNEL", "USE_WINDOWS_SSPI"}
 
 	configuration { 'linux' }
-		defines {"HAVE_CONFIG_H", "CURL_HIDDEN_SYMBOLS"}
+
+		defines {"HAVE_CONFIG_H", "CURL_HIDDEN_SYMBOLS" }
+		if os.findlib("ssl") then
+			defines { "USE_SSL", "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
+				if os.isfile(f) then
+					ca = f
+					break
+				end
+			end
+			if ca then
+				defines { 'CURL_CA_BUNDLE=\\"' .. ca .. '\\"' }
+			end
+		end
 
 	configuration { 'macosx' }
-		defines { 'HAVE_CONFIG_H' }	
+		defines { 'HAVE_CONFIG_H', 'USE_SSL', 'USE_DARWINSSL' }	
 
 	configuration "Release"
 		defines {"NDEBUG"}

premake4.lua

@@ -18,7 +18,7 @@
 		language    "C"
 		kind        "ConsoleApp"
 		flags       { "No64BitChecks", "ExtraWarnings", "StaticRuntime" }
-		includedirs { "src/host/lua-5.1.4/src" }
+		includedirs { "src/host/lua/src" }
 
 		files
 		{
@@ -29,12 +29,12 @@
 
 		excludes
 		{
-			"src/host/lua-5.1.4/src/lauxlib.c",
-			"src/host/lua-5.1.4/src/lua.c",
-			"src/host/lua-5.1.4/src/luac.c",
-			"src/host/lua-5.1.4/src/print.c",
-			"src/host/lua-5.1.4/**.lua",
-			"src/host/lua-5.1.4/etc/*.c"
+			"src/host/lua/src/lauxlib.c",
+			"src/host/lua/src/lua.c",
+			"src/host/lua/src/luac.c",
+			"src/host/lua/src/print.c",
+			"src/host/lua/**.lua",
+			"src/host/lua/etc/*.c"
 		}
 
 		configuration "Debug"

premake5.lua

@@ -73,7 +73,10 @@
 		description = "Disable Zlib/Zip 3rd party lib"
 	}
 
-
+	newoption {
+		trigger     = "no-bytecode",
+		description = "Don't embed bytecode, but instead use the stripped souce code."
+	}
 
 --
 -- Define the project. Put the release configuration first so it will be the
@@ -87,12 +90,16 @@
 		configurations { "Release", "Debug" }
 		location ( _OPTIONS["to"] )
 
+		configuration { "macosx", "gmake" }
+			buildoptions { "-mmacosx-version-min=10.4" }
+			linkoptions  { "-mmacosx-version-min=10.4" }
+
 	project "Premake5"
 		targetname  "premake5"
 		language    "C"
 		kind        "ConsoleApp"
 		flags       { "No64BitChecks", "ExtraWarnings", "StaticRuntime" }
-		includedirs { "src/host/lua-5.1.4/src" }
+		includedirs { "src/host/lua/src" }
 
 		-- optional 3rd party libraries
 		if not _OPTIONS["no-zlib"] then
@@ -115,12 +122,12 @@
 
 		excludes
 		{
-			"src/host/lua-5.1.4/src/lauxlib.c",
-			"src/host/lua-5.1.4/src/lua.c",
-			"src/host/lua-5.1.4/src/luac.c",
-			"src/host/lua-5.1.4/src/print.c",
-			"src/host/lua-5.1.4/**.lua",
-			"src/host/lua-5.1.4/etc/*.c"
+			"src/host/lua/src/lauxlib.c",
+			"src/host/lua/src/lua.c",
+			"src/host/lua/src/luac.c",
+			"src/host/lua/src/print.c",
+			"src/host/lua/**.lua",
+			"src/host/lua/etc/*.c"
 		}
 
 		configuration "Debug"
@@ -152,14 +159,20 @@
 		configuration "linux or hurd"
 			links       { "dl", "rt" }
 
+		configuration "linux"
+			if not _OPTIONS["no-curl"] and os.findlib("ssl") then
+				links       { "ssl", "crypto" }
+			end
+
 		configuration "macosx"
 			defines     { "LUA_USE_MACOSX" }
 			links       { "CoreServices.framework" }
+			if not _OPTIONS["no-curl"] then
+				links   { "Security.framework" }
+			end
 
 		configuration { "macosx", "gmake" }
 			toolset "clang"
-			buildoptions { "-mmacosx-version-min=10.4" }
-			linkoptions  { "-mmacosx-version-min=10.4" }
 
 		configuration { "solaris" }
 			linkoptions { "-Wl,--export-dynamic" }
@@ -168,6 +181,7 @@
 			defines     { "LUA_USE_POSIX", "LUA_USE_DLOPEN" }
 			links       { "m" }
 
+
 	-- optional 3rd party libraries
 	group "contrib"
 		if not _OPTIONS["no-zlib"] then

scripts/RELEASE.txt

@@ -3,6 +3,8 @@ PREMAKE RELEASE CHECKLIST
 
 PREP
 
+ * Make sure submodules are up to date
+
  * Create working branch for release prep
 
  * Update CHANGES.txt and CONTRIBUTORS.txt
@@ -19,7 +21,7 @@ RELEASE
 
  * On each platform, run `premake5 package <release branch name> binary`
 
- * Merge working branch to release and tag
+ * Merge working branch to release and tag; push with tags
 
  * Create new release on GitHub from CHANGES.txt; upload files
 
@@ -29,9 +31,6 @@ RELEASE
 
  * Post annoucement to @industrious on Twitter
 
- * Add release to Freshmeat
-   http://freshmeat.net/projects/premake
-
 
 CYCLE