Merge branch 'premake:master' into master

Author: lolrobbe2

.github/workflows/ci-workflow.yml

@@ -13,7 +13,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Build
-      run: make -f Bootstrap.mak linux PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }}
+      run: PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} ./Bootstrap.sh
     - name: Test
       run: bin/${{ matrix.config }}/premake5 test --test-all
     - name: Docs check
@@ -34,7 +34,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Build
-      run: make -f Bootstrap.mak macosx PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }}
+      run: PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} ./Bootstrap.sh
     - name: Test
       run: bin/${{ matrix.config }}/premake5 test --test-all
     - name: Docs check
@@ -51,13 +51,16 @@ jobs:
       matrix:
         config: [debug, release]
         platform: [Win32, x64]
+        msdev: [vs2022]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
     - name: Build
-      run: |
-        $vcvarsall_path = vswhere.exe -find VC\Auxiliary\Build\vcvarsall.bat
-        cmd.exe /c "call ""$vcvarsall_path"" x86_amd64 && nmake -f Bootstrap.mak MSDEV=vs2019 windows-msbuild PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }}"
+      shell: cmd
+      env:
+        PLATFORM: ${{ matrix.platform }}
+        CONFIG: ${{ matrix.config }}
+      run: ./Bootstrap.bat ${{ matrix.msdev }}
     - name: Test
       run: bin\${{ matrix.config }}\premake5 test --test-all
       shell: cmd
@@ -98,7 +101,7 @@ jobs:
         pacboy: >-
           toolchain:p
     - name: Build
-      run: make -f Bootstrap.mak mingw PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }}
+      run: PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} ./Bootstrap.sh
     - name: Test
       run: bin/${{ matrix.config }}/premake5.exe test --test-all
     - name: Docs check
@@ -121,7 +124,7 @@ jobs:
       with:
         version: '3.9.2'
     - name: Build
-      run: make -f Bootstrap.mak cosmo CONFIG=${{ matrix.config }}
+      run: PLATFORM=${{ matrix.platform }} CONFIG=${{ matrix.config }} ./Bootstrap.sh -cosmo
     - name: Test
       run: bin/${{ matrix.config }}/premake5 test --test-all
     - name: Docs check

BUILD.txt

@@ -27,7 +27,17 @@ BUILDING FROM A SOURCE PACKAGE
 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:
+ use `Bootstrap.sh` or `Bootstrap.bat` to generate your first premake executable:
+
+ On Windows:
+
+    $ ./Bootstrap.bat
+
+ On other platforms:
+
+    $ ./Bootstrap.sh
+
+Alternatively, you may call the Makefile directly:
 
     $ make -f Bootstrap.mak PLATFORM
 

Bootstrap.bat

@@ -9,6 +9,17 @@ SET VsWherePath="C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswher
 
 REM ===========================================================================
 
+SET "PlatformArg="
+SET "ConfigArg="
+
+IF NOT "%PLATFORM%" == "" (
+    SET "PlatformArg=PLATFORM=%PLATFORM%"
+)
+
+IF NOT "%CONFIG%" == "" (
+    SET "ConfigArg=CONFIG=%CONFIG%"
+)
+
 SET vsversion=%1
 IF "%vsversion%" == "" (
 	CALL :BootstrapLatest
@@ -67,7 +78,7 @@ IF NOT EXIST "%VsPath%vsdevcmd.bat" (
 	EXIT /B 2
 )
 
-CALL "%VsPath%vsdevcmd.bat" && nmake MSDEV="%~1" -f Bootstrap.mak windows
+CALL "%VsPath%vsdevcmd.bat" && nmake MSDEV="%~1" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
 EXIT /B %ERRORLEVEL%
 
 REM :LegacyVisualBootstrap
@@ -94,18 +105,18 @@ SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVe
 
 FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (
 
-	IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
-		CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
+	IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
+		CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
 		EXIT /B %ERRORLEVEL%
 	) ELSE (
-		IF EXIST "%%i\VC\Auxiliary\Build\vcvars64.bat" (
-			CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
+		IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
+			CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
 			EXIT /B %ERRORLEVEL%
 		)
 	)
 )
 
-ECHO Could not find vcvars32.bat or vcvars64.bat to setup Visual Studio environment
+ECHO Could not find vcvars64.bat or vcvars32.bat to setup Visual Studio environment
 EXIT /B 2
 
 REM :VsWhereVisualBootstrap

Bootstrap.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+DIR=$( cd "$( dirname "$0" )" && pwd )
+cd "$DIR"
+
+COSMO_FLAG=""
+for arg in "$@"; do
+  if [ "$arg" = "-cosmo" ]; then
+    COSMO_FLAG="cosmo"
+    break
+  fi
+done
+
+PLATFORM_ARG=""
+CONFIG_ARG=""
+
+if [ -n "$PLATFORM" ]; then
+  PLATFORM_ARG="PLATFORM=$PLATFORM"
+fi
+
+if [ -n "$CONFIG" ]; then
+  CONFIG_ARG="CONFIG=$CONFIG"
+fi
+
+case "$(uname -s)" in
+   Linux)
+     NPROC=$(nproc --all)
+     make -f Bootstrap.mak ${COSMO_FLAG:-linux} $PLATFORM_ARG $CONFIG_ARG -j$NPROC
+     ;;
+   Darwin)
+     NPROC=$(sysctl -n hw.ncpu)
+     make -f Bootstrap.mak ${COSMO_FLAG:-osx} $PLATFORM_ARG $CONFIG_ARG -j$NPROC
+     ;;
+   FreeBSD|OpenBSD|NetBSD)
+     NPROC=$(sysctl -n hw.ncpu)
+     make -f Bootstrap.mak ${COSMO_FLAG:-bsd} $PLATFORM_ARG $CONFIG_ARG -j$NPROC
+     ;;
+   CYGWIN*|MINGW32*|MSYS*|MINGW*)
+     make -f Bootstrap.mak ${COSMO_FLAG:-mingw} $PLATFORM_ARG $CONFIG_ARG -j$NPROC
+     ;;
+   *)
+    echo "Unsupported platform"
+    exit 1
+     ;;
+esac

CONTRIBUTORS.txt

@@ -14,7 +14,7 @@ improvements to earlier versions of Premake (feel free to add your name
 in here too)!
 
 Original design and implementation:
-  Jason Perkins <[email protected]>
+  Jess Perkins <[email protected]>
 
 Main Contributors
   Blizzard Entertainment (contact [email protected])

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2003-2022 Jason Perkins and individual contributors.
+Copyright (c) 2003-2022 Jess Perkins and individual contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

binmodules/luasocket/premake5.lua

@@ -32,7 +32,7 @@ project "luasocket"
 		links { 'ws2_32' }
 		characterset "MBCS"
 
-		defines { "LUASOCKET_API=__declspec(dllexport)" }
+		defines { "LUASOCKET_API=__declspec(dllexport)", "_WINSOCK_DEPRECATED_NO_WARNINGS" }
 
 	filter "system:not windows"
 		removefiles

binmodules/luasocket/src/mime.c

@@ -689,6 +689,7 @@ static size_t dot(int c, size_t state, luaL_Buffer *buffer)
         case '.':
             if (state == 2)
                 luaL_addchar(buffer, '.');
+            /* Falls through. */
         default:
             return 0;
     }

contrib/lua/src/lundump.c

@@ -234,7 +234,7 @@ static void fchecksize (LoadState *S, size_t size, const char *tname) {
 #define checksize(S,t)	fchecksize(S,sizeof(t),#t)
 
 static void checkHeader (LoadState *S) {
-  checkliteral(S, LUA_SIGNATURE + 1, "not a");  /* 1st char already checked */
+  checkliteral(S, &LUA_SIGNATURE[1], "not a");  /* 1st char already checked */
   if (LoadByte(S) != LUAC_VERSION)
     error(S, "version mismatch in");
   if (LoadByte(S) != LUAC_FORMAT)

modules/codelite/_preload.lua

@@ -6,7 +6,7 @@
 --              Andrew Gough
 --              Manu Evans
 -- Created:     2013/05/06
--- Copyright:   (c) 2008-2015 Jason Perkins and the Premake project
+-- Copyright:   (c) 2008-2015 Jess Perkins and the Premake project
 --
 
 	local p = premake