Permalink
Browse files

Folding build_tools back into the main repo for simplicity.

  • Loading branch information...
1 parent 214532a commit 952d35911c54876c8650bedc0664c84b639f4cbb @benvanik committed Dec 31, 2015
Showing with 6,903 additions and 82 deletions.
  1. +10 −16 .gitignore
  2. +9 −3 .gitmodules
  3. +0 −1 build_tools
  4. +2 −2 premake5.lua
  5. +2 −2 src/xenia/app/premake5.lua
  6. +2 −2 src/xenia/apu/nop/premake5.lua
  7. +2 −2 src/xenia/apu/premake5.lua
  8. +2 −2 src/xenia/apu/xaudio2/premake5.lua
  9. +3 −3 src/xenia/base/premake5.lua
  10. +2 −2 src/xenia/cpu/backend/x64/premake5.lua
  11. +1 −1 src/xenia/cpu/ppc/testing/instr_divdu.s
  12. +2 −2 src/xenia/cpu/ppc/testing/premake5.lua
  13. +2 −2 src/xenia/cpu/premake5.lua
  14. +2 −2 src/xenia/cpu/testing/premake5.lua
  15. +2 −2 src/xenia/debug/premake5.lua
  16. +2 −2 src/xenia/debug/ui/premake5.lua
  17. +4 −4 src/xenia/gpu/gl4/premake5.lua
  18. +3 −3 src/xenia/gpu/premake5.lua
  19. +2 −2 src/xenia/hid/nop/premake5.lua
  20. +3 −3 src/xenia/hid/premake5.lua
  21. +2 −2 src/xenia/hid/winkey/premake5.lua
  22. +2 −2 src/xenia/hid/xinput/premake5.lua
  23. +2 −2 src/xenia/kernel/premake5.lua
  24. +2 −2 src/xenia/premake5.lua
  25. +3 −3 src/xenia/ui/gl/premake5.lua
  26. +2 −2 src/xenia/ui/premake5.lua
  27. +2 −2 src/xenia/ui/spirv/premake5.lua
  28. +2 −2 src/xenia/vfs/premake5.lua
  29. +1 −0 third_party/catch
  30. +120 −0 third_party/clang-format/clang-format-diff.py
  31. +58 −0 third_party/clang-format/clang-format-sublime.py
  32. +484 −0 third_party/clang-format/git-clang-format
  33. +1 −0 third_party/gflags
  34. +41 −0 third_party/gflags.lua
  35. +45 −0 third_party/google-styleguide/cpplint/README
  36. +5,620 −0 third_party/google-styleguide/cpplint/cpplint.py
  37. +1 −0 third_party/premake-core
  38. +162 −0 tools/build/premake
  39. +5 −0 tools/build/premake5.lua
  40. +10 −0 tools/build/scripts/build_paths.lua
  41. +28 −0 tools/build/scripts/force_compile_as_c.lua
  42. +28 −0 tools/build/scripts/force_compile_as_cc.lua
  43. +41 −0 tools/build/scripts/platform_files.lua
  44. +75 −0 tools/build/scripts/test_suite.lua
  45. +50 −0 tools/build/scripts/util.lua
  46. +53 −0 tools/build/src/test_suite_main.cc
  47. +6 −7 xenia-build
View
@@ -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/
View
@@ -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
Submodule build_tools deleted from 8b40c4
View
@@ -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")
@@ -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({
@@ -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()
@@ -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()
@@ -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()
@@ -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",
@@ -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()
@@ -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
@@ -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"})
@@ -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")
@@ -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",
@@ -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()
@@ -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()
@@ -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",
@@ -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",
@@ -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()
@@ -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",
@@ -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()
@@ -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()
Oops, something went wrong.

0 comments on commit 952d359

Please sign in to comment.