Move scripts to library/scripts

git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule.

.gitmodules

@@ -10,6 +10,6 @@
 [submodule "depends/clsocket"]
 	path = depends/clsocket
 	url = git://github.com/DFHack/clsocket.git
-[submodule "scripts"]
+[submodule "library/scripts"]
-	path = scripts
+	path = library/scripts
 	url = git://github.com/dfhack/scripts.git

.travis.yml

@@ -36,7 +36,7 @@ script:
 - python travis/authors-rst.py
 - python travis/script-in-readme.py
 - python travis/script-syntax.py --ext=lua --cmd="luac5.2 -p"
-- python travis/script-syntax.py --ext=rb --cmd="ruby -c" --path scripts/
+- python travis/script-syntax.py --ext=rb --cmd="ruby -c" --path library/scripts/
 - mkdir build-travis
 - cd build-travis
 - cmake .. -DCMAKE_C_COMPILER=gcc-$GCC_VERSION -DCMAKE_CXX_COMPILER=g++-$GCC_VERSION -DBUILD_DOCS:BOOL=ON

CMakeLists.txt

@@ -210,8 +210,6 @@ IF(BUILD_PLUGINS)
     add_subdirectory (plugins)
 endif()
 
-add_subdirectory(scripts)
-
 find_package(Sphinx QUIET)
 if (BUILD_DOCS)
   if (NOT SPHINX_FOUND)
@@ -223,12 +221,12 @@ if (BUILD_DOCS)
     "${CMAKE_CURRENT_SOURCE_DIR}/docs/images/*.png"
     "${CMAKE_CURRENT_SOURCE_DIR}/docs/styles/*"
     "${CMAKE_CURRENT_SOURCE_DIR}/conf.py"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/about.txt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/library/scripts/about.txt"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*/about.txt"
+    "${CMAKE_CURRENT_SOURCE_DIR}/library/scripts/*/about.txt"
   )
   file(GLOB_RECURSE SPHINX_SCRIPT_DEPS
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.lua"
+    "${CMAKE_CURRENT_SOURCE_DIR}/library/scripts/*.lua"
-    "${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.rb"
+    "${CMAKE_CURRENT_SOURCE_DIR}/library/scripts/*.rb"
   )
   set(SPHINX_DEPS ${SPHINX_DEPS} ${SPHINX_SCRIPT_DEPS}
     "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.rst"

conf.py

@@ -52,7 +52,7 @@ def document_scripts():
     """
     # First, we collect the commands and paths to include in our docs
     scripts = []
-    for root, _, files in os.walk('scripts'):
+    for root, _, files in os.walk('library/scripts'):
         scripts.extend(doc_dir(root, files))
     # Next we split by type and create include directives sorted by command
     kinds = {'base': [], 'devel': [], 'fix': [], 'gui': [], 'modtools': []}
@@ -84,7 +84,7 @@ def write_script_docs():
         'modtools': 'Scripts for Modders'}
     for k in head:
         title = ('.. _{k}:\n\n{l}\n{t}\n{l}\n\n'
-                 '.. include:: /scripts/{a}about.txt\n\n'
+                 '.. include:: /library/scripts/{a}about.txt\n\n'
                  '.. contents::\n\n').format(
                      k=k, t=head[k],
                      l=len(head[k])*'#',
@@ -179,7 +179,6 @@ exclude_patterns = [
     'README.md',
     'docs/html*',
     'depends/*',
-    'scripts/3rdparty/*',
     'build*',
     ]
 

library/CMakeLists.txt

@@ -434,3 +434,5 @@ if(BUILD_DEVEL)
         add_subdirectory (doc)
     ENDIF()
 endif()
+
+add_subdirectory(scripts)

library/scripts

@@ -0,0 +1 @@
+Subproject commit b67885c0c07931a402a3b642a4e2468f14782058

scripts

@@ -1 +0,0 @@
-Subproject commit d4fbac0333fd76829a3eaefad6d326f2136dbf86