-
-
Notifications
You must be signed in to change notification settings - Fork 619
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release-5.0-alpha13' into release
- Loading branch information
Showing
386 changed files
with
40,278 additions
and
2,476 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,4 +6,3 @@ indent_size = 4 | |
| tab_width = 4 | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| charset = utf-8 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #include <luashim.h> | ||
| #include "luashim.h" | ||
|
|
||
|
|
||
| static int example_test(lua_State* L) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| *.o | ||
| *.so | ||
| *.so.* | ||
| *.obj | ||
| *.lib | ||
| *.dll* | ||
| *.user | ||
| *.sdf | ||
| Lua.props | ||
| Debug | ||
| Release | ||
| *.manifest | ||
| *.swp | ||
| *.suo | ||
| x64 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Oops, something went wrong.