Folding build_tools back into the main repo for simplicity.

ainex-project · Dec 31, 2015 · 952d359 · 952d359
1 parent 214532a
commit 952d359
Show file tree

Hide file tree

Showing 47 changed files with 6,903 additions and 82 deletions.
diff --git a/.gitignore b/.gitignore
@@ -76,26 +76,20 @@ node_modules/**/build/
 node_modules/.bin/
 
 # coverage/etc
-scratch/
+/scratch/
 
-.anvil-cache
-.build-cache/
-build/
-build-out/
-build-gen/
-build-bin/
-build-test/
+/build/
 
 # ==============================================================================
 # Local-only paths
 # ==============================================================================
 
 .vagrant
-attic/
-content/
-third_party/binutils/binutils-2.24.tar.gz
-third_party/binutils/bin/
-third_party/binutils/powerpc-none-elf/
-third_party/binutils/share/
-third_party/binutils/binutils*
-third_party/vasm/
+/attic/
+/content/
+/third_party/binutils/binutils-2.24.tar.gz
+/third_party/binutils/bin/
+/third_party/binutils/powerpc-none-elf/
+/third_party/binutils/share/
+/third_party/binutils/binutils*
+/third_party/vasm/
diff --git a/.gitmodules b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "third_party/capstone"]
 	path = third_party/capstone
 	url = https://github.com/xenia-project/capstone.git
-[submodule "build_tools"]
-	path = build_tools
-	url = https://github.com/xenia-project/build-tools.git
 [submodule "third_party/libav"]
 	path = third_party/libav
 	url = https://github.com/xenia-project/libav.git
@@ -22,3 +19,12 @@
 [submodule "third_party/spirv-tools"]
 	path = third_party/spirv-tools
 	url = https://github.com/xenia-project/SPIRV-Tools.git
+[submodule "third_party/catch"]
+	path = third_party/catch
+	url = https://github.com/philsquared/Catch.git
+[submodule "third_party/gflags"]
+	path = third_party/gflags
+	url = https://github.com/benvanik/gflags.git
+[submodule "third_party/premake-core"]
+	path = third_party/premake-core
+	url = https://github.com/premake/premake-core.git
diff --git a/build_tools b/build_tools
diff --git a/premake5.lua b/premake5.lua
@@ -1,4 +1,4 @@
-include("build_tools")
+include("tools/build")
 
 location(build_root)
 targetdir(build_bin)
@@ -159,13 +159,13 @@ solution("xenia")
 
   -- Include third party files first so they don't have to deal with gflags.
   include("third_party/capstone.lua")
+  include("third_party/gflags.lua")
   include("third_party/glew.lua")
   include("third_party/imgui.lua")
   include("third_party/libav.lua")
   include("third_party/spirv-tools.lua")
   include("third_party/xxhash.lua")
   include("third_party/zlib.lua")
-  include("build_tools/third_party/gflags.lua")
 
   include("src/xenia")
   include("src/xenia/app")

diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-app")
@@ -32,7 +32,7 @@ project("xenia-app")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
   files({

diff --git a/src/xenia/apu/nop/premake5.lua b/src/xenia/apu/nop/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-apu-nop")
@@ -13,6 +13,6 @@ project("xenia-apu-nop")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/apu/premake5.lua b/src/xenia/apu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-apu")
@@ -14,7 +14,7 @@ project("xenia-apu")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
     project_root.."/third_party/libav/",
   })
   local_platform_files()
diff --git a/src/xenia/apu/xaudio2/premake5.lua b/src/xenia/apu/xaudio2/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-apu-xaudio2")
@@ -13,6 +13,6 @@ project("xenia-apu-xaudio2")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/base/premake5.lua b/src/xenia/base/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 project("xenia-base")
   uuid("aeadaf22-2b20-4941-b05f-a802d5679c11")
@@ -8,7 +8,7 @@ project("xenia-base")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
   removefiles({"main_*.cc"})
@@ -18,7 +18,7 @@ project("xenia-base")
 
 test_suite("xenia-base-tests", project_root, ".", {
   includedirs = {
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   },
   links = {
     "xenia-base",

diff --git a/src/xenia/cpu/backend/x64/premake5.lua b/src/xenia/cpu/backend/x64/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-cpu-backend-x64")
@@ -21,6 +21,6 @@ project("xenia-cpu-backend-x64")
   })
   includedirs({
     project_root.."/third_party/capstone/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/cpu/ppc/testing/instr_divdu.s b/src/xenia/cpu/ppc/testing/instr_divdu.s
@@ -178,6 +178,6 @@ test_divdu_11:
   #_ REGISTER_IN r3 0xFFFFFFFF
   divdu. r0, r0, r3
   blr
-  #_ REGISTER_OUT r0 0xFFFFFFFF
+  #_ REGISTER_OUT r0 0
   #_ REGISTER_OUT r3 0xFFFFFFFF
   #_ REGISTER_OUT cr 0x0000000020000000
diff --git a/src/xenia/cpu/ppc/testing/premake5.lua b/src/xenia/cpu/ppc/testing/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("tests")
 project("xenia-cpu-ppc-tests")
@@ -25,7 +25,7 @@ project("xenia-cpu-ppc-tests")
     "*.s",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   filter("files:*.s")
     flags({"ExcludeFromBuild"})

diff --git a/src/xenia/cpu/premake5.lua b/src/xenia/cpu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-cpu")
@@ -11,7 +11,7 @@ project("xenia-cpu")
   })
   includedirs({
     project_root.."/third_party/llvm/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
   local_platform_files("backend")

diff --git a/src/xenia/cpu/testing/premake5.lua b/src/xenia/cpu/testing/premake5.lua
@@ -1,9 +1,9 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 test_suite("xenia-cpu-tests", project_root, ".", {
   includedirs = {
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   },
   links = {
     "xenia-base",

diff --git a/src/xenia/debug/premake5.lua b/src/xenia/debug/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-debug")
@@ -13,6 +13,6 @@ project("xenia-debug")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/debug/ui/premake5.lua b/src/xenia/debug/ui/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-debug-ui")
@@ -20,6 +20,6 @@ project("xenia-debug-ui")
     "GLEW_MX=1",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/gpu/gl4/premake5.lua b/src/xenia/gpu/gl4/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-gpu-gl4")
@@ -19,7 +19,7 @@ project("xenia-gpu-gl4")
     "GLEW_MX=1",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
 
@@ -59,7 +59,7 @@ project("xenia-gpu-gl4-trace-viewer")
     "GLEW_MX=1",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   files({
     "gl4_trace_viewer_main.cc",
@@ -110,7 +110,7 @@ project("xenia-gpu-gl4-trace-dump")
     "GLEW_MX=1",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   files({
     "gl4_trace_dump_main.cc",

diff --git a/src/xenia/gpu/premake5.lua b/src/xenia/gpu/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-gpu")
@@ -18,7 +18,7 @@ project("xenia-gpu")
   })
   includedirs({
     project_root.."/third_party/spirv-tools/external/include",
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
 
@@ -37,7 +37,7 @@ project("xenia-gpu-shader-compiler")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   files({
     "shader_compiler_main.cc",

diff --git a/src/xenia/hid/nop/premake5.lua b/src/xenia/hid/nop/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-hid-nop")
@@ -13,6 +13,6 @@ project("xenia-hid-nop")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-hid")
@@ -12,7 +12,7 @@ project("xenia-hid")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
   removefiles({"*_demo.cc"})
@@ -40,7 +40,7 @@ project("xenia-hid-demo")
     "GLEW_MX=1",
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   files({
     "hid_demo.cc",

diff --git a/src/xenia/hid/winkey/premake5.lua b/src/xenia/hid/winkey/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-hid-winkey")
@@ -14,6 +14,6 @@ project("xenia-hid-winkey")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()
diff --git a/src/xenia/hid/xinput/premake5.lua b/src/xenia/hid/xinput/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-hid-xinput")
@@ -13,6 +13,6 @@ project("xenia-hid-xinput")
   defines({
   })
   includedirs({
-    project_root.."/build_tools/third_party/gflags/src",
+    project_root.."/third_party/gflags/src",
   })
   local_platform_files()