From b2fd91ee6b391b36a8b2d88d818fe370798238e8 Mon Sep 17 00:00:00 2001 From: Tycho Date: Sat, 25 Jan 2014 05:25:43 -0800 Subject: [PATCH 1/3] Reformatted Bindings Dependecies --- src/CMakeLists.txt | 86 +++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51182d3bc..4058c1873 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,34 +16,64 @@ if (NOT MSVC) #lib dependecies are not included - set(BINDING_DEPENDECIES ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} ChunkDef.h BiomeDef.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} OSSupport/File.h Bindings/LuaFunctions.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Bindings/PluginManager.h Bindings/Plugin.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Bindings/PluginLua.h Bindings/WebPlugin.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Bindings/LuaWindow.h BlockID.h StringUtils.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Defines.h ChatColor.h ClientHandle.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Entities/Entity.h Entities/Floater.h ) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Entities/Pawn.h Entities/Player.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Entities/Pickup.h Entities/ProjectileEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Entities/TNTEntity.h Entities/Effects.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Server.h World.h Inventory.h Enchantments.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Item.h ItemGrid.h BlockEntities/BlockEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/BlockEntityWithItems.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/ChestEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/DropSpenserEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/DispenserEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/DropperEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/FurnaceEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/HopperEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/JukeboxEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/NoteEntity.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockEntities/SignEntity.h WebAdmin.h Root.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Vector3f.h Vector3d.h Vector3i.h Matrix4f.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} Cuboid.h BoundingBox.h Tracer.h Group.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} BlockArea.h Generating/ChunkDesc.h) - set(BINDING_DEPENDECIES ${BINDING_DEPENDECIES} CraftingRecipes.h UI/Window.h Mobs/Monster.h) + set(BINDING_DEPENDECIES + ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/virtual_method_hooks.lua + ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/AllToLua.pkg + ChunkDef.h + BiomeDef.h + OSSupport/File.h + Bindings/LuaFunctions.h + Bindings/PluginManager.h + Bindings/Plugin.h + Bindings/PluginLua.h + Bindings/WebPlugin.h + Bindings/LuaWindow.h + BlockID.h + StringUtils.h + Defines.h + ChatColor.h + ClientHandle.h + Entities/Entity.h + Entities/Floater.h + Entities/Pawn.h + Entities/Player.h + Entities/Pickup.h + Entities/ProjectileEntity.h + Entities/TNTEntity.h + Entities/Effects.h + Server.h + World.h + Inventory.h + Enchantments.h + Item.h + ItemGrid.h + BlockEntities/BlockEntity.h + BlockEntities/BlockEntityWithItems.h + BlockEntities/ChestEntity.h + BlockEntities/DropSpenserEntity.h + BlockEntities/DispenserEntity.h + BlockEntities/DropperEntity.h + BlockEntities/FurnaceEntity.h + BlockEntities/HopperEntity.h + BlockEntities/JukeboxEntity.h + BlockEntities/NoteEntity.h + BlockEntities/SignEntity.h + WebAdmin.h + Root.h + Vector3f.h + Vector3d.h + Vector3i.h + Matrix4f.h + Cuboid.h + BoundingBox.h + Tracer.h + Group.h + BlockArea.h + Generating/ChunkDesc.h + CraftingRecipes.h + UI/Window.h + Mobs/Monster.h + ) include_directories(Bindings) include_directories(.) From 45bc1ff033271bc0c6a9e5931a00c554e065c375 Mon Sep 17 00:00:00 2001 From: Tycho Date: Sat, 25 Jan 2014 05:35:04 -0800 Subject: [PATCH 2/3] Added dependecy output to Bindings/BindingsDependencies.txt --- .gitignore | 1 + src/CMakeLists.txt | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index a108a9ece..923735d25 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,7 @@ install_mainfest.txt src/MCServer lib/tolua++/tolua src/Bindings/Bindings.* +src/Bindings/BindingsDependecies.txt MCServer.dir/ #win32 cmake stuff diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4058c1873..9d03a4ffa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -94,6 +94,13 @@ if (NOT MSVC) target_link_libraries(Bindings lua sqlite tolualib) + #clear file + file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt) + foreach(dependecy ${BINDING_DEPENDECIES}) + #write each dependecy on a seperate line + file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt "${dependecy}\n") + endforeach() + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h") foreach(folder ${FOLDERS}) From cb7c5a6181cd17485c518dd18b82d72af933e7bd Mon Sep 17 00:00:00 2001 From: Tycho Date: Sat, 25 Jan 2014 05:37:19 -0800 Subject: [PATCH 3/3] Simplified .gitignore --- .gitignore | 60 +++++------------------------------------------------- 1 file changed, 5 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 923735d25..007b21519 100644 --- a/.gitignore +++ b/.gitignore @@ -71,58 +71,8 @@ MCServer.dir/ #cmake output folders ZERO_CHECK.dir/ -lib/cryptopp/Debug/ -lib/cryptopp/DebugProfile/ -lib/cryptopp/Release/ -lib/cryptopp/ReleaseProfile/ -lib/cryptopp/cryptopp.dir/ -lib/expat/Debug/ -lib/expat/DebugProfile/ -lib/expat/Release/ -lib/expat/ReleaseProfile/ -lib/expat/expat.dir/ -lib/inifile/Debug/ -lib/inifile/DebugProfile/ -lib/inifile/Release/ -lib/inifile/ReleaseProfile/ -lib/inifile/inifile.dir/ -lib/jsoncpp/Debug/ -lib/jsoncpp/DebugProfile/ -lib/jsoncpp/Release/ -lib/jsoncpp/ReleaseProfile/ -lib/jsoncpp/jsoncpp.dir/ -lib/lua/Debug/ -lib/lua/DebugProfile/ -lib/lua/Release/ -lib/lua/ReleaseProfile/ -lib/lua/lua.dir/ -lib/luaexpat/Debug/ -lib/luaexpat/DebugProfile/ -lib/luaexpat/Release/ -lib/luaexpat/ReleaseProfile/ -lib/luaexpat/luaexpat.dir/ -lib/md5/Debug/ -lib/md5/DebugProfile/ -lib/md5/Release/ -lib/md5/ReleaseProfile/ -lib/md5/md5.dir/ -lib/sqlite/Debug/ -lib/sqlite/DebugProfile/ -lib/sqlite/Release/ -lib/sqlite/ReleaseProfile/ -lib/sqlite/sqlite.dir/ -lib/tolua++/Debug/ -lib/tolua++/DebugProfile/ -lib/tolua++/Release/ -lib/tolua++/ReleaseProfile/ -lib/tolua++/tolua.dir/ -lib/tolua++/tolualib.dir/ -lib/zlib/Debug/ -lib/zlib/DebugProfile/ -lib/zlib/Release/ -lib/zlib/ReleaseProfile/ -lib/zlib/zlib.dir/ -src/Debug/ -src/DebugProfile/ -src/Release/ -src/ReleaseProfile/ +Debug/ +DebugProfile/ +Release/ +ReleaseProfile/ +*.dir/