From dca92f40ef4754e438ab1d137a11d9c9c2afe642 Mon Sep 17 00:00:00 2001 From: tkdrg Date: Mon, 24 Nov 2014 23:26:46 -0300 Subject: [PATCH] Adds an easy way to install the map merge driver Fix the mapmerger bat paths --- tools/mapmerge/clean_map.bat | 4 ++-- tools/mapmerge/install.txt | 4 +++- tools/mapmerge/install_driver.bat | 7 +++++++ tools/mapmerge/prepare_map.bat | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 tools/mapmerge/install_driver.bat diff --git a/tools/mapmerge/clean_map.bat b/tools/mapmerge/clean_map.bat index b08192ba590..ab0cd4ea2ec 100644 --- a/tools/mapmerge/clean_map.bat +++ b/tools/mapmerge/clean_map.bat @@ -1,5 +1,5 @@ -set MAPFILE=tgstation.2.1.3.dmm +set MAPFILE=TgStation/tgstation.2.1.3.dmm java -jar MapPatcher.jar -clean ../../_maps/map_files/%MAPFILE%.backup ../../_maps/map_files/%MAPFILE% ../../_maps/map_files/%MAPFILE% -pause \ No newline at end of file +pause diff --git a/tools/mapmerge/install.txt b/tools/mapmerge/install.txt index 713bf23720e..c225e68d706 100644 --- a/tools/mapmerge/install.txt +++ b/tools/mapmerge/install.txt @@ -8,7 +8,9 @@ Committing This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request. Merging -The easiest way to do merging is to install the merge driver. For this, open -tg-station/.git/config in a text editor, and paste the following lines to the end of it: +The easiest way to do merging is to install the merge driver. For this, you can just double-click "install_driver.bat" in the tools/mapmerge/ directory. + +Alternatively, open -tg-station/.git/config in a text editor, and paste the following lines to the end of it: [merge "merge-dmm"] name = mapmerge driver diff --git a/tools/mapmerge/install_driver.bat b/tools/mapmerge/install_driver.bat new file mode 100644 index 00000000000..fa04dddff55 --- /dev/null +++ b/tools/mapmerge/install_driver.bat @@ -0,0 +1,7 @@ +@echo off +echo. >> ../../.git/config +echo [merge "merge-dmm"] >> ../../.git/config +echo name = mapmerge driver >> ../../.git/config +echo driver = ./tools/mapmerge/mapmerge.sh %O %A %B >> ../../.git/config +echo. >> ../../.git/config + diff --git a/tools/mapmerge/prepare_map.bat b/tools/mapmerge/prepare_map.bat index af19b778fe4..d0d67489e82 100644 --- a/tools/mapmerge/prepare_map.bat +++ b/tools/mapmerge/prepare_map.bat @@ -1,4 +1,4 @@ -set MAPFILE=tgstation.2.1.3.dmm +set MAPFILE=TgStation/tgstation.2.1.3.dmm cd ../../_maps/map_files copy %MAPFILE% %MAPFILE%.backup