Merge branch 'master' into gui

Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9

build/Package_AutoDetect.bat

@@ -0,0 +1,2 @@
+premake5 package
+pause

build/Package_MSVC.bat

@@ -0,0 +1,2 @@
+premake5 --pack-libdir=msvc package
+pause

build/Package_MinGW.bat

@@ -0,0 +1,2 @@
+premake5 --pack-libdir=mingw package
+pause

build/scripts/actions/package.lua

@@ -0,0 +1,207 @@
+newoption({
+	trigger     = "pack-libdir",
+	description = "Specifiy the subdirectory in lib/ to be used when packaging the project"
+})
+
+ACTION.Name = "Package"
+ACTION.Description = "Pack Nazara binaries/include/lib together"
+
+ACTION.Function = function ()
+	local libDir = _OPTIONS["pack-libdir"]
+	if (not libDir or #libDir == 0) then
+		local libDirs = os.matchdirs("../lib/*")
+		if (#libDirs > 1) then
+			error("More than one subdirectory was found in the lib directory, please use the --pack-libdir command to clarify which directory should be used")
+		elseif (#libDirs == 0) then
+			error("No subdirectory was found in the lib directory, have you built the engine yet?")
+		else
+			libDir = path.getname(libDirs[1])
+			print("No directory was set by the --pack-libdir command, \"" .. libDir .. "\" will be used")
+		end
+	end
+
+	local realLibDir = "../lib/" .. libDir .. "/"
+	if (not os.isdir(realLibDir)) then
+		error(string.format("\"%s\" doesn't seem to be an existing directory", realLibDir))
+	end
+
+	local archEnabled = {
+		["x64"] = false,
+		["x86"] = false
+	}
+
+	local enabledArchs = {}
+	for k,v in pairs(os.matchdirs(realLibDir .. "*")) do
+		local arch = path.getname(v)
+		if (archEnabled[arch] ~= nil) then
+			archEnabled[arch] = true
+			table.insert(enabledArchs, arch)
+		else
+			print("Unknown directory " .. v .. " found, ignored")
+		end
+	end
+	enabledArchs = table.concat(enabledArchs, ", ")
+	print(enabledArchs .. " arch found")
+
+	local packageDir = "../package/"
+
+	local copyTargets = {
+		{ -- Engine headers
+			Masks = {"**.hpp", "**.inl"},
+			Source = "../include/",
+			Target = "include/"
+		},
+		{ -- SDK headers
+			Masks = {"**.hpp", "**.inl"},
+			Source = "../SDK/include/",
+			Target = "include/"
+		},
+		{ -- Examples files
+			Masks = {"**.hpp", "**.inl", "**.cpp"},
+			Source = "../examples/",
+			Target = "examples/"
+		},
+		{ -- Demo resources
+			Masks = {"**.*"},
+			Source = "../examples/bin/resources/",
+			Target = "examples/bin/resources/"
+		},
+		-- Unit test sources
+		{
+			Masks = {"**.hpp", "**.inl", "**.cpp"},
+			Source = "../tests/",
+			Target = "tests/src/"
+		},
+		-- Unit test resources
+		{
+			Masks = {"**.*"},
+			Source = "../tests/resources/",
+			Target = "tests/resources/"
+		}
+	}
+
+	local binFileMasks
+	local libFileMasks
+	local exeFileExt
+	local exeFilterFunc
+	if (os.is("windows")) then	
+		binFileMasks = {"**.dll"}
+		libFileMasks = {"**.lib", "**.a"}
+		exeFileExt = ".exe"
+		exeFilterFunc = function (filePath) return true end
+	else
+		if (os.is("macosx")) then
+			binFileMasks = {"**.dynlib"}
+		else
+			binFileMasks = {"**.so"}
+		end
+
+		libFileMasks = {"**.a"}
+		exeFileExt = ""
+		exeFilterFunc = function (filePath) return path.getextension(filePath):contains('/') end
+	end
+
+	for arch, enabled in pairs(archEnabled) do
+		if (enabled) then
+			local archLibSrc = realLibDir .. arch .. "/"
+			local arch3rdPartyBinSrc = "../extlibs/lib/common/" .. arch .. "/"
+			local archBinDst = "bin/" .. arch .. "/"
+			local archLibDst = "lib/" .. arch .. "/"
+			
+			-- Engine/SDK binaries
+			table.insert(copyTargets, { 
+				Masks  = binFileMasks,
+				Source = archLibSrc,
+				Target = archBinDst
+			})
+		
+			-- Engine/SDK libraries
+			table.insert(copyTargets, { 
+				Masks  = libFileMasks,
+				Source = archLibSrc,
+				Target = archLibDst
+			})
+
+			-- 3rd party binary dep
+			table.insert(copyTargets, { 
+				Masks  = binFileMasks,
+				Source = arch3rdPartyBinSrc,
+				Target = archBinDst
+			})
+		end
+	end
+
+	-- Demo executable
+	table.insert(copyTargets, {
+		Masks = {"Demo*" .. exeFileExt},
+		Filter = exeFilterFunc,
+		Source = "../examples/bin/",
+		Target = "examples/bin/"
+	})
+		
+	-- Unit test
+	table.insert(copyTargets, {
+		Masks = {"*" .. exeFileExt},
+		Filter = exeFilterFunc,
+		Source = "../tests/",
+		Target = "tests/"
+	})
+
+	-- Processing
+	os.mkdir(packageDir)
+
+	local size = 0
+	for k,v in pairs(copyTargets) do
+		local target = packageDir .. v.Target
+		local includePrefix = v.Source
+
+		local targetFiles = {}
+		for k, mask in pairs(v.Masks) do
+			print(includePrefix .. mask .. " => " .. target)
+			local files = os.matchfiles(includePrefix .. mask)
+			if (v.Filter) then
+				for k,path in pairs(files) do
+					if (not v.Filter(path)) then
+						files[k] = nil
+					end
+				end
+			end
+
+			targetFiles = table.join(targetFiles, files)
+		end
+		
+		for k,v in pairs(targetFiles) do
+			local relPath = v:sub(#includePrefix + 1)
+
+			local targetPath = target .. relPath
+			local targetDir = path.getdirectory(targetPath)
+			
+			if (not os.isdir(targetDir)) then
+				local ok, err = os.mkdir(targetDir)
+				if (not ok) then
+					print("Failed to create directory \"" .. targetDir .. "\": " .. err)
+				end
+			end
+
+			local ok, err
+			if (os.is("windows")) then
+				ok, err = os.copyfile(v, targetPath)
+			else
+				-- Workaround: As premake is translating this to "cp %s %s", it fails if space are presents in source/destination paths.
+				ok, err = os.copyfile(string.format("\"%s\"", v), string.format("\"%s\"", targetPath))
+			end
+
+			if (not ok) then
+				print("Failed to copy \"" .. v .. "\" to \"" .. targetPath .. "\": " .. err)
+			end
+			
+			local stat = os.stat(targetPath)
+			if (stat) then
+				size = size + stat.size
+			end
+		end
+	end
+	
+	local config = libDir .. " - " .. enabledArchs
+	print(string.format("Package successfully created at \"%s\" (%u MB, %s)", packageDir, size / (1024 * 1024), config))
+end

build/scripts/common.lua

@@ -141,7 +141,6 @@ function NazaraBuild:Execute()
 		configuration("Release*")
 			flags("NoFramePointer")
 			optimize("Speed")
-			rtti("Off")
 			vectorextensions("SSE2")
 
 		configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"})
@@ -228,6 +227,7 @@ function NazaraBuild:Execute()
 				targetdir("../lib/xcode/x64")
 
 			configuration("*Static")
+				defines("NAZARA_STATIC")
 				kind("StaticLib")
 
 			configuration("*Dynamic")
@@ -242,6 +242,9 @@ function NazaraBuild:Execute()
 			configuration("DebugDynamic")
 				targetsuffix("-d")
 
+			configuration("Release*")
+				rtti(moduleTable.EnableRTTI and "On" or "Off")
+
 			configuration({})
 
 			files(moduleTable.Files)
@@ -357,6 +360,12 @@ function NazaraBuild:Execute()
 					targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64")
 				end
 
+			configuration("*Static")
+				defines("NAZARA_STATIC")
+
+			configuration("Release*")
+				rtti(toolTable.EnableRTTI and "On" or "Off")
+
 			if (toolTable.Kind == "library" or toolTable.Kind == "plugin") then
 				configuration("*Static")
 					kind("StaticLib")
@@ -430,6 +439,9 @@ function NazaraBuild:Execute()
 			includedirs(exampleTable.Includes)
 			links(exampleTable.Libraries)
 
+			configuration("Release*")
+				rtti(exampleTable.EnableRTTI and "On" or "Off")
+
 			configuration("x32")
 				libdirs(exampleTable.LibraryPaths.x86)
 
@@ -705,7 +717,7 @@ function NazaraBuild:MakeInstallCommands(infoTable)
 	end
 
 	if (os.is("windows")) then
-		configuration({})
+		configuration("*Dynamic")
 		
 		for k,v in pairs(self.InstallDir) do
 			local destPath = path.translate(path.isabsolute(k) and k or "../../" .. k)

build/scripts/modules/network.lua

@@ -14,6 +14,16 @@ MODULE.OsFiles.Posix = {
 	"../src/Nazara/Network/Posix/**.cpp"
 }
 
+MODULE.OsFiles.Linux = {
+	"../src/Nazara/Network/Linux/**.hpp",
+	"../src/Nazara/Network/Linux/**.cpp"
+}
+
+MODULE.OsFilesExcluded.Linux = {
+	"../src/Nazara/Network/Posix/SocketPollerImpl.hpp",
+	"../src/Nazara/Network/Posix/SocketPollerImpl.cpp"
+}
+
 MODULE.OsLibraries.Windows = {
 	"ws2_32"
 }

build/scripts/modules/physics.lua

@@ -2,5 +2,5 @@ MODULE.Name = "Physics"
 
 MODULE.Libraries = {
 	"NazaraCore",
-	"Newton"
+	"Newton" -- Newton Game Dynamics
 }

build/scripts/tools/unittests.lua

@@ -19,5 +19,6 @@ TOOL.Files = {
 }
 
 TOOL.Libraries = {
+	"NazaraNetwork",
 	"NazaraSDK"
 }

build/scripts/tools/unittests_server.lua

@@ -0,0 +1,34 @@
+TOOL.Name = "UnitTestsServer"
+
+TOOL.Directory = "../tests"
+TOOL.EnableConsole = true
+TOOL.Kind = "Application"
+TOOL.TargetDirectory = TOOL.Directory
+
+TOOL.Defines = {
+	"NDK_SERVER"
+}
+
+TOOL.Includes = {
+	"../include"
+}
+
+TOOL.Files = {
+	"../tests/main.cpp",
+	"../tests/Engine/**.cpp",
+	"../tests/SDK/**.cpp"
+}
+
+-- Excludes client-only files
+TOOL.FilesExcluded = {
+	"../tests/Engine/Audio/**",
+	"../tests/Engine/Graphics/**",
+	"../tests/SDK/NDK/Application.cpp",
+	"../tests/SDK/NDK/Systems/ListenerSystem.cpp",
+	"../tests/SDK/NDK/Systems/RenderSystem.cpp"
+}
+
+TOOL.Libraries = {
+	"NazaraNetwork",
+	"NazaraSDKServer"
+}