We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Genie patch

sdl_genie_support.patch (text/plain), 3.07 KB, created by jfverdon on 2016-02-17 19:26:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jfverdon

Created: 2016-02-17 19:26:22 UTC

Size: 3.07 KB

patch

obsolete

>diff --git premake/premake4.lua premake/premake4.lua
>index 1202c0e..a9e1b92 100755
>--- premake/premake4.lua
>+++ premake/premake4.lua
>@@ -121,7 +121,7 @@ if _OPTIONS["help"] == nil then
> 	end
> 
> 	local genFile = baseLoc .. "/SDL-gen.lua"
>-	local file = fileopen(genFile, "wt")
>+	local file = fileopen(genFile, "w")
> 	print("Generating " .. genFile .. "...")
> 	-- begin generating the config header file
> 	startGeneration(premakeConfigHeader, premakeTemplateHeader)
>diff --git premake/util/sdl_check_compile.lua premake/util/sdl_check_compile.lua
>index c373335..41205c6 100755
>--- premake/util/sdl_check_compile.lua
>+++ premake/util/sdl_check_compile.lua
>@@ -101,6 +101,18 @@ local function cleanup_build()
> 	os.remove("./premakecheck.stdout")
> end
> 
>+local function os_execute(cmd)
>+	if _ENV then
>+		-- Lua 5.2 or greater
>+		local cmdSuccess, textStatus, returnCode = os.execute(cmd)
>+		return returnCode
>+	else
>+		-- Lua 5.1 or lesser
>+		local returnCode = os.execute(cmd)
>+		return returnCode
>+	end
>+end
>+
> -- Check if a source builds, links, and or/runs, where running depends on
> -- linking and linking depends on building. The return from this function is
> -- a triple, where the first is a boolean value indicating if it successfully
>@@ -108,10 +120,10 @@ end
> -- linked, and the third represents nil if it was not run or run correctly, or
> -- the output from the program executed (may be empty for no output).
> local function check_build_source(source, link, run)
>-	local file = fileopen("./premakecheck.c", "wt")
>+	local file = fileopen("./premakecheck.c", "w")
> 	file:write(source)
> 	file:close()
>-	local result = os.execute(build_compile_line())
>+	local result = os_execute(build_compile_line())
> 	if not link then
> 		cleanup_build()
> 		if result == 0 then
>@@ -125,13 +137,13 @@ local function check_build_source(source, link, run)
> 		cleanup_build()
> 		return false, false, nil -- no compile, no link, no run
> 	end
>-	result = os.execute(build_link_line())
>+	result = os_execute(build_link_line())
> 	if not run or result ~= 0 then -- have to link to run
> 		cleanup_build()
> 		return true, result == 0, nil -- compile, maybe link, no run
> 	end
>-	result = os.execute(build_run_line())
>-	local output = readfile("./premakecheck.stdout", "rt")
>+	result = os_execute(build_run_line())
>+	local output = readfile("./premakecheck.stdout", "r")
> 	cleanup_build()
> 	return true, true, output -- compile, link, ran
> end
>diff --git premake/util/sdl_gen_config.lua premake/util/sdl_gen_config.lua
>index f0873e5..ec4eded 100755
>--- premake/util/sdl_gen_config.lua
>+++ premake/util/sdl_gen_config.lua
>@@ -33,8 +33,8 @@ local insertLocation
> -- This function begins config header generation given the name of the generated
> -- file and the name of the template file to use.
> function startGeneration(file, template)
>-	configFile = fileopen(file, "wt")
>-	templateFileContents = readfile(template, "rt")
>+	configFile = fileopen(file, "w")
>+	templateFileContents = readfile(template, "r")
> 	insertLocation = templateFileContents:find(searchKey)
> 	if insertLocation then
> 		configFile:write(templateFileContents:sub(1, insertLocation - 1))

Actions: View | Diff

Attachments on bug 3262: 2379

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.