Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap improvements #2291

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Bootstrap improvements #2291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff6c1d
Bootstrap improvements
tritao Oct 10, 2024
663642d
Default to lookup 64-bit MSVC.
tritao Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 11 additions & 1 deletion BUILD.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 14 additions & 3 deletions Bootstrap.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -95,11 +106,11 @@ SET VsWhereCmdLine="!VsWherePath! -nologo -latest -version [%VsVersionMin%,%VsVe
FOR /F "usebackq delims=" %%i in (`!VsWhereCmdLine!`) DO (

IF EXIST "%%i\VC\Auxiliary\Build\vcvars32.bat" (
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized the way this is chosen here probably affects the CI, previously it was hardcoded to x86_amd64 but now I think it will chose 32-bits.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonder if we should just default or 64-bit or add one more parameter to the bat file? I'm pending towards just default to 64-bit builds?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated PR with 64-bit build by default solution.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with this conclusion. 64 bit builds should be the default.

CALL "%%i\VC\Auxiliary\Build\vcvars32.bat" && nmake MSDEV="%PremakeVsVersion%" -f Bootstrap.mak windows
CALL "%%i\VC\Auxiliary\Build\vcvars32.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
CALL "%%i\VC\Auxiliary\Build\vcvars64.bat" && nmake MSDEV="%PremakeVsVersion%" %PlatformArg% %ConfigArg% -f Bootstrap.mak windows
EXIT /B %ERRORLEVEL%
)
)
Expand Down
45 changes: 45 additions & 0 deletions Bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion binmodules/luasocket/premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down