From dc4dc54912f6d127784a14789ea1369ed87dc7a4 Mon Sep 17 00:00:00 2001 From: expwnent Date: Mon, 21 Sep 2015 19:34:16 -0400 Subject: [PATCH 1/8] Add third party script submodules. --- .gitmodules | 15 +++++++++++++++ scripts/3rdparty/dscorbett | 1 + scripts/3rdparty/kane-t | 1 + scripts/3rdparty/maienm | 1 + scripts/3rdparty/maxthyme | 1 + scripts/3rdparty/roses | 1 + 6 files changed, 20 insertions(+) create mode 160000 scripts/3rdparty/dscorbett create mode 160000 scripts/3rdparty/kane-t create mode 160000 scripts/3rdparty/maienm create mode 160000 scripts/3rdparty/maxthyme create mode 160000 scripts/3rdparty/roses diff --git a/.gitmodules b/.gitmodules index 961850a67..c5e3c1e80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,18 @@ [submodule "scripts/3rdparty/lethosor"] path = scripts/3rdparty/lethosor url = https://github.com/DFHack/lethosor-scripts +[submodule "scripts/3rdparty/roses"] + path = scripts/3rdparty/roses + url = git@github.com:DFHack/roses-scripts.git +[submodule "scripts/3rdparty/maxthyme"] + path = scripts/3rdparty/maxthyme + url = git@github.com:DFHack/maxthyme-scripts.git +[submodule "scripts/3rdparty/dscorbett"] + path = scripts/3rdparty/dscorbett + url = git@github.com:DFHack/dscorbett-scripts.git +[submodule "scripts/3rdparty/kane-t"] + path = scripts/3rdparty/kane-t + url = git@github.com:DFHack/kane-t-scripts.git +[submodule "scripts/3rdparty/maienm"] + path = scripts/3rdparty/maienm + url = git@github.com:DFHack/maienm-scripts.git diff --git a/scripts/3rdparty/dscorbett b/scripts/3rdparty/dscorbett new file mode 160000 index 000000000..b43f95497 --- /dev/null +++ b/scripts/3rdparty/dscorbett @@ -0,0 +1 @@ +Subproject commit b43f954970f399e57be2e722cfcc60eea5e7e8b0 diff --git a/scripts/3rdparty/kane-t b/scripts/3rdparty/kane-t new file mode 160000 index 000000000..35211d522 --- /dev/null +++ b/scripts/3rdparty/kane-t @@ -0,0 +1 @@ +Subproject commit 35211d5227078952e049daf97bb99878897ef13a diff --git a/scripts/3rdparty/maienm b/scripts/3rdparty/maienm new file mode 160000 index 000000000..ca2b0ee92 --- /dev/null +++ b/scripts/3rdparty/maienm @@ -0,0 +1 @@ +Subproject commit ca2b0ee9256721efa9c0b5f76523c8bc2c3075e6 diff --git a/scripts/3rdparty/maxthyme b/scripts/3rdparty/maxthyme new file mode 160000 index 000000000..520147436 --- /dev/null +++ b/scripts/3rdparty/maxthyme @@ -0,0 +1 @@ +Subproject commit 52014743613922a2c9dedfca831e739c6fd77acb diff --git a/scripts/3rdparty/roses b/scripts/3rdparty/roses new file mode 160000 index 000000000..c2e5a6155 --- /dev/null +++ b/scripts/3rdparty/roses @@ -0,0 +1 @@ +Subproject commit c2e5a615524f5d5434a1dbc72e251422e7392d9e From 0568edb6e329f71f12b1bdc47b40b094e72d661a Mon Sep 17 00:00:00 2001 From: expwnent Date: Mon, 21 Sep 2015 19:39:01 -0400 Subject: [PATCH 2/8] Attempt to fix gitmodule remote urls manually. --- .gitmodules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index c5e3c1e80..5915a105b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,19 +15,19 @@ url = git://github.com/DFHack/clsocket.git [submodule "scripts/3rdparty/lethosor"] path = scripts/3rdparty/lethosor - url = https://github.com/DFHack/lethosor-scripts + url = git://github.com/DFHack/lethosor-scripts [submodule "scripts/3rdparty/roses"] path = scripts/3rdparty/roses - url = git@github.com:DFHack/roses-scripts.git + url = git://github.com:DFHack/roses-scripts.git [submodule "scripts/3rdparty/maxthyme"] path = scripts/3rdparty/maxthyme - url = git@github.com:DFHack/maxthyme-scripts.git + url = git://github.com:DFHack/maxthyme-scripts.git [submodule "scripts/3rdparty/dscorbett"] path = scripts/3rdparty/dscorbett - url = git@github.com:DFHack/dscorbett-scripts.git + url = git://github.com:DFHack/dscorbett-scripts.git [submodule "scripts/3rdparty/kane-t"] path = scripts/3rdparty/kane-t - url = git@github.com:DFHack/kane-t-scripts.git + url = git://github.com:DFHack/kane-t-scripts.git [submodule "scripts/3rdparty/maienm"] path = scripts/3rdparty/maienm - url = git@github.com:DFHack/maienm-scripts.git + url = git://github.com:DFHack/maienm-scripts.git From 4190ba32594d81cdf181d2c1d1c32a6d2317e46b Mon Sep 17 00:00:00 2001 From: expwnent Date: Mon, 21 Sep 2015 20:38:31 -0400 Subject: [PATCH 3/8] Fix .gitmodules. --- .gitmodules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5915a105b..ea1822e55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,16 +18,16 @@ url = git://github.com/DFHack/lethosor-scripts [submodule "scripts/3rdparty/roses"] path = scripts/3rdparty/roses - url = git://github.com:DFHack/roses-scripts.git + url = git://github.com/DFHack/roses-scripts.git [submodule "scripts/3rdparty/maxthyme"] path = scripts/3rdparty/maxthyme - url = git://github.com:DFHack/maxthyme-scripts.git + url = git://github.com/DFHack/maxthyme-scripts.git [submodule "scripts/3rdparty/dscorbett"] path = scripts/3rdparty/dscorbett - url = git://github.com:DFHack/dscorbett-scripts.git + url = git://github.com/DFHack/dscorbett-scripts.git [submodule "scripts/3rdparty/kane-t"] path = scripts/3rdparty/kane-t - url = git://github.com:DFHack/kane-t-scripts.git + url = git://github.com/DFHack/kane-t-scripts.git [submodule "scripts/3rdparty/maienm"] path = scripts/3rdparty/maienm - url = git://github.com:DFHack/maienm-scripts.git + url = git://github.com/DFHack/maienm-scripts.git From 5bcff4280011596ab14fd8bb13b73d662ff34845 Mon Sep 17 00:00:00 2001 From: expwnent Date: Wed, 23 Sep 2015 23:46:26 -0400 Subject: [PATCH 4/8] Add third party scripts. --- library/CMakeLists.txt | 12 ++++++------ scripts/3rdparty/dscorbett | 2 +- scripts/3rdparty/kane-t | 2 +- scripts/3rdparty/maienm | 2 +- scripts/3rdparty/maxthyme | 2 +- scripts/3rdparty/roses | 2 +- scripts/CMakeLists.txt | 12 ++++++++++++ 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index e653555f9..1a42718cf 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -372,12 +372,12 @@ install(DIRECTORY lua/ DESTINATION ${DFHACK_LUA_DESTINATION} FILES_MATCHING PATTERN "*.lua") -install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts - DESTINATION ${DFHACK_DATA_DESTINATION} - FILES_MATCHING PATTERN "*.lua" - PATTERN "*.rb" - PATTERN "3rdparty" EXCLUDE - ) +#install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts +# DESTINATION ${DFHACK_DATA_DESTINATION} +# FILES_MATCHING PATTERN "*.lua" +# PATTERN "*.rb" +# PATTERN "3rdparty" EXCLUDE +# ) install(DIRECTORY ${dfhack_SOURCE_DIR}/patches DESTINATION ${DFHACK_DATA_DESTINATION} diff --git a/scripts/3rdparty/dscorbett b/scripts/3rdparty/dscorbett index b43f95497..544f890a6 160000 --- a/scripts/3rdparty/dscorbett +++ b/scripts/3rdparty/dscorbett @@ -1 +1 @@ -Subproject commit b43f954970f399e57be2e722cfcc60eea5e7e8b0 +Subproject commit 544f890a62622e2c6188991afe61fdf3c0513227 diff --git a/scripts/3rdparty/kane-t b/scripts/3rdparty/kane-t index 35211d522..462d68598 160000 --- a/scripts/3rdparty/kane-t +++ b/scripts/3rdparty/kane-t @@ -1 +1 @@ -Subproject commit 35211d5227078952e049daf97bb99878897ef13a +Subproject commit 462d68598a0ddbaca710e07013efbaabe464a695 diff --git a/scripts/3rdparty/maienm b/scripts/3rdparty/maienm index ca2b0ee92..8cffa1266 160000 --- a/scripts/3rdparty/maienm +++ b/scripts/3rdparty/maienm @@ -1 +1 @@ -Subproject commit ca2b0ee9256721efa9c0b5f76523c8bc2c3075e6 +Subproject commit 8cffa1266d8903b568cf48366dd6f57095e3ae97 diff --git a/scripts/3rdparty/maxthyme b/scripts/3rdparty/maxthyme index 520147436..0615e32f8 160000 --- a/scripts/3rdparty/maxthyme +++ b/scripts/3rdparty/maxthyme @@ -1 +1 @@ -Subproject commit 52014743613922a2c9dedfca831e739c6fd77acb +Subproject commit 0615e32f8c6952fdb01a05570c3345cf38c41bad diff --git a/scripts/3rdparty/roses b/scripts/3rdparty/roses index c2e5a6155..323f0a0b7 160000 --- a/scripts/3rdparty/roses +++ b/scripts/3rdparty/roses @@ -1 +1 @@ -Subproject commit c2e5a615524f5d5434a1dbc72e251422e7392d9e +Subproject commit 323f0a0b71675302fd4abbfeb940e20ee2bcbd35 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index ed5cc1ffc..82edb19a9 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,2 +1,14 @@ include(Scripts.cmake) +DFHACK_3RDPARTY_SCRIPT_REPO(dscorbett) +DFHACK_3RDPARTY_SCRIPT_REPO(kane-t) DFHACK_3RDPARTY_SCRIPT_REPO(lethosor) +DFHACK_3RDPARTY_SCRIPT_REPO(maienm) +DFHACK_3RDPARTY_SCRIPT_REPO(maxthyme) +DFHACK_3RDPARTY_SCRIPT_REPO(roses) + +install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts + DESTINATION ${DFHACK_DATA_DESTINATION} + FILES_MATCHING PATTERN "*.lua" + PATTERN "*.rb" + PATTERN "3rdparty" EXCLUDE + ) From 3c36a4cb07b3042b1309fc29dc6e790da1be9f35 Mon Sep 17 00:00:00 2001 From: expwnent Date: Fri, 25 Sep 2015 16:38:15 -0400 Subject: [PATCH 5/8] Add more lethosor scripts. --- dfhack.init-example | 2 ++ scripts/3rdparty/lethosor | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dfhack.init-example b/dfhack.init-example index cc4d67775..a46428512 100644 --- a/dfhack.init-example +++ b/dfhack.init-example @@ -241,6 +241,8 @@ log-region # add information to item viewscreens view-item-info enable +load-screen enable + ####################################################### # Apply binary patches at runtime # ####################################################### diff --git a/scripts/3rdparty/lethosor b/scripts/3rdparty/lethosor index ceed207e3..41dfe51fa 160000 --- a/scripts/3rdparty/lethosor +++ b/scripts/3rdparty/lethosor @@ -1 +1 @@ -Subproject commit ceed207e38220e21067a91b8d6f7b9680a476f69 +Subproject commit 41dfe51faab86c3c5a8d510c76d1bbbc1cf40f25 From b2801eb909867adc89d790eb10b2772ef1059aea Mon Sep 17 00:00:00 2001 From: expwnent Date: Fri, 25 Sep 2015 17:13:32 -0400 Subject: [PATCH 6/8] Third party scripts, fix lethosor, add maxthyme. --- dfhack.init-example | 2 +- scripts/3rdparty/lethosor | 2 +- scripts/3rdparty/maxthyme | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dfhack.init-example b/dfhack.init-example index a46428512..13471b8c4 100644 --- a/dfhack.init-example +++ b/dfhack.init-example @@ -241,7 +241,7 @@ log-region # add information to item viewscreens view-item-info enable -load-screen enable +gui/load-screen enable ####################################################### # Apply binary patches at runtime # diff --git a/scripts/3rdparty/lethosor b/scripts/3rdparty/lethosor index 41dfe51fa..e3666a738 160000 --- a/scripts/3rdparty/lethosor +++ b/scripts/3rdparty/lethosor @@ -1 +1 @@ -Subproject commit 41dfe51faab86c3c5a8d510c76d1bbbc1cf40f25 +Subproject commit e3666a7385ca00565b95f3d7c6d41f6e7955816f diff --git a/scripts/3rdparty/maxthyme b/scripts/3rdparty/maxthyme index 0615e32f8..eb1ae5590 160000 --- a/scripts/3rdparty/maxthyme +++ b/scripts/3rdparty/maxthyme @@ -1 +1 @@ -Subproject commit 0615e32f8c6952fdb01a05570c3345cf38c41bad +Subproject commit eb1ae5590f6e73ea7f9373310ca452f9ddee93f8 From 3120c958428bf51ecf17844acb5437213c6532c7 Mon Sep 17 00:00:00 2001 From: expwnent Date: Fri, 25 Sep 2015 17:18:45 -0400 Subject: [PATCH 7/8] Add maxthyme/prefchange. --- scripts/3rdparty/maxthyme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/3rdparty/maxthyme b/scripts/3rdparty/maxthyme index eb1ae5590..7781264a2 160000 --- a/scripts/3rdparty/maxthyme +++ b/scripts/3rdparty/maxthyme @@ -1 +1 @@ -Subproject commit eb1ae5590f6e73ea7f9373310ca452f9ddee93f8 +Subproject commit 7781264a20026c7db927255b7ce34caaacc52e54 From 8cc0a0bd428853cfad6e710e6a69778c7155f3c4 Mon Sep 17 00:00:00 2001 From: expwnent Date: Fri, 25 Sep 2015 17:41:25 -0400 Subject: [PATCH 8/8] Include all Roses' scripts. --- dfhack.init-example | 2 ++ scripts/3rdparty/roses | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dfhack.init-example b/dfhack.init-example index 13471b8c4..a91590eea 100644 --- a/dfhack.init-example +++ b/dfhack.init-example @@ -243,6 +243,8 @@ view-item-info enable gui/load-screen enable +base/roses-init --all + ####################################################### # Apply binary patches at runtime # ####################################################### diff --git a/scripts/3rdparty/roses b/scripts/3rdparty/roses index 323f0a0b7..ce11419ef 160000 --- a/scripts/3rdparty/roses +++ b/scripts/3rdparty/roses @@ -1 +1 @@ -Subproject commit 323f0a0b71675302fd4abbfeb940e20ee2bcbd35 +Subproject commit ce11419ef8ce026af883ce81205268eb0cc1a2b1