From b34accd5795a99a6e82a1848a26441ba77904efa Mon Sep 17 00:00:00 2001 From: starkos Date: Tue, 13 Apr 2021 09:16:57 -0400 Subject: [PATCH 1/2] Bump release version to alpha16 --- CHANGES.txt | 59 +++++++++++++++++++++++++++++++++++ README.md | 2 +- scripts/RELEASE.md | 4 +-- src/host/premake.h | 6 ++-- website/src/pages/download.js | 2 +- 5 files changed, 66 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 1f16f4ae..4e1ba38f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,65 @@ 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-alpha15: + +* PR #1430 Fixed adding LD_LIBRARY_PATH to the executable run command. (@Enhex) +* PR #1439 Disable XP deprecation warning for Visual Studio projects (@withmorten) +* PR #1446 Do not add for .NET resources or the resource will not be properly embedded. (@rhuvendiek) +* PR #1447 Added /Wall to possible warning levels for Visual Studio (@ethan-wallace) +* PR #1454 Bootstrap.mak clean target(s) (@noresources) +* PR #1460 Add C++20 cppdialect for C++ projects (@nickclark2016) +* PR #1462 Added clang as a valid option for projects generated with vs2019 (@nickclark2016) +* PR #1468 macOS deployment target support for gcc and clang (@noresources) +* PR #1473 macOS os.getversion() improvements (@noresources) +* PR #1477 Add support for .swift file for xcode (@socialpoint) +* PR #1481 Improved ability to override XCode generator (@LORgames) +* PR #1482 Disable redirect test until HTTP endpoint is fixed (@LORgames) +* PR #1483 Add file details to Windows builds including version number (@LORgames) +* PR #1484 Fixed issue with os.matchfiles and symlinks (@LORgames) +* PR #1485 Added Windows implementation to os.touchfile to avoid issues with truncating the file (@LORgames) +* PR #1499 GitHub Actions: Artifacts (@sphene) +* PR #1503 Update cxx standard; (@continue98) +* PR #1505 Fix sysincludedirs for codelite. (@Jarod42) +* PR #1506 Fix quote escaping in Codelite. (@Jarod42) +* PR #1515 ConformanceMode flag implemented for >= vs2017 (@cos-public) +* PR #1519 Add Metal shader files as source code (@nickgravelyn) +* PR #1522 Fixed external library linking for Clang in VS2019+ (@nickclark2016) +* PR #1523 Added C++1z and C++2a dialect options for XCode (@nickclark2016) +* PR #1525 [Codelite] Only active (i.e. unique) configuration should be selected. (@Jarod42) +* PR #1527 Removed old CI build files (@LORgames) +* PR #1528 Added COPYFILE and COPYDIR tokens (@LORgames) +* PR #1529 NMake projects can now specify buildoptions and cppdialect (@LORgames) +* PR #1530 Remove unused code in vs2010_vcxproj.lua (@LORgames) +* PR #1532 Disable network tests; add --test-all flag to enable (@starkos) +* PR #1534 Added Ability to Disable JMC in Visual Studio (@nickclark2016) +* PR #1540 Xcode improvements (@noresources) +* PR #1542 Improve the user contribution resources (@premake) +* PR #1551 Added NetCore to CLR API (@nickclark2016) +* PR #1552 Fix MSC LTO, runtime, subsystem (@JoelLinn) +* PR #1554 clang Use `llvm-ar` linker when LTO flag is set. (@JoelLinn) +* PR #1560 Added newer shader versions (@dpeter99) +* PR #1562 Remove moduledownloader to avoid RCE. (@xenia-project) +* PR #1564 Improved net version check to also support net5.0 and beyond (@ClxS) +* PR #1565 AllowUnsafeBlocks will now be a project level property in new format (@ClxS) +* PR #1566 Set execute bit on Bootstrap.bat (@ratzlaff) +* PR #1571 useFullPaths config property for Visual Studio projects (@cos-public) +* PR #1576 Mesh and amplification shader type for Visual Studio (@pkurth) +* PR #1587 Introduce new website with docs with docusaurus (@KyrietS) +* PR #1589 os.outputof: add a second argument to select which stream to output (@noresources) +* PR #1593 Update to mbedtls 2.25 (@susnux) +* PR #1594 Added reference pages to docs (@KyrietS) +* PR #1597 Port user guide pages from wiki (@starkos) +* PR #1600 Add GitHub Action workflow for website deployment (@KyrietS) +* PR #1602 Rework website home & download pages (@starkos) +* PR #1604 Break out community section on website (@starkos) +* PR #1606 add RemoveUnreferencedCodeData option to disable /Zc:inline (@withmorten) +* PR #1607 Add Algolia search (@KyrietS) +* PR #1608 Fix Premake logo in README (@KyrietS) +* PR #1609 Encourage contributors to align the docs (@KyrietS) +* PR #1610 Improve new user website navigation (@starkos) +* PR #1614 Set up blog; move community updates (@starkos) + Since 5.0-alpha14: * PR #1086 Added support for Objective-C and Objective-C++ in xcode and gmake2nil (@LORgames) diff --git a/README.md b/README.md index fa1b3cfe..4d3c94dd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

Latest release Release date - Commits + Commits BSD 3-Clause diff --git a/scripts/RELEASE.md b/scripts/RELEASE.md index 2c3225c4..5804654d 100644 --- a/scripts/RELEASE.md +++ b/scripts/RELEASE.md @@ -18,9 +18,9 @@ * Update version in `src/host/premake.h` - * Commit `CHANGES.txt`, `README.txt`, `src/host/premake.h` + * Update version in `website/src/pages/download.js` - * Push release branch to GitHub; wait for CI to pass + * Commit changes and push release branch; wait for CI to pass * Prep release announcement from change log diff --git a/src/host/premake.h b/src/host/premake.h index 371fed1c..013e7e9d 100644 --- a/src/host/premake.h +++ b/src/host/premake.h @@ -1,7 +1,7 @@ /** * \file premake.h * \brief Program-wide constants and definitions. - * \author Copyright (c) 2002-2015 Jason Perkins and the Premake project + * \author Copyright (c) 2002-2021 Jason Perkins and the Premake project */ #define lua_c @@ -11,8 +11,8 @@ #include -#define PREMAKE_VERSION "5.0.0-dev" -#define PREMAKE_COPYRIGHT "Copyright (C) 2002-2020 Jason Perkins and the Premake Project" +#define PREMAKE_VERSION "5.0.0-alpha16" +#define PREMAKE_COPYRIGHT "Copyright (C) 2002-2021 Jason Perkins and the Premake Project" #define PREMAKE_PROJECT_URL "https://github.com/premake/premake-core/wiki" /* Identify the current platform I'm not sure how to reliably detect diff --git a/website/src/pages/download.js b/website/src/pages/download.js index db10847e..1ca3d0f7 100644 --- a/website/src/pages/download.js +++ b/website/src/pages/download.js @@ -6,7 +6,7 @@ import { Column, Container, Row } from '../components/Grid'; import Sponsors from '../components/Sponsors'; -const LATEST_VERSION = '5.0.0-alpha15'; +const LATEST_VERSION = '5.0.0-alpha16'; const DownloadLink = ({ arch }) => { From 88dc1d2bb968fd56ec32e6bf20a7cf804ddebe20 Mon Sep 17 00:00:00 2001 From: starkos Date: Tue, 13 Apr 2021 10:26:49 -0400 Subject: [PATCH 2/2] Restore dev version; release script fixes --- scripts/RELEASE.md | 6 ++---- scripts/package.lua | 18 +++++++++++------- src/host/premake.h | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/RELEASE.md b/scripts/RELEASE.md index 5804654d..289c3461 100644 --- a/scripts/RELEASE.md +++ b/scripts/RELEASE.md @@ -32,13 +32,11 @@ * Submit Windows binary to [Microsoft malware analysis](https://www.microsoft.com/en-us/wdsi/filesubmission/) - * Merge working branch to release and tag; push with tags + * Push any remaining changes; tag release branch * Create new release on GitHub from `CHANGES.txt`; upload files - * Update the download page on github.io - - * Post annoucement to `@premakeapp` + * Post announcement to `@premakeapp` ## CYCLE diff --git a/scripts/package.lua b/scripts/package.lua index d16420ec..acbfcdd5 100644 --- a/scripts/package.lua +++ b/scripts/package.lua @@ -100,9 +100,13 @@ local pkgName = "premake-" .. version local pkgExt = ".zip" - - if not os.istarget("windows") and kind == "binary" then - pkgExt = ".tar.gz" + if kind == "binary" then + pkgName = pkgName .. "-" .. os.host() + if not os.istarget("windows") then + pkgExt = ".tar.gz" + end + else + pkgName = pkgName .. "-src" end @@ -236,7 +240,7 @@ if kind == "source" then if not execQuiet("git rm --cached -r -f --ignore-unmatch "..table.concat(excludeList, ' ')) or not execQuiet("git add -f "..table.concat(includeList, ' ')) or not execQuiet("git stash") or - not execQuiet("git archive --format=zip -9 -o ../%s-src.zip --prefix=%s/ stash@{0}", pkgName, pkgName) or + not execQuiet("git archive --format=zip -9 -o ../%s.zip --prefix=%s/ stash@{0}", pkgName, pkgName) or not execQuiet("git stash drop stash@{0}") then error("failed to archive release", 0) @@ -258,14 +262,14 @@ if kind == "binary" then os.chdir("bin/release") local addCommand = "git add -f premake5%s" - local archiveCommand = "git archive --format=%s -o ../../../%s-%s%s stash@{0} -- ./premake5%s" + local archiveCommand = "git archive --format=%s -o ../../../%s%s stash@{0} -- ./premake5%s" if os.ishost("windows") then addCommand = string.format(addCommand, ".exe") - archiveCommand = string.format(archiveCommand, "zip -9", pkgName, os.host(), pkgExt, ".exe") + archiveCommand = string.format(archiveCommand, "zip -9", pkgName, pkgExt, ".exe") else addCommand = string.format(addCommand, "") - archiveCommand = string.format(archiveCommand, "tar.gz", pkgName, os.host(), pkgExt, "") + archiveCommand = string.format(archiveCommand, "tar.gz", pkgName, pkgExt, "") end if not execQuiet(addCommand) or diff --git a/src/host/premake.h b/src/host/premake.h index 013e7e9d..00c29f6b 100644 --- a/src/host/premake.h +++ b/src/host/premake.h @@ -11,7 +11,7 @@ #include -#define PREMAKE_VERSION "5.0.0-alpha16" +#define PREMAKE_VERSION "5.0.0-dev" #define PREMAKE_COPYRIGHT "Copyright (C) 2002-2021 Jason Perkins and the Premake Project" #define PREMAKE_PROJECT_URL "https://github.com/premake/premake-core/wiki"