From ff368fcceba7acab48568b685d1eeee704c493d5 Mon Sep 17 00:00:00 2001 From: Thomas Desveaux Date: Fri, 4 Jan 2019 16:39:28 +0100 Subject: [PATCH 1/5] Bump PREMAKE_VERSION to alpha14 --- src/host/premake.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/host/premake.h b/src/host/premake.h index b31ae73d..8bddd302 100644 --- a/src/host/premake.h +++ b/src/host/premake.h @@ -11,7 +11,7 @@ #include -#define PREMAKE_VERSION "5.0.0-dev" +#define PREMAKE_VERSION "5.0.0-alpha14" #define PREMAKE_COPYRIGHT "Copyright (C) 2002-2018 Jason Perkins and the Premake Project" #define PREMAKE_PROJECT_URL "https://github.com/premake/premake-core/wiki" From e8288a7260fa9583deec5da97c9858fff7daebc4 Mon Sep 17 00:00:00 2001 From: Thomas Desveaux Date: Sat, 4 May 2019 14:21:32 +0200 Subject: [PATCH 2/5] CHANGES.txt: Add merged PRs since alpha13 --- CHANGES.txt | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index fae89d59..d8e8ddac 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,45 @@ 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-alpha13: + +* PR #1067 Add 'Default', 'Dwarf' and 'SplitDwarf' arguments to 'debugformat' (@ratzlaff) +* PR #1160 use ';' as default separator for vs (@WorldofBay) +* PR #1177 Enable property categories in VS projects (@WorldofBay) +* PR #1178 Avoid impl dependent multi-char constants (@cengizIO) +* PR #1179 fix `xcodebuildsettings` using false (@tempura-sukiyaki) +* PR #1180 Add `os.ios` option in xcode4 (@tempura-sukiyaki) +* PR #1181 Release 5.0 alpha13 (@premake) +* PR #1189 Host path.normalize: Fix normalization for paths containing tokens (@tdesveauxPKFX) +* PR #1191 Fix objname collisions (@ratzlaff) +* PR #1193 Add tests for xcode id generator (@ratzlaff) +* PR #1194 Move rule property string expansion into modules (@WorldofBay) +* PR #1197 Added missing elements in Visual Studio Makefile projects (@LORgames) +* PR #1202 Support %{file.name} token in VS (@Blizzard) +* PR #1203 Add support for JavaCompile in vsandroid (@tempura-sukiyaki) +* PR #1206 Updated code lite to properly add LD_LIBRARY_PATH is set if libdirs is set (@pintodragon) +* PR #1218 Add support & tests for XCTest sharedlibtype (@Dingobloo) +* PR #1220 Implement the androidapilevel() API in Android packaging projects (@ifarbod) +* PR #1221 add nil check to fileconfig.hasFileSetting (gmake) (@WorldofBay) +* PR #1224 add missing local (@WorldofBay) +* PR #1228 Added Win64 as a recognized platform (@LORgames) +* PR #1230 Removed excessive escaping in CodeLite generator (@LORgames) +* PR #1231 Fixed issue with per-configuration build commands not returning errors correctly (@LORgames) +* PR #1236 Added support for Dx12 shader models (@CosmicRey) +* PR #1239 Implemented the startproject option for xcode (@macsforme) +* PR #1240 allow linking of mixed c++ assemblies (@WorldofBay) +* PR #1244 Fixed issue with detoken not handling deferred joins correctly (@LORgames) +* PR #1247 Added support for `csversion` API to dotnet toolset. (@tritao) +* PR #1248 Default to Roslyn-based `csc` compiler on all platforms. (@tritao) +* PR #1249 do not clear _isIncludingExternal in nested calls (@WorldofBay) +* PR #1253 Xcode newid determinism (@ratzlaff) +* PR #1258 Added support for Visual Studio 2019 solutions (@CosmicRey) +* PR #1264 Android changes, stage 1 (#1263) (@ifarbod) +* PR #1266 Implement the 'visibility' API for Android projects (@ifarbod) +* PR #1267 Provide access to json implementation (@ratzlaff) +* PR #1276 Added support for forceincludes in CodeLite (@LORgames) +* PR #1278 Packaging script improvement (@tdesveauxPKFX) + Since 5.0-alpha12: * PR #880 Allow tokens to start with a ! to disable making paths relative. (@Blizzard) From fe78c5689edd7324e0cee1a1904225660583deb0 Mon Sep 17 00:00:00 2001 From: Thomas Desveaux Date: Sat, 4 May 2019 16:03:07 +0200 Subject: [PATCH 3/5] Package.lua: Minor fix to premakeBin value --- scripts/package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package.lua b/scripts/package.lua index 9d83f2c3..c0d7d76d 100644 --- a/scripts/package.lua +++ b/scripts/package.lua @@ -149,7 +149,7 @@ if not z then error("Failed to Bootstrap Premake", 0) end - local premakeBin = path.translate("bin/release/Premake5") + local premakeBin = path.translate("./bin/release/premake5") -- From f1dbf78e250c654f94f7af3e6522a0fb65e9f456 Mon Sep 17 00:00:00 2001 From: Thomas Desveaux Date: Sat, 4 May 2019 16:29:03 +0200 Subject: [PATCH 4/5] README: Update commit since last release shield for alpha14 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ec2e2bd..0a3896be 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![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-alpha13.svg)]() + [![Commits since last release](https://img.shields.io/github/commits-since/premake/premake-core/v5.0.0-alpha14.svg)]() From 9ac4db937cad86f8ff41b95d939e42db14ec4946 Mon Sep 17 00:00:00 2001 From: Thomas Desveaux Date: Sat, 4 May 2019 16:56:10 +0200 Subject: [PATCH 5/5] Post Alpha14 release: Set PREMAKE_VERSION to dev --- src/host/premake.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/host/premake.h b/src/host/premake.h index 8bddd302..b31ae73d 100644 --- a/src/host/premake.h +++ b/src/host/premake.h @@ -11,7 +11,7 @@ #include -#define PREMAKE_VERSION "5.0.0-alpha14" +#define PREMAKE_VERSION "5.0.0-dev" #define PREMAKE_COPYRIGHT "Copyright (C) 2002-2018 Jason Perkins and the Premake Project" #define PREMAKE_PROJECT_URL "https://github.com/premake/premake-core/wiki"