Premake support for UTF-8

Author: jkriegshauser

Bootstrap.mak

@@ -106,7 +106,7 @@ mingw-clean: nix-clean
 
 mingw: mingw-clean
 	mkdir -p build/bootstrap
-	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_STATICLIB -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lole32 -lversion
+	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_STATICLIB -DUNICODE -D_UNICODE -municode -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lole32 -lversion
 	./build/bootstrap/premake_bootstrap embed
 	./build/bootstrap/premake_bootstrap --arch=$(PLATFORM) --os=windows --to=build/bootstrap --cc=gcc $(PREMAKE_OPTS) gmake
 	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)_$(PLATFORM:x86=win32)
@@ -162,7 +162,7 @@ haiku: haiku-clean
 
 windows-base: windows-clean
 	if not exist build\bootstrap (mkdir build\bootstrap)
-	cl /Fo.\build\bootstrap\ /Fe.\build\bootstrap\premake_bootstrap.exe /DPREMAKE_NO_BUILTIN_SCRIPTS /DLUA_STATICLIB /I"$(LUA_DIR)" /I"$(LUASHIM_DIR)" user32.lib ole32.lib advapi32.lib $(SRC)
+	cl /Fo.\build\bootstrap\ /Fe.\build\bootstrap\premake_bootstrap.exe /DPREMAKE_NO_BUILTIN_SCRIPTS /DLUA_STATICLIB /DUNICODE /D_UNICODE /I"$(LUA_DIR)" /I"$(LUASHIM_DIR)" user32.lib ole32.lib advapi32.lib $(SRC)
 	.\build\bootstrap\premake_bootstrap.exe embed
 	.\build\bootstrap\premake_bootstrap --arch=$(PLATFORM) --to=build/bootstrap $(PREMAKE_OPTS) $(MSDEV)
 

binmodules/luasocket/src/inet.c

@@ -12,6 +12,11 @@
 
 #include "inet.h"
 
+#ifdef _WIN32 /* PREMAKE: Fix for unicode Windows build */
+#undef gai_strerror
+#define gai_strerror gai_strerrorA
+#endif
+
 /*=========================================================================*\
 * Internal function prototypes.
 \*=========================================================================*/

binmodules/luasocket/src/udp.c

@@ -23,6 +23,11 @@
 #define MAX(x, y) ((x) > (y) ? x : y)
 #endif
 
+#ifdef _WIN32 /* PREMAKE: Fix for unicode Windows build */
+#undef gai_strerror
+#define gai_strerror gai_strerrorA
+#endif
+
 /*=========================================================================*\
 * Internal function prototypes
 \*=========================================================================*/

binmodules/luasocket/src/wsocket.c

@@ -427,7 +427,7 @@ const char *socket_gaistrerror(int err) {
 #ifdef EAI_SYSTEM
         case EAI_SYSTEM: return strerror(errno);
 #endif
-        default: return gai_strerror(err);
+        default: return gai_strerrorA(err);
     }
 }
 

premake5.lua

@@ -224,6 +224,7 @@
 
 		multiprocessorcompile "On"
 		warnings "Extra"
+		symbols "On"
 
 		filter { "options:not zlib-src=none" }
 			defines { "PREMAKE_COMPRESSION" }
@@ -273,7 +274,6 @@
 
 		filter "configurations:Debug"
 			defines     "_DEBUG"
-			symbols	    "On"
 
 		filter "configurations:Release"
 			defines             "NDEBUG"
@@ -287,6 +287,13 @@
 		filter { "system:windows", "configurations:Release" }
 			incrementallink "Off"
 
+		filter { "system:windows" }
+			defines { "UNICODE", "_UNICODE" }
+
+		filter { "system:windows", "action:not vs*" }
+			buildoptions { "-municode" }
+			linkoptions { "-municode" }
+
 		-- MinGW AR does not handle LTO out of the box and need a plugin to be setup
 		filter { "system:windows", "configurations:Release", "toolset:not gcc" }
 			linktimeoptimization "On"
@@ -351,7 +358,7 @@
 			targetdir   "bin/release"
 
 		filter "system:windows"
-			links       { "ole32", "ws2_32", "advapi32", "version" }
+			links       { "ole32", "ws2_32", "advapi32", "version", "user32" }
 
 		filter { "system:windows", "toolset:msc*" }
 			files       { "src/**.rc" }

src/base/help.lua

@@ -11,6 +11,7 @@
 		printf("Premake %s, a build script generator", _PREMAKE_VERSION)
 		printf(_PREMAKE_COPYRIGHT)
 		printf("%s %s", _VERSION, _COPYRIGHT)
+		if _UTF8_ENABLED then printf("UTF-8 support enabled") end
 		printf("")
 		printf("Usage: premake5 [options] action [arguments]")
 		printf("")

src/host/http_download.c

@@ -22,9 +22,14 @@ int http_download(lua_State* L)
 	long responseCode = 0;
 
 	FILE* fp;
+#if PLATFORM_WINDOWS
+	const wchar_t *file = luaL_checkconvertstring(L, 2);
+	fp = _wfopen(file, L"wb");
+	lua_pop(L, 1);
+#else
 	const char* file = luaL_checkstring(L, 2);
-
 	fp = fopen(file, "wb");
+#endif
 	if (!fp)
 	{
 		lua_pushstring(L, "Unable to open file.");

src/host/lua_auxlib.c

@@ -103,7 +103,7 @@ int premake_luaL_loadfilex (lua_State* L, const char* filename, const char* mode
 	 * script chunk on the stack. Turn these into a closure that will call my
 	 * wrapper below when the loaded script needs to be executed. */
 
-	assert(lua_gettop(L) == bottom + 2);
+	assert(lua_gettop(L) == bottom + (z == OKAY ? 2 : 0));
 
 	if (z == OKAY) {
 		/* if we are called with an env, then our caller, luaB_loadfile, will
@@ -149,7 +149,7 @@ static int chunk_wrapper(lua_State* L)
 	/* Remember the current _SCRIPT and working directory so I can
 	 * restore them after this new chunk has been run. */
 
-	do_getcwd(cwd, PATH_MAX);
+	do_getcwd(cwd, sizeof(cwd) / sizeof(cwd[0]));
 	lua_getglobal(L, "_SCRIPT");
 	lua_getglobal(L, "_SCRIPT_DIR");
 
@@ -265,11 +265,19 @@ int premake_luaB_dofile(lua_State *L)
  /**
   * Copy of readable from loadlib.c in Lua source
   */
-static int readable(const char *filename) {
-	FILE *f = fopen(filename, "r");  /* try to open file */
-	if (f == NULL) return 0;  /* open failed */
-	fclose(f);
-	return 1;
+static int readable(lua_State *L, const char *filename) {
+#if PLATFORM_WINDOWS
+  const wchar_t *wfilename = luaL_convertstring(L, filename);
+  if (wfilename == NULL) return 0;  /* conversion failed */
+  FILE *f = _wfopen(wfilename, L"r");
+  lua_pop(L, 1);
+#else
+  (void)(L);
+  FILE *f = fopen(filename, "r");
+#endif
+  if (f == NULL) return 0;  /* open failed */
+  fclose(f);
+  return 1;
 }
 
 
@@ -302,7 +310,7 @@ static const char *searchpath(lua_State *L, const char *name,
 		const char *filename = luaL_gsub(L, lua_tostring(L, -1),
 			LUA_PATH_MARK, name);
 		lua_remove(L, -2);  /* remove path template */
-		if (readable(filename))  /* does file exist and is readable? */
+		if (readable(L, filename))  /* does file exist and is readable? */
 			return filename;  /* return that file name */
 		lua_pushfstring(L, "\n\tno file '%s'", filename);
 		lua_remove(L, -2);  /* remove file name */

src/host/os_chdir.c

@@ -12,14 +12,10 @@ int do_chdir(lua_State* L, const char* path)
 	int z;
 
 #if PLATFORM_WINDOWS
-	wchar_t wide_buffer[PATH_MAX];
-	if (MultiByteToWideChar(CP_UTF8, 0, path, -1, wide_buffer, PATH_MAX) == 0)
-	{
-		lua_pushstring(L, "unable to encode path");
-		return lua_error(L);
-	}
-
-	z = SetCurrentDirectoryW(wide_buffer);
+	const wchar_t *wpath = luaL_convertstring(L, path);
+	if (!wpath) return luaL_error(L, "unable to encode path");
+	z = SetCurrentDirectoryW(wpath);
+	lua_pop(L, 1);
 #else
 	(void)(L);  /* warning: unused parameter */
 

src/host/os_comparefiles.c

@@ -19,32 +19,20 @@ int os_comparefiles(lua_State* L)
 	size_t read;
 	char firstBuffer[4096];
 	char secondBuffer[4096];
+
+#if PLATFORM_WINDOWS
+	// if we read the first argument first, it might push to the stack obscuring
+	// a missing second argument. So read the second argument first.
+	const wchar_t *secondPath = luaL_checkconvertstring(L, 2);
+	const wchar_t *firstPath = luaL_checkconvertstring(L, 1);
+	firstFile = _wfopen(firstPath, L"rb");
+	secondFile = _wfopen(secondPath, L"rb");
+#else
 	const char* firstPath = luaL_checkstring(L, 1);
 	const char* secondPath = luaL_checkstring(L, 2);
-
-	#if PLATFORM_WINDOWS
-	wchar_t wide_firstPath[PATH_MAX];
-	if (MultiByteToWideChar(CP_UTF8, 0, firstPath, -1, wide_firstPath, PATH_MAX) == 0)
-	{
-		lua_pushnil(L);
-		lua_pushstring(L, "unable to encode first path");
-		return 2;
-	}
-
-	wchar_t wide_secondPath[PATH_MAX];
-	if (MultiByteToWideChar(CP_UTF8, 0, secondPath, -1, wide_secondPath, PATH_MAX) == 0)
-	{
-		lua_pushnil(L);
-		lua_pushstring(L, "unable to encode second path");
-		return 2;
-	}
-
-	firstFile = _wfopen(wide_firstPath, L"rb");
-	secondFile = _wfopen(wide_secondPath, L"rb");
-	#else
 	firstFile = fopen(firstPath, "rb");
 	secondFile = fopen(secondPath, "rb");
-	#endif
+#endif
 
 	if (!firstFile)
 	{