AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1281 from tdesveauxPKFX/package/source_improvements

Browse Source 
Source package improvements
This commit is contained in:
Samuel Surtees 2019-05-06 00:26:09 +10:00 committed by GitHub
commit d7c27fdbe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.txt
View File

@ -18,7 +18,7 @@ BUILDING FROM A SOURCE PACKAGE
officially supported toolsets in the build/ folder. Build the release
configuration and you will be ready to go. For makefiles:
$ cd build/gmake.unix
$ cd build/gmake2.unix
$ make config=release
The binaries will be placed in the ./bin/release directory.
@ -54,7 +54,7 @@ BUILDING FROM THE REPOSITORY
files for your toolset by running a command like the following in the
top-level Premake directory:
$ premake5 gmake # for makefiles
$ premake5 gmake2 # for makefiles
$ premake5 vs2012 # for a Visual Studio 2012 solution
$ premake --help # to see a list of supported toolsets

10
Bootstrap.mak
View File

@ -58,7 +58,7 @@ mingw: $(SRC)
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lole32
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --os=windows --to=build/bootstrap gmake
./build/bootstrap/premake_bootstrap --os=windows --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap config=$(CONFIG)_$(PLATFORM)
macosx: osx
@ -70,7 +70,7 @@ osx: $(SRC)
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $?
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
linux: $(SRC)
@ -80,7 +80,7 @@ linux: $(SRC)
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm -ldl -lrt
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
bsd: $(SRC)
@ -90,7 +90,7 @@ bsd: $(SRC)
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
solaris: $(SRC)
@ -100,7 +100,7 @@ solaris: $(SRC)
mkdir -p build/bootstrap
$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $? -lm
./build/bootstrap/premake_bootstrap embed
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake
./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
windows-base: $(SRC)

16
scripts/package.lua
View File

@ -183,29 +183,31 @@ if kind == "source" then
local ignoreActions = {
"clean",
"embed",
"gmake2",
"package",
"test",
"gmake", -- deprecated
}
"codelite",
"xcode4",
local perOSActions = {
"gmake2",
"codelite"
}
for action in premake.action.each() do
if not table.contains(ignoreActions, action.trigger) then
if action.trigger == "gmake" then
if table.contains(perOSActions, action.trigger) then
local gmakeOsList = {
local osList = {
{ "windows", },
{ "unix", "linux" },
{ "macosx", },
{ "bsd", },
}
for _, os in ipairs(gmakeOsList) do
for _, os in ipairs(osList) do
local osTarget = os[2] or os[1]
genProjects(string.format("--to=build/gmake.%s --os=%s gmake", os[1], osTarget))
genProjects(string.format("--to=build/%s.%s --os=%s %s", action.trigger, os[1], osTarget, action.trigger))
end
else
genProjects(string.format("--to=build/%s %s", action.trigger, action.trigger))