Merge remote-tracking branch 'origin/release-5.0-alpha13' into release

Author: Thomas Desveaux

.editorconfig

@@ -6,4 +6,3 @@ indent_size = 4
 tab_width = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
-charset = utf-8

.travis.yml

@@ -1,9 +1,30 @@
-os:
-  - linux
-  - osx
+language: c++
+dist: trusty
+sudo: false
+matrix:
+  include:
+  # Linux Debug
+    - os: linux
+      compiler: gcc
+      env:
+        - CONFIGURATION=debug
+  # Linux Release
+    - os: linux
+      compiler: gcc
+      env:
+        - CONFIGURATION=release
+  # macOS Debug x86
+    - os: osx
+      osx_image: xcode9
+      env:
+        - CONFIGURATION=debug
+  # macOS Release x86
+    - os: osx
+      osx_image: xcode9
+      env:
+        - CONFIGURATION=release
 
 script:
- - make -f Bootstrap.mak $TRAVIS_OS_NAME
- - make -C build/bootstrap -j config=debug
- - bin/release/premake5 test
+ - make -f Bootstrap.mak $TRAVIS_OS_NAME CONFIG=${CONFIGURATION}
+ - bin/${CONFIGURATION}/premake5 test
 

BUILD.txt

@@ -29,8 +29,6 @@ BUILDING FROM THE REPOSITORY
  If you have pulled sources from the Premake source repository, you can
  use `Bootstrap.mak` to generate your first premake executable:
 
-    $ git submodule init
-    $ git submodule update
     $ make -f Bootstrap.mak PLATFORM
 
  Where PLATFORM can be osx or linux.

Bootstrap.mak

@@ -1,4 +1,6 @@
 MSDEV       = vs2012
+CONFIG      = release
+PLATFORM    = x86
 LUA_DIR     = contrib/lua/src
 LUASHIM_DIR = contrib/luashim
 
@@ -36,8 +38,8 @@ SRC		= src/host/*.c			\
 		$(LUA_DIR)/lvm.c		\
 		$(LUA_DIR)/lzio.c		\
 
-PLATFORM= none
-default: $(PLATFORM)
+HOST_PLATFORM= none
+default: $(HOST_PLATFORM)
 
 none:
 	@echo "Please do"
@@ -57,7 +59,7 @@ mingw: $(SRC)
 	$(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
+	$(MAKE) -C build/bootstrap config=$(CONFIG)_$(PLATFORM)
 
 osx: $(SRC)
 	$(SILENT) rm -rf ./bin
@@ -67,7 +69,7 @@ osx: $(SRC)
 	$(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`
+	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
 
 linux: $(SRC)
 	$(SILENT) rm -rf ./bin
@@ -77,7 +79,7 @@ linux: $(SRC)
 	$(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`
+	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
 
 bsd: $(SRC)
 	$(SILENT) rm -rf ./bin
@@ -87,7 +89,17 @@ bsd: $(SRC)
 	$(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`
+	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
+
+solaris: $(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
+	./build/bootstrap/premake_bootstrap embed
+	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
+	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
 
 windows-base: $(SRC)
 	$(SILENT) if exist .\bin rmdir /s /q .\bin
@@ -100,7 +112,7 @@ windows-base: $(SRC)
 
 windows: windows-base
 	devenv .\build\bootstrap\Premake5.sln /Upgrade
-	devenv .\build\bootstrap\Premake5.sln /Build Release
+	devenv .\build\bootstrap\Premake5.sln /Build "$(CONFIG)|$(PLATFORM:x86=win32)"
 
 windows-msbuild: windows-base
-	msbuild /p:Configuration=Release /p:Platform=Win32 .\build\bootstrap\Premake5.sln
+	msbuild /p:Configuration=$(CONFIG) /p:Platform=$(PLATFORM:x86=win32) .\build\bootstrap\Premake5.sln

CHANGES.txt

@@ -5,6 +5,118 @@
 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-alpha12:
+
+* PR #880 Allow tokens to start with a ! to disable making paths relative. (@Blizzard)
+* PR #882 Allow filtering on host. (@Blizzard)
+* PR #883 Added basic iOS support to XCode4 (@LORgames)
+* PR #889 Fix context.mergeFilters (@tdesveaux)
+* PR #897 Fix c(pp)dialect generating uppercase C(++)xx for Xcode, replace gnu99 with compiler-default (@hsandt)
+* PR #902 VS fix for projects with multiple manifest files (@Blizzard)
+* PR #913 Fix subtle bug in table.translate (@Blizzard)
+* PR #919 Add perfile flags test for gmake backend. (@Blizzard)
+* PR #920 small fix in self-test module. (@Blizzard)
+* PR #921 Compiler warnings (@Blizzard)
+* PR #922 gmake2 bug fix.  When generating gmake file with pch headers (@Blizzard)
+* PR #923 Add Visual Studio ARM64 support.  (@Blizzard)
+* PR #926 Fixes translateCommandsAndPaths, and debugargs. (@Blizzard)
+* PR #927 bug fix for recursive token expansion (@Blizzard)
+* PR #928 sometimes due to ordering of test, we're in a rule scope. (@Blizzard)
+* PR #931 Added synchronous and C-Throw to VS projects. (@CreativeAssembly)
+* PR #932 Added extra information for Windows platform when copyfile fails. (@pjohalloran)
+* PR #938 Added `staticruntime` API. (#163) (@premake)
+* PR #939 Resolve the rule properties for gmake (#162) (@premake)
+* PR #941 Fix makefile PCH tab problem (@premake)
+* PR #944 C++0x dialect support (@premake)
+* PR #945 Natvis files have an item group. (@premake)
+* PR #948 Fixed a bug in gmake2 with clang and pch. (@Gereld)
+* PR #949 Added DPI awareness support to VS2010+ projects (@LORgames)
+* PR #950 Added defaultplatform support to gmake and gmake2 actions (@LORgames)
+* PR #952 Add support for `targetextension` in xcode4 (@tempura-sukiyaki)
+* PR #957 fix gmake2 utility  (@Blizzard)
+* PR #958 fix context.addFilter (@Blizzard)
+* PR #959 Multiple gmake2 fixes (@Blizzard)
+* PR #960 Improve determinism in sln output. (@Blizzard)
+* PR #961 add 64-bit support on windows (@Blizzard)
+* PR #962 fix table.insertkeyed (@Blizzard)
+* PR #964 Add support for wildcards in mapconfig. (@Blizzard)
+* PR #965 Move part of the workspace baking up (@premake)
+* PR #966 utility projects also allow configuration of the executable path. (@Blizzard)
+* PR #967 return generated fileconfig. (@Blizzard)
+* PR #969 Fix buildoutput pathvars (@Blizzard)
+* PR #970 Table fix indexof (@Blizzard)
+* PR #979 Define _HAS_EXCEPTIONS=0 from vs2010 for exceptionhandling off (@tdesveauxPKFX)
+* PR #980 src/base and modules: change links to industriousone.com to working HTTPS github links (@catb0t)
+* PR #988 Fixed a bug with normalizing paths that contain dot folders (@LORgames)
+* PR #990 Extended Instructions sets (@tdesveauxPKFX)
+* PR #993 Fix /usr/lib64 being used as search dir before project's libdir (@alexandre-janniaux)
+* PR #994 added a 'latest' systemversion for vs2017 (@dcourtois)
+* PR #1005 Fix gmake dependencies (@premake)
+* PR #1011 Fixes an issue with custom rules tracking files. (@Dandielo)
+* PR #1018 Added release info badges to the readme (@LORgames)
+* PR #1019 Remove git submodule commands (@Passw)
+* PR #1020 Embed luasocket, add mobdebug and --debugger command line option (@redorav)
+* PR #1021 Clear additional global state between unit test runs (@starkos)
+* PR #1023 Include library directories in Codelite projects (@Gaztin)
+* PR #1029 Replace last global state block in api.reset (@starkos)
+* PR #1030 Fix vstudio symbolspath (@tdesveauxPKFX)
+* PR #1031 Fix gmake2 Makefile projects callArray (@tdesveauxPKFX)
+* PR #1033 vstudio staticlib symbolspath (@tdesveauxPKFX)
+* PR #1034 Add 'modules/android/' from premake-android (@LORgames)
+* PR #1037 HLSL Shader compilation in Visual Studio (@tdesveauxPKFX)
+* PR #1040 Get 'compileas' working when using a 'filter "files: ..."' scope. (@ratzlaff)
+* PR #1041 Fleshed out CI builds (@LORgames)
+* PR #1042 Add UnsignedChar API (@tdesveauxPKFX)
+* PR #1043 Add omitframepointer API (@tdesveauxPKFX)
+* PR #1044 Add Visibility API for gcc/clang toolsets (@tdesveauxPKFX)
+* PR #1045 Add debuggerflavor API (@tdesveauxPKFX)
+* PR #1046 Add structmemberalign API (@tdesveauxPKFX)
+* PR #1048 Add conditional behavior to global variables, add systemversion as first implementation (@redorav)
+* PR #1049 Add InlinesVisibility API (@tdesveauxPKFX)
+* PR #1053 Fixed issue with floatingpoint "Strict" causing errors in XCode (@LORgames)
+* PR #1062 Allow system("android") per configuration (@redorav)
+* PR #1064 Tiny gcc fix from PR #506. (@tvandijck)
+* PR #1065 Fixes a few luasocket compile warnings. (@tvandijck)
+* PR #1066 fix a few compiler warnings. (@tvandijck)
+* PR #1068 Fix constructing executable path from argv[0] (@lanurmi)
+* PR #1069 Support successfully bootstrapping on Solaris (OpenIndiana). (@lanurmi)
+* PR #1070 Support successfully bootstrapping on OpenBSD. (@lanurmi)
+* PR #1075 Fixed bug with alias tests that caused one to three extra tests to be run (@LORgames)
+* PR #1077 Do not output colors e.g. into a pipe, unless forced. (@lanurmi)
+* PR #1078 Added GoogleTest style output for unit tests (@LORgames)
+* PR #1080 Fix curl compilation on Debian PowerPC. (@lanurmi)
+* PR #1081 cache results of shouldUseColors() (@tvandijck)
+* PR #1084 Fix httpbin useragent response format. (@SchmidtD)
+* PR #1087 Fix missing DebugInformationFormat when symbols are set to full (@rorydriscoll)
+* PR #1089 Import paths weren't translated properly (@TurkeyMan)
+* PR #1092 CodeLite workspace folders (groups) (@Gaztin)
+* PR #1093 Implemented 'debugenvs' for CodeLite (@Gaztin)
+* PR #1096 gmake2: Fix dependency for pch (@tdesveauxPKFX)
+* PR #1098 Prevent D module from adding D block in unrelated projects (@tdesveauxPKFX)
+* PR #1100 gmake2: Remove pch from FORCE_INCLUDE to allow NoPCH per-file (@tdesveauxPKFX)
+* PR #1103 gmake*: fix shell type identification (@tdesveauxPKFX)
+* PR #1104 Xcode Fixes (@erincatto)
+* PR #1105 gmake: Add rules and dependencies for directory creation (@tdesveauxPKFX)
+* PR #1107 Only set WindowsSDKDesktopARMSupport for windows systems (#172) (@Blizzard)
+* PR #1108 Fix gmake2 (@Blizzard)
+* PR #1113 Support buildaction for C++ projects (@Blizzard)
+* PR #1115 Remove Xbox 360 code from core to move and expand onto a standalone module (@redorav)
+* PR #1117 Fix Xcode autocompletion with excluded files (@sp-jordi-vilalta)
+* PR #1118 gmake2: fix cpp perfileflags (@tdesveauxPKFX)
+* PR #1125 Swap order of applying project specific config (@Blizzard)
+* PR #1126 vpath android.link fix (@Blizzard)
+* PR #1132 Refactor path.normalize and handle path ending with . (@tdesveauxPKFX)
+* PR #1136 Support server paths (@Gaztin)
+* PR #1137 Fix gmake multiple-output rule issue. (@Blizzard)
+* PR #1142 Support for CSDialect (@Blizzard)
+* PR #1143 Fix `targetextension` in xcode4 (@tempura-sukiyaki)
+* PR #1144 Add `sharedlibtype` in xcode4 (@tempura-sukiyaki)
+* PR #1145 Add support `kind:Utility` in xcode4 (@tempura-sukiyaki)
+* PR #1161 Add `xcodesystemcapabilities` in xcode4 (@tempura-sukiyaki)
+* PR #1164 ! fixed pepper fish to work with lua 5.3.4 (@neo2buha)
+* PR #1167 Add support for per-file custom build commands in xcode4 (@tempura-sukiyaki)
+* PR #1176 path.normalize: Fix when call with path surrounded with quotes (@tdesveauxPKFX)
+
 Since 5.0-alpha11:
 
 * PR #617 fix switch/separator in rules_xml (@Blizzard)

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" />
 

appveyor.yml

@@ -2,15 +2,18 @@ os: Visual Studio 2015
 
 platform:
   - Win32
+  - x64
+
+configuration:
+  - Debug
+  - Release
 
 before_build:
   - cmd: git clean -ffxd
-  - cmd: git submodule sync
-  - cmd: git submodule update --init
 
 build_script:
   - cmd: call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat"
-  - cmd: nmake -f Bootstrap.mak MSDEV=vs2015 windows
+  - cmd: nmake -f Bootstrap.mak MSDEV=vs2015 windows PLATFORM=%PLATFORM% CONFIG=%CONFIGURATION%
 
 test_script:
-  - cmd: bin\release\premake5 test
+  - cmd: bin\%CONFIGURATION%\premake5 test

binmodules/example/main.c

@@ -1,4 +1,4 @@
-#include <luashim.h>
+#include "luashim.h"
 
 
 static int example_test(lua_State* L)

binmodules/luasocket/.gitignore

@@ -0,0 +1,16 @@
+*.o
+*.so
+*.so.*
+*.obj
+*.lib
+*.dll*
+*.user
+*.sdf
+Lua.props
+Debug
+Release
+*.manifest
+*.swp
+*.suo
+x64
+

binmodules/luasocket/.travis.yml

@@ -0,0 +1,54 @@
+language: erlang
+
+env:
+  global:
+    - LUAROCKS_BASE=luarocks-2.0.13
+  matrix:
+    - LUA=lua5.1 LUA_DEV=liblua5.1-dev LUA_VER=5.1 LUA_SFX=5.1 LUA_INCDIR=/usr/include/lua5.1
+    - LUA=lua5.2 LUA_DEV=liblua5.2-dev LUA_VER=5.2 LUA_SFX=5.2 LUA_INCDIR=/usr/include/lua5.2
+    - LUA=luajit LUA_DEV=libluajit-5.1-dev LUA_VER=5.1 LUA_SFX=jit LUA_INCDIR=/usr/include/luajit-2.0
+
+branches:
+  only:
+    - master
+
+before_install:
+  - if [ $LUA = "luajit" ]; then
+      sudo add-apt-repository ppa:mwild1/ppa -y && sudo apt-get update -y;
+    fi
+  - sudo apt-get install $LUA
+  - sudo apt-get install $LUA_DEV
+  - lua$LUA_SFX -v
+  # Install a recent luarocks release
+  - wget http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz
+  - tar zxvpf $LUAROCKS_BASE.tar.gz
+  - cd $LUAROCKS_BASE
+  - ./configure
+    --lua-version=$LUA_VER --lua-suffix=$LUA_SFX --with-lua-include="$LUA_INCDIR"
+  - sudo make
+  - sudo make install
+  - cd $TRAVIS_BUILD_DIR
+
+
+install:
+  - export DEBUG=DEBUG
+  - sudo -E luarocks make luasocket-scm-0.rockspec 
+
+script: 
+  - cd test
+  - lua$LUA_SFX hello.lua
+  - lua$LUA_SFX testsrvr.lua > /dev/null &
+  - lua$LUA_SFX testclnt.lua
+  - lua$LUA_SFX stufftest.lua
+  - lua$LUA_SFX excepttest.lua
+  - lua$LUA_SFX test_bind.lua
+  - lua$LUA_SFX test_getaddrinfo.lua
+  - lua$LUA_SFX ltn12test.lua
+  - lua$LUA_SFX mimetest.lua
+  - lua$LUA_SFX urltest.lua
+  - lua$LUA_SFX test_socket_error.lua
+
+notifications:
+  email:
+    on_success: change
+    on_failure: always

binmodules/luasocket/FIX

@@ -0,0 +1,28 @@
+
+
+
+
+
+
+http was preserving old host header during redirects
+fix smtp.send hang on source error
+add create field to FTP and SMTP and fix HTTP ugliness
+clean timeout argument to open functions in SMTP, HTTP and FTP
+eliminate globals from namespaces created by module().
+url.absolute was not working when base_url was already parsed
+http.request was redirecting even when the location header was empty
+tcp{client}:shutdown() was checking for group instead of class.
+tcp{client}:send() now returns i+sent-1...
+get rid of a = socket.try() in the manual, except for protected cases. replace it with assert.
+get rid of "base." kludge in package.loaded
+check all "require("http")" etc in the manual.
+make sure sock_gethostname.*  only return success if the hp is not null!
+change 'l' prefix in C libraries to 'c' to avoid clash with LHF libraries
+    don't forget the declarations in luasocket.h and mime.h!!!
+setpeername was using udp{unconnected}
+fixed a bug in http.lua that caused some requests to fail (Florian Berger)
+fixed a bug in select.c that prevented sockets with descriptor 0 from working (Renato Maia)
+fixed a "bug" that caused dns.toip to crash under uLinux
+fixed a "bug" that caused a crash in gethostbyname under VMS
+DEBUG and VERSION became _DEBUG and _VERSION
+send returns the right value if input is "". Alexander Marinov