Ticket #3729: 3729.diff

build/premake/cxxtest/cxxtest.lua

@@ +1 @@
+local m = {}
+m._VERSION = "0.0.0-dev"
+
+m.path = nil
+
+function m.configure_project(rootfile, hdrfiles, rootoptions, testoptions)
+    if rootoptions == nil then
+        rootoptions = ''
+    end
+    if testoptions == nil then
+        testoptions = ''
+    end
+    local cmds = {}
+    local abspath = path.getabsolute(m.path)
+
+    for _,hdrfile in ipairs(hdrfiles) do
+        hdrfile = path.getabsolute(hdrfile)
+        local srcfile = string.sub(hdrfile, 1, -3) .. ".cpp"
+        files { hdrfile, srcfile }
+        table.insert(cmds, abspath .. " --part " .. testoptions .. " -o " .. srcfile .. " " .. hdrfile)
+    end
+    rootfile = path.getabsolute(rootfile)
+    files { rootfile }
+    table.insert(cmds, abspath .. " --root " .. rootoptions .. " -o " .. rootfile)
+    prebuildcommands {cmds}
+end
+
+cxxtest = m
+return m

build/premake/extern_libs.lua

@@ -77 +77 @@
         result_libs = string.gsub(result_libs, ",", " ")
         result_libs = string.gsub(result_libs, "\n", "")
         linkoptions { result_libs }
-    elseif _ACTION == "gmake" then  
+    elseif _ACTION == "gmake" then
         gnuexternals { "`"..cmd_libs.."`" }
     else
         linkoptions { "`"..cmd_libs.."`" }
@@ -109 +109 @@
         local dbg_cmd = "/DELAYLOAD:" .. name .. suffix .. ".dll"
         local cmd     = "/DELAYLOAD:" .. name .. ".dll"
 
-        configuration "Debug"
+        filter "Debug"
             linkoptions { dbg_cmd }
-        configuration "Release"
+        filter "Release"
             linkoptions { cmd }
-        configuration { }
+        filter { }
     end
 
 end
@@ -158 +158 @@
         end
     else
         for i,name in pairs(names) do
-            configuration "Debug"
+            filter "Debug"
                 links { name .. suffix }
-            configuration "Release"
+            filter "Release"
                 links { name }
-            configuration { }
+            filter { }
 
             add_delayload(name, suffix, def)
         end
@@ -290 +290 @@
         link_settings = function()
             add_source_lib_paths("fcollada")
             if os.is("windows") then
-                configuration "Debug"
+                filter "Debug"
                     links { "FColladaD" }
-                configuration "Release"
+                filter "Release"
                     links { "FCollada" }
-                configuration { }
+                filter { }
             else
-                configuration "Debug"
+                filter "Debug"
                     links { "FColladaSD" }
-                configuration "Release"
+                filter "Release"
                     links { "FColladaSR" }
-                configuration { }
+                filter { }
             end
         end,
     },
@@ -483 +483 @@
         link_settings = function()
             if os.is("windows") then
                 add_default_lib_paths("libxml2")
-                configuration "Debug"
+                filter "Debug"
                     links { "libxml2" }
-                configuration "Release"
+                filter "Release"
                     links { "libxml2" }
-                configuration { }
+                filter { }
             elseif os.is("macosx") then
                 xml2_config_path = os.getenv("XML2_CONFIG")
                 if not xml2_config_path then
@@ -618 +618 @@
                 else
                     include_dir = "include-unix"
                 end
-                configuration "Debug"
+                filter "Debug"
                     includedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-debug" }
                     defines { "DEBUG" }
-                configuration "Release"
+                filter "Release"
                     includedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-release" }
-                configuration { }
+                filter { }
             end
         end,
         link_settings = function()
@@ -639 +639 @@
                     add_default_lib_paths("nspr")
                     links { "nspr4", "plc4", "plds4" }
                 end
-                configuration "Debug"
+                filter "Debug"
                     links { "mozjs31-ps-debug" }
-                configuration "Release"
+                filter "Release"
                     links { "mozjs31-ps-release" }
-                configuration { }
+                filter { }
                 add_source_lib_paths("spidermonkey")
             end
         end,

build/premake/premake5.lua

@@ -33 +33 @@
 -- Root directory of project checkout relative to this .lua file
 rootdir = "../.."
 
-dofile("extern_libs4.lua")
+dofile("extern_libs5.lua")
 
 -- detect compiler for non-Windows
 if os.is("macosx") then
@@ -93 +93 @@
     end
 end
 
--- Set up the Solution
-solution "pyrogenesis"
+-- Set up the Workspace
+workspace "pyrogenesis"
 targetdir(rootdir.."/binaries/system")
 libdirs(rootdir.."/binaries/system")
 if not _OPTIONS["outpath"] then
@@ -105 +105 @@
 
 -- Get some environement specific information used later.
 if os.is("windows") then
-    nasmpath(rootdir.."/build/bin/nasm.exe")
     lcxxtestpath = rootdir.."/build/bin/cxxtestgen.exe"
 else
 
@@ -142 +141 @@
 
     local obj_dir_prefix = _OPTIONS["outpath"].."/obj/"..project_name.."_"
 
-    configuration "Debug"
+    filter "Debug"
         objdir(obj_dir_prefix.."Debug")
         targetsuffix("_dbg")
 
-    configuration "Release"
+    filter "Release"
         objdir(obj_dir_prefix.."Release")
 
-    configuration { }
+    filter { }
 
 end
 
@@ -156 +155 @@
 
 function project_set_build_flags()
 
-    flags { "NoEditAndContinue" }
+    editandcontinue "Off"
 
     if not _OPTIONS["minimal-flags"] then
         flags { "Symbols" }
@@ -164 +163 @@
 
     if cc ~= "icc" and (os.is("windows") or not _OPTIONS["minimal-flags"]) then
         -- adds the -Wall compiler flag
-        flags { "ExtraWarnings" } -- this causes far too many warnings/remarks on ICC
+        warnings "Extra" -- this causes far too many warnings/remarks on ICC
     end
 
     -- disable Windows debug heap, since it makes malloc/free hugely slower when
     -- running inside a debugger
-    if os.is("windows") then
-        flags { "NoDebugHeap" }
-    end
+    -- if os.is("windows") then
+    --  flags { "NoDebugHeap" }
+    -- end
 
-    configuration "Debug"
+    filter "Debug"
         defines { "DEBUG" }
 
-    configuration "Release"
+    filter "Release"
         if os.is("windows") or not _OPTIONS["minimal-flags"] then
-            flags { "OptimizeSpeed" }
+            optimize "Speed"
         end
         defines { "NDEBUG", "CONFIG_FINAL=1" }
 
-    configuration { }
+    filter { }
 
     if _OPTIONS["gles"] then
         defines { "CONFIG2_GLES=1" }
@@ -212 +211 @@
     if os.is("windows") then
 
         -- use native wchar_t type (not typedef to unsigned short)
-        flags { "NativeWChar" }
+        nativewchar "on"
 
     else    -- *nix
 
-        -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the 
+        -- TODO, FIXME: This check is incorrect because it means that some additional flags will be added inside the "else" branch if the
         -- compiler is ICC and minimal-flags is specified (ticket: #2994)
         if cc == "icc" and not _OPTIONS["minimal-flags"] then
             buildoptions {
@@ -231 +230 @@
                 "-Wunused-function",
                 "-wd1292" -- avoid lots of 'attribute "__nonnull__" ignored'
             }
-            configuration "Debug"
+            filter "Debug"
                 buildoptions { "-O0" } -- ICC defaults to -O2
-            configuration { }
+            filter { }
             if os.is("macosx") then
                 linkoptions { "-multiply_defined","suppress" }
             end
@@ -296 +295 @@
                     }
                 end
             end
-            
+
             buildoptions {
                 -- Enable C++11 standard.
                 "-std=c++0x"
@@ -379 +378 @@
 
                 -- Adding the executable path and taking care of correct escaping
                 if _ACTION == "gmake" then
-                    linkoptions { "-Wl,-rpath,'$$ORIGIN'" } 
+                    linkoptions { "-Wl,-rpath,'$$ORIGIN'" }
                 elseif _ACTION == "codeblocks" then
                     linkoptions { "-Wl,-R\\\\$$$ORIGIN" }
                 end
@@ -474 +473 @@
     -- * precompiled.cpp (needed to "Create" the PCH) also goes in
     --   the abovementioned dir.
     if (not _OPTIONS["without-pch"] and not extra_params["no_pch"]) then
-        pchheader(pch_dir.."precompiled.h")
+        pchheader("precompiled.h") -- this has to match the #include line for VS
         pchsource(pch_dir.."precompiled.cpp")
         defines { "USING_PCH" }
         files { pch_dir.."precompiled.h", pch_dir.."precompiled.cpp" }
@@ -545 +544 @@
     end
 
     if os.is("windows") then
-        flags { "NoRTTI" }
+        rtti "off"
     end
 end
 
@@ -568 +567 @@
     end
 
     if os.is("windows") then
-        flags { "NoRTTI" }
+        rtti "off"
         links { "delayimp" }
     end
 end
@@ -607 +606 @@
         "boost",
     }
     setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
-    
+
     -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
     if _ACTION == "vs2013" then
-        buildoptions { 
+        buildoptions {
             "/wd4127",
             "/wd4309",
             "/wd4800",
@@ -730 +729 @@
         "icu",
         "iconv",
     }
-    
+
     if not _OPTIONS["without-audio"] then
         table.insert(extern_libs, "openal")
         table.insert(extern_libs, "vorbis")
     end
-    
+
     setup_static_lib_project("engine", source_dirs, extern_libs, {})
 
 
@@ -844 +843 @@
     for i,v in pairs(sysdep_dirs[os.get()]) do
         table.insert(source_dirs, v);
     end
-    
+
     if os.is("linux") then
         if _OPTIONS["android"] then
             table.insert(source_dirs, "lib/sysdep/os/android")
@@ -963 +962 @@
         -- from "lowlevel" static lib; must be added here to be linked in
         files { source_root.."lib/sysdep/os/win/error_dialog.rc" }
 
-        flags { "NoRTTI" }
+        rtti "off"
 
         linkoptions {
             -- wraps main thread in a __try block(see wseh.cpp). replace with mainCRTStartup if that's undesired.
@@ -1011 +1010 @@
         end
 
         -- For debug_resolve_symbol
-        configuration "Debug"
+        filter "Debug"
             linkoptions { "-rdynamic" }
-        configuration { }
+        filter { }
 
     elseif os.is("macosx") then
 
@@ -1065 +1064 @@
         if target_type == "SharedLib" then
             if _OPTIONS["macosx-bundle"] then
                 -- If we're building a bundle, it will be in ../Frameworks
-                configuration "Debug"
+                filter "Debug"
                     linkoptions { "-install_name @executable_path/../Frameworks/lib"..project_name.."_dbg.dylib" }
-                configuration "Release"
+                filter "Release"
                     linkoptions { "-install_name @executable_path/../Frameworks/lib"..project_name..".dylib" }
-                configuration { }
+                filter { }
             else
-                configuration "Debug"
+                filter "Debug"
                     linkoptions { "-install_name @executable_path/lib"..project_name.."_dbg.dylib" }
-                configuration "Release"
+                filter "Release"
                     linkoptions { "-install_name @executable_path/lib"..project_name..".dylib" }
-                configuration { }
+                filter { }
             end
         end
     end
@@ -1090 +1089 @@
     {   -- src
         ".",
         "../../../third_party/jsonspirit"
-        
+
     },{ -- include
         "../../../third_party/jsonspirit"
     },{ -- extern_libs
@@ -1187 +1186 @@
 
         -- required to use WinMain() on Windows, otherwise will default to main()
         flags { "WinMain" }
-        
+
         -- see manifest.cpp
         project_add_manifest()
 
@@ -1303 +1302 @@
 -- If no customizations are implemented for a specific action (e.g. vs2013), passing the
 -- parameters won't have any effects.
 function configure_cxxtestgen()
-
     local lcxxtestrootfile = source_root.."test_root.cpp"
-    files { lcxxtestrootfile }
 
     -- Define the options used for cxxtestgen
     local lcxxtestoptions = "--have-std"
@@ -1326 +1323 @@
     lcxxtestrootoptions = lcxxtestrootoptions .. include
     lcxxtestoptions = lcxxtestoptions .. include
 
-    -- Set all the parameters used in our cxxtestgen customization in premake.
-    cxxtestrootfile(lcxxtestrootfile)
-    cxxtestpath(lcxxtestpath)
-    cxxtestrootoptions(lcxxtestrootoptions)
-    cxxtestoptions(lcxxtestoptions)
-
-    -- The file paths needs to be made relative to the project directory for the prebuildcommands.
-    -- premake's paths are relative to premake4.lua by default.
-    lcxxtestrootfile = path.rebase(lcxxtestrootfile, path.getabsolute("."), _OPTIONS["outpath"])
-    lcxxtestpath = path.rebase(lcxxtestpath, path.getabsolute("."), _OPTIONS["outpath"])
-
-    -- On windows we have to use backlashes in our paths. We don't have to take care
-    -- of that for the parameters passed to our cxxtestgen customizations.
-    if os.is("windows") then
-        lcxxtestrootfile = path.translate(lcxxtestrootfile, "\\")
-        lcxxtestpath = path.translate(lcxxtestpath, "\\")
-    end
-
-    if _ACTION ~= "gmake" and _ACTION ~= "vs2013" then
-        prebuildcommands { lcxxtestpath.." --root "..lcxxtestrootoptions.." -o "..lcxxtestrootfile }
-    end
-
     -- Find header files in 'test' subdirectories
     local all_files = os.matchfiles(source_root .. "**/tests/*.h")
+    local test_files = {}
     for i,v in pairs(all_files) do
         -- Don't include sysdep tests on the wrong sys
         -- Don't include Atlas tests unless Atlas is being built
@@ -1357 +1333 @@
            not (string.find(v, "/tools/atlas/") and not _OPTIONS["atlas"]) and
            not (string.find(v, "/sysdep/arch/x86_x64/") and ((arch ~= "amd64") or (arch ~= "x86")))
         then
-            local src_file = string.sub(v, 1, -3) .. ".cpp"
-            cxxtestsrcfiles { src_file }
-            files { src_file }
-            cxxtesthdrfiles { v }
-
-            if _ACTION ~= "gmake" and _ACTION ~= "vs2013" then
-                -- see detailed comment above.
-                src_file = path.rebase(src_file, path.getabsolute("."), _OPTIONS["outpath"])
-                v = path.rebase(v, path.getabsolute("."), _OPTIONS["outpath"])
-
-                if os.is("windows") then
-                    src_file = path.translate(src_file, "\\")
-                    v = path.translate(v, "\\")
-                end
-                prebuildcommands { lcxxtestpath.." --part "..lcxxtestoptions.." -o "..src_file.." "..v }
-            end
+            table.insert(test_files, v)
         end
+    end
 
-
-    end
+    require "cxxtest"
+    cxxtest.path = lcxxtestpath
+    cxxtest.configure_project(lcxxtestrootfile, test_files, lcxxtestrootoptions, lcxxtestoptions)
 end
 
 
@@ -1388 +1351 @@
     configure_cxxtestgen()
 
     links { static_lib_names }
-    configuration "Debug"
+    filter "Debug"
         links { static_lib_names_debug }
-    configuration "Release"
+    filter "Release"
         links { static_lib_names_release }
-    configuration { }
+    filter { }
 
     links { "mocks_test" }
     if _OPTIONS["atlas"] then
@@ -1414 +1377 @@
         -- from "lowlevel" static lib; must be added here to be linked in
         files { source_root.."lib/sysdep/os/win/error_dialog.rc" }
 
-        flags { "NoRTTI" }
+        rtti "off"
 
         -- see wstartup.h
         linkoptions { "/INCLUDE:_wstartup_InitAndRegisterShutdown" }
@@ -1453 +1416 @@
         end
 
         -- For debug_resolve_symbol
-        configuration "Debug"
+        filter "Debug"
             linkoptions { "-rdynamic" }
-        configuration { }
+        filter { }
 
         includedirs { source_root .. "pch/test/" }
     end
@@ -1474 +1437 @@
 -- work when changing the static lib breakdown.
 project("pyrogenesis") -- Set the main project active
     links { static_lib_names }
-    configuration "Debug"
+    filter "Debug"
         links { static_lib_names_debug }
-    configuration "Release"
+    filter "Release"
         links { static_lib_names_release }
-    configuration { }
+    filter { }
 
 if _OPTIONS["atlas"] then
     setup_atlas_projects()

build/workspaces/update-workspaces.bat

@@ -3 +3 @@
 
 cd ..\premake
 rem ** Support for Visual Studio versions <2013 has been dropped (check #2669).
-if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake4\bin\release\premake4 --outpath="../workspaces/vc2013" --collada --use-shared-glooxwrapper %* vs2013
+if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake5 --outpath="../workspaces/vs2013" --collada --use-shared-glooxwrapper %* vs2013
 cd ..\workspaces

build/workspaces/update-workspaces.sh

@@ -93 +93 @@
   echo
 fi
 
-# Now build premake and run it to create the makefiles
-cd ../premake/premake4
-PREMAKE_BUILD_DIR=build/gmake.unix
-# BSD and OS X need different Makefiles
-case "`uname -s`" in
-  "GNU/kFreeBSD" )
-    # use default gmake.unix (needs -ldl as we have a GNU userland and libc)
-    ;;
-  *"BSD" )
-    PREMAKE_BUILD_DIR=build/gmake.bsd
-    ;;
-  "Darwin" )
-    PREMAKE_BUILD_DIR=build/gmake.macosx
-    ;;
-esac
-${MAKE} -C $PREMAKE_BUILD_DIR ${JOBS} || die "Premake build failed"
+cd ../premake
 
-echo
-
-cd ..
-
 # If we're in bash then make HOSTTYPE available to Premake, for primitive arch-detection
 export HOSTTYPE="$HOSTTYPE"
 
 echo "Premake args: ${premake_args}"
 
-premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
-premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
+premake5 --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
+premake5 --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
 
 # Also generate xcode workspaces if on OS X
 if [ "`uname -s`" = "Darwin" ]; then
-  premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
-  premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
+  premake5 --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
+  premake5 --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
 fi
 
 # test_root.cpp gets generated by cxxtestgen and passing different arguments to premake could require a regeneration of this file.