Merge pull request #11136 from privatemaker/rename-dir-core-server

move dir developer_manual/core/ to developer_manual/server/
nextcloud · Sep 24, 2023 · d9e6284 · d9e6284
2 parents 8fe7af9 + cf81672
commit d9e6284
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 10 deletions.
diff --git a/build/get-server-sources.sh b/build/get-server-sources.sh
@@ -13,9 +13,9 @@ printf "\n"
 if [ -d server/.git ]; then
     cd server
     git remote set-branches --add origin $NC_BRANCH
-    git fetch
+    git fetch --depth 1
     git checkout $NC_BRANCH
     git reset --hard origin/$NC_BRANCH 
 else
-    git clone https://github.com/nextcloud/server server --depth 1 --branch $NC_BRANCH
+    git clone https://github.com/nextcloud/server server --depth 1 --single-branch --branch $NC_BRANCH
 fi;
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
@@ -29,7 +29,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse']
+extensions += ['sphinx.ext.todo', 'rst2pdf.pdfbuilder', 'sphinx.ext.intersphinx', 'sphinxcontrib.phpdomain', 'sphinx_toolbox.collapse', 'sphinx_reredirects']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['../_shared_assets/templates']
@@ -314,3 +314,14 @@
 highlight_options = {
   'php': {'startinline': True},
 }
+
+# Redirect old URLs
+# https://documatt.gitlab.io/sphinx-reredirects/usage.html
+redirects = {
+  "core/index": "../server",
+  "core/code-back-end": "../server/code-back-end.html",
+  "core/code-front-end": "../server/code-front-end.html",
+  "core/externalapi": "../server/externalapi.html",
+  "core/static-analysis": "../server/static-analysis.html",
+  "core/unit-testing": "../server/unit-testing.html"
+}
diff --git a/developer_manual/index.rst b/developer_manual/index.rst
@@ -18,7 +18,7 @@ Table of contents
     getting_started/index
     basics/index
     app_development/index
-    core/index
+    server/index
     digging_deeper/index
     app_publishing_maintenance/index
     design/index

diff --git a/developer_manual/core/architecture/files.rst → ...oper_manual/server/architecture/files.rst b/developer_manual/core/architecture/files.rst → ...oper_manual/server/architecture/files.rst
diff --git a/developer_manual/core/architecture/index.rst → ...oper_manual/server/architecture/index.rst b/developer_manual/core/architecture/index.rst → ...oper_manual/server/architecture/index.rst
diff --git a/developer_manual/core/code-back-end.rst → developer_manual/server/code-back-end.rst b/developer_manual/core/code-back-end.rst → developer_manual/server/code-back-end.rst
diff --git a/developer_manual/core/code-front-end.rst → developer_manual/server/code-front-end.rst b/developer_manual/core/code-front-end.rst → developer_manual/server/code-front-end.rst
diff --git a/developer_manual/core/externalapi.rst → developer_manual/server/externalapi.rst b/developer_manual/core/externalapi.rst → developer_manual/server/externalapi.rst
diff --git a/developer_manual/core/index.rst → developer_manual/server/index.rst b/developer_manual/core/index.rst → developer_manual/server/index.rst
diff --git a/developer_manual/core/static-analysis.rst → developer_manual/server/static-analysis.rst b/developer_manual/core/static-analysis.rst → developer_manual/server/static-analysis.rst
diff --git a/developer_manual/core/unit-testing.rst → developer_manual/server/unit-testing.rst b/developer_manual/core/unit-testing.rst → developer_manual/server/unit-testing.rst
@@ -97,9 +97,9 @@ adjust your php.ini and file rights.
   su -c "chmod a+rx data/"
   su -c "chmod a+w data/nextcloud.log"
 
-Running unit tests for the Nextcloud core project
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The core project provides core unit tests using different database backends like sqlite, mysql, pgsql, oci (for Oracle).
+Running unit tests for the Nextcloud server project
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The server project provides server unit tests using different database backends like sqlite, mysql, pgsql, oci (for Oracle).
 Every database to test needs to accessible either
 
 - natively, setup with
@@ -133,10 +133,10 @@ Further reading
 - https://www.youtube.com/watch?v=4E4672CS58Q&feature=bf_prev&list=PLBDAB2BA83BB6588E
 - Clean Code: A Handbook of Agile Software Craftsmanship (Robert C. Martin)
 
-JavaScript unit testing for core
---------------------------------
+JavaScript unit testing for server
+----------------------------------
 
-JavaScript Unit testing for **core** and **core apps** is done using the `Karma <http://karma-runner.github.io>`_ test runner with `Jasmine <https://jasmine.github.io/>`_.
+JavaScript Unit testing for **server** and **server apps** is done using the `Karma <http://karma-runner.github.io>`_ test runner with `Jasmine <https://jasmine.github.io/>`_.
 
 Installing Node JS
 ^^^^^^^^^^^^^^^^^^

diff --git a/requirements.txt b/requirements.txt
@@ -29,5 +29,6 @@ sphinxcontrib-phpdomain==0.11.1
 sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
 sphinx-toolbox==3.4.0
+sphinx-reredirects==0.1.2 
 urllib3==2.0.4
 zipp==3.16.2