Merge branch 'feature/ci-tweaks'

jushar · jushar · commit 57c2db582376 · 2017-06-16T20:13:16.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -307,3 +307,6 @@ _Pvt_Extensions
 Bin/
 Build/
 InstallFiles/
+utils/vswhere.exe
+utils/DXFiles.zip
+utils/DXFiles/
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ matrix:
         NIGHTLY_UPLOAD=0
     
 before_script:
-  - wget https://github.com/sbx320/premake5-travis/blob/master/premake5?raw=true -O ./premake5 &&
+  - wget https://mirror.mtasa.com/bdata/premake5-travis -O ./premake5 &&
     chmod +x ./premake5 &&
     ./premake5 gmake && 
     cd Build
diff --git a/Client/ceflauncher/premake5.lua b/Client/ceflauncher/premake5.lua
@@ -7,7 +7,7 @@ project "CEFLauncher"
 	includedirs { "../sdk" }
 	
 	links { "CEFLauncher DLL"}
-	flags { "WinMain" }
+	entrypoint "WinMainCRTStartup"
 
 	vpaths { 
 		["Headers/*"] = "**.h",
diff --git a/Client/launch/premake5.lua b/Client/launch/premake5.lua
@@ -9,7 +9,7 @@ project "Client Launcher"
 	pchheader "StdInc.h"
 	pchsource "StdInc.cpp"
 	
-	flags { "WinMain" }
+	entrypoint "WinMainCRTStartup"
 	
 	vpaths { 
 		["Headers/*"] = "**.h",
diff --git a/Client/loader/premake5.lua b/Client/loader/premake5.lua
@@ -41,10 +41,7 @@ project "Loader"
 		files {
 			"loader.rc",
 			"resource/splash.bmp"
-		}
-
-	filter {"system:windows", "toolset:*120*"}
-		links { "Psapi.lib" }
+		}
 	
 	filter "architecture:x64"
 		flags { "ExcludeFromBuild" } 
diff --git a/Client/mods/deathmatch/premake5.lua b/Client/mods/deathmatch/premake5.lua
@@ -7,8 +7,9 @@ project "Client Deathmatch"
 	pchheader "StdInc.h"
 	pchsource "StdInc.cpp"
 	
+	defines { "LUA_USE_APICHECK", "SDK_WITH_BCRYPT" }
 	links {
-		"Lua_Client", "pcre", "json-c", "ws2_32", "portaudio", "zlib", "cryptopp", "libspeex",
+		"Lua_Client", "pcre", "json-c", "ws2_32", "portaudio", "zlib", "cryptopp", "libspeex", "blowfish_bcrypt",
 		"../../../vendor/bass/lib/bass",
 		"../../../vendor/bass/lib/bass_fx",
 		"../../../vendor/bass/lib/bassmix",
@@ -24,9 +25,6 @@ project "Client Deathmatch"
 	filter "system:windows"
 		includedirs { "../../../vendor/sparsehash/src/windows" }
 		linkoptions { "/SAFESEH\:NO" }
-
-	filter {"system:windows", "toolset:*120*"}
-		links { "Psapi.lib" }
 	
 	filter {}
 		includedirs {
@@ -60,10 +58,6 @@ project "Client Deathmatch"
 		"../../../vendor/bochs/bochs_internal/crc32.cpp"
 	}
 	
-	defines {
-		"LUA_USE_APICHECK"
-	}
-	
 	configuration "windows"
 		buildoptions { "-Zm180" }
 	
diff --git a/Server/mods/deathmatch/premake5.lua b/Server/mods/deathmatch/premake5.lua
@@ -30,8 +30,9 @@ project "Deathmatch"
 			"."
 		}
 	
+	defines { "SDK_WITH_BCRYPT" }
 	links {
-		"Lua_Server", "pthread", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "zlib"
+		"Lua_Server", "pthread", "sqlite", "ehs", "cryptopp", "pme", "pcre", "json-c", "zip", "zlib", "blowfish_bcrypt",
 	}
 	
 	vpaths {
@@ -59,9 +60,6 @@ project "Deathmatch"
 		includedirs { "../../../vendor/pthreads/include" }
 		buildoptions { "-Zm130" }
 		links { "ws2_32" }
-
-	filter {"system:windows", "toolset:*120*"}
-		links { "Psapi.lib" }
 		
 	filter "system:not windows"
 		buildoptions { "-Wno-narrowing" } -- We should fix the warnings at some point
diff --git a/Shared/sdk/SharedUtil.Hash.h b/Shared/sdk/SharedUtil.Hash.h
@@ -85,8 +85,10 @@ namespace SharedUtil
     unsigned int    HashString                  ( const char* szString );
     unsigned int    HashString                  ( const char* szString, unsigned int length );
 
+#ifdef SDK_WITH_BCRYPT
     SString         BcryptHash                  (const SString& password, SString salt = "", std::size_t cost = 10);
     bool            BcryptVerify                (const SString& password, const SString& hash);
+#endif
 
     SString         ConvertDataToHexString      ( const void* pData, uint uiLength );
     void            ConvertHexStringToData      ( const SString& strString, void* pOutData, uint uiLength );
diff --git a/Shared/sdk/SharedUtil.Hash.hpp b/Shared/sdk/SharedUtil.Hash.hpp
@@ -489,6 +489,7 @@ namespace SharedUtil
         return c;
     }
 
+#ifdef SDK_WITH_BCRYPT
     constexpr const std::size_t HashBufferSize = 60 + 1;
 	SString BcryptHash(const SString& password, SString salt, std::size_t cost)
 	{
@@ -525,7 +526,7 @@ namespace SharedUtil
 
         return strcmp(checkedHashBuffer, hash.c_str()) == 0;
 	}
-
+#endif
 
     SString ConvertDataToHexString( const void* pData, uint uiLength )
     {
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,16 +1,20 @@
 version: ci-{build}
-os: Visual Studio 2015
+os: Visual Studio 2017
 
 configuration:
   - Release
 
 before_build:
   - choco install curl
+  - curl -o utils/DXFiles.zip https://mirror.mtasa.com/bdata/DXFiles.zip
+  - 7z e utils/DXFiles.zip -outils/DXFiles -spf
+  - set DXSDK_DIR=%CD%\utils\DXFiles\
+  - echo Using DXSDK_DIR %DXSDK_DIR%
   - utils\premake5 install_cef
-  - utils\premake5 vs2015
+  - utils\premake5 vs2017
+  - utils\premake5 install_data
 
 after_build:
-  - utils\premake5 install_data
   - utils\premake5 compose_files
   - 7z a InstallFiles.zip InstallFiles
   - cmd: if "%APPVEYOR_PULL_REQUEST_TITLE%" == "" if "%APPVEYOR_REPO_TAG%" == "false" curl -i -F "branch_name=%APPVEYOR_REPO_BRANCH%" -F "commit_hash=%APPVEYOR_REPO_COMMIT%" -F "commit_title=%APPVEYOR_REPO_COMMIT_MESSAGE%" -F build_type=windows32 -F "secret=%UPLOAD_SECRET%" -F build_upload=@InstallFiles.zip https://nightlytest.mtasa.com/api/upload
diff --git a/linux-build.sh b/linux-build.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-if [[ "$(uname -m)" == 'x86_64' ]]; then
-    PREMAKE5=utils/premake5_x64
-    CONFIG=release_x64
-else
-    PREMAKE5=utils/premake5_x86
+PREMAKE5=utils/premake5
+if [ "$1" -eq "32" ]; then
     CONFIG=release_x86
+else
+    CONFIG=release_x64
 fi
 
 # Clean old build files
diff --git a/linux-install-data.sh b/linux-install-data.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-if [[ "$(uname -m)" == 'x86_64' ]]; then
-    PREMAKE5=utils/premake5_x64
-else
-    PREMAKE5=utils/premake5_x86
-fi
+PREMAKE5=utils/premake5
 
 # Install data files
 $PREMAKE5 install_data
diff --git a/premake5.lua b/premake5.lua
@@ -21,7 +21,7 @@ workspace "MTASA"
 	location "Build"
 	startproject "Client Launcher"
 	
-	flags { "C++11" }
+	cppdialect "C++11"
 	characterset "MBCS"
 	pic "On"
 	symbols "On"
@@ -31,15 +31,13 @@ workspace "MTASA"
 		"vendor",
 		"Shared/sdk", 
 	}
-	
-	 -- I know linking bcrypt here is ugly, but SharedUtil depends on it, thus it's required everywhere
-	links { "blowfish_bcrypt" }
 
 	defines { 
 		"_CRT_SECURE_NO_WARNINGS",
 		"_SCL_SECURE_NO_WARNINGS",
 		"_CRT_NONSTDC_NO_DEPRECATE",
-		"NOMINMAX"
+		"NOMINMAX",
+		"_TIMESPEC_DEFINED"
 	}
 		
 	-- Helper function for output path 
@@ -69,15 +67,12 @@ workspace "MTASA"
 	filter {"system:windows", "configurations:Nightly", "kind:not StaticLib"}
 		os.mkdir("Build/Symbols")
 		linkoptions "/PDB:\"Symbols\\$(ProjectName).pdb\""
-
-	filter {"system:windows", "toolset:*140*"}
-		defines { "_TIMESPEC_DEFINED" } -- fix pthread redefinition error, TODO: Remove when we fully moved to vs2015
 	
 	filter {"system:windows", "toolset:*_xp*"}
 		buildoptions { "/Zc:threadSafeInit-" } -- Fix Windows XP not initialising TLS early
 	
 	filter "system:windows"
-		toolset "v140"
+		toolset "v141"
 		flags { "StaticRuntime" }
 		defines { "WIN32", "_WIN32" }
 		includedirs { 
@@ -95,7 +90,7 @@ workspace "MTASA"
 		vectorextensions "SSE2"
 	
 	-- Only build the client on Windows
-	if os.get() == "windows" then
+	if os.target() == "windows" then
 		group "Client"
 		include "Client/ceflauncher"
 		include "Client/ceflauncher_DLL"
diff --git a/utils/buildactions/compose_files.lua b/utils/buildactions/compose_files.lua
@@ -6,7 +6,7 @@ premake.modules.compose_files = {}
 local BIN_DIR = "Bin"
 local DATA_DIR = "Shared/data/MTA San Andreas"
 local OUTPUT_DIR = "InstallFiles"
-local WINDOWS = os.get() == "windows"
+local WINDOWS = os.host() == "windows"
 
 newaction {
 	trigger = "compose_files",
diff --git a/utils/buildactions/install_cef.lua b/utils/buildactions/install_cef.lua
@@ -13,7 +13,7 @@ newaction {
 
 	execute = function()
 		-- Only execute on Windows
-		if os.get() ~= "windows" then return end
+		if os.host() ~= "windows" then return end
 
 		-- Download md5
 		local correct_checksum, result_string = http.get(CEF_URL_MD5)
diff --git a/utils/buildactions/install_data.lua b/utils/buildactions/install_data.lua
@@ -22,7 +22,7 @@ newaction {
 		os.mkdir(BIN_DIR)
 		
 		-- Copy data files
-		if os.get() == "windows" then
+		if os.host() == "windows" then
 			os.copydir(DATA_DIR, BIN_DIR)
 		end
 
diff --git a/utils/buildactions/install_resources.lua b/utils/buildactions/install_resources.lua
@@ -4,7 +4,7 @@ local unzip = function(zip_path, target_path)
 	zip_path = path.translate(zip_path)
 	target_path = path.translate(target_path)
 
-	if os.get() == "windows" then
+	if os.host() == "windows" then
 		os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" -aoa -o\"%s\"", zip_path, target_path)
 	else
 		-- Linux: TODO
diff --git a/utils/buildactions/utils.lua b/utils/buildactions/utils.lua
@@ -84,7 +84,7 @@ function os.expanddir_wildcard(from, to)
 end
 
 function os.md5_file(path)
-	if os.get() == "windows" then
+	if os.host() == "windows" then
 		local s = os.outputof(string.format("CertUtil -hashfile \"%s\" MD5", path))
 		return (s:match("\n(.*)\n(.*)") or ""):gsub(" ", "")
 	else
@@ -95,7 +95,7 @@ end
 function os.extract_archive(archive_path, target_path, override)
 	local flags = override and "-aoa" or "-aos"
 
-	if os.get() == "windows" then
+	if os.host() == "windows" then
 		os.executef("call \"utils\\7z\\7za.exe\" x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
 	else
 		os.executef("7z x \"%s\" %s -o\"%s\"", archive_path, flags, target_path)
diff --git a/utils/premake5 b/utils/premake5
diff --git a/utils/premake5.exe b/utils/premake5.exe
diff --git a/utils/premake5_x64 b/utils/premake5_x64
diff --git a/utils/premake5_x86 b/utils/premake5_x86
diff --git a/vendor/lua/premake5.lua b/vendor/lua/premake5.lua
@@ -26,7 +26,7 @@ project "Lua_Server"
 		targetdir(buildpath("server/x64"))
 
 
-if os.get() == "windows" then
+if os.target() == "windows" then
 	project "Lua_Client"
 		language "C++"
 		kind "SharedLib"
diff --git a/win-build.bat b/win-build.bat
@@ -1,21 +1,27 @@
 @echo off
+set VSWHERE=utils\vswhere.exe
+
+rem Download vswhere (command line utility to find MSBuild path)
+if not exist %VSWHERE% (
+	echo vswhere utility doesn't exist. Downloading...
+	powershell -Command "Invoke-WebRequest https://mirror.mtasa.com/bdata/vswhere.exe -OutFile %VSWHERE%"
+)
 
 rem Create solution (ignoring pause)
 call win-create-projects.bat < nul
 echo.
 
-set MSBUILD_REG_KEY="HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0"
-set MSBUILD_REG_SUBKEY="MSBuildToolsPath"
+rem Find MSBuild installation path
+for /f "usebackq tokens=1* delims=: " %%i in (`%VSWHERE% -latest -requires Microsoft.Component.MSBuild`) do (
+	if /i "%%i"=="installationPath" set INSTALLDIR=%%j
+)
 
-rem Check if MSBuild is installed
-reg query %MSBUILD_REG_KEY% /v %MSBUILD_REG_SUBKEY% > nul 2>&1
-if %ERRORLEVEL%==1 (
-	echo Could not find MSBuild. Make sure you have Visual Studio 2015 installed
+rem Output an error if not exists
+set MSBUILDPATH="%InstallDir%\MSBuild\15.0\Bin\MSBuild.exe"
+if not exist %MSBUILDPATH% (
+	echo Could not find MSBuild. Make sure you have Visual Studio 2017 installed
 	goto end
 )
-
-rem Find msbuild
-for /f "skip=2 tokens=2,*" %%a in ('reg query %MSBUILD_REG_KEY% /v %MSBUILD_REG_SUBKEY%') do set MSBUILDPATH="%%bmsbuild.exe"
 echo Found MSBuild at: %MSBUILDPATH%
 
 rem Start compiling
diff --git a/win-create-projects.bat b/win-create-projects.bat
@@ -4,7 +4,7 @@ rem Update CEF eventually
 utils\premake5 install_cef
 
 rem Generate solutions
-utils\premake5 vs2015
+utils\premake5 vs2017
 
 rem Create a shortcut to the solution - http://superuser.com/questions/392061/how-to-make-a-shortcut-from-cmd
 set SCRIPTFILE="%TEMP%\CreateMyShortcut.vbs"

Original file line number	Diff line number	Diff line change
`@@ -489,6 +489,7 @@ namespace SharedUtil`
`489`	`489`	`return c;`
`490`	`490`	`}`
`491`	`491`
	`492`	`+#ifdef SDK_WITH_BCRYPT`
`492`	`493`	`constexpr const std::size_t HashBufferSize = 60 + 1;`
`493`	`494`	`SString BcryptHash(const SString& password, SString salt, std::size_t cost)`
`494`	`495`	`{`
`@@ -525,7 +526,7 @@ namespace SharedUtil`
`525`	`526`
`526`	`527`	`return strcmp(checkedHashBuffer, hash.c_str()) == 0;`
`527`	`528`	`}`
`528`		`-`
	`529`	`+#endif`
`529`	`530`
`530`	`531`	`SString ConvertDataToHexString( const void* pData, uint uiLength )`
`531`	`532`	`{`