mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Cleanup codebase
This commit is contained in:
William Blake Galbreath
@@ -1,19 +0,0 @@
|
|||||||
# Minimal makefile for Sphinx documentation
|
|
||||||
#
|
|
||||||
|
|
||||||
# You can set these variables from the command line.
|
|
||||||
SPHINXOPTS =
|
|
||||||
SPHINXBUILD = sphinx-build
|
|
||||||
SOURCEDIR = source
|
|
||||||
BUILDDIR = build
|
|
||||||
|
|
||||||
# Put it first so that "make" without argument is like "make help".
|
|
||||||
help:
|
|
||||||
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
|
||||||
|
|
||||||
.PHONY: help Makefile
|
|
||||||
|
|
||||||
# Catch-all target: route all unknown targets to Sphinx using the new
|
|
||||||
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
|
|
||||||
%: Makefile
|
|
||||||
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
@ECHO OFF
|
|
||||||
|
|
||||||
pushd %~dp0
|
|
||||||
|
|
||||||
REM Command file for Sphinx documentation
|
|
||||||
|
|
||||||
if "%SPHINXBUILD%" == "" (
|
|
||||||
set SPHINXBUILD=sphinx-build
|
|
||||||
)
|
|
||||||
set SOURCEDIR=source
|
|
||||||
set BUILDDIR=build
|
|
||||||
|
|
||||||
if "%1" == "" goto help
|
|
||||||
|
|
||||||
%SPHINXBUILD% >NUL 2>NUL
|
|
||||||
if errorlevel 9009 (
|
|
||||||
echo.
|
|
||||||
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
|
|
||||||
echo.installed, then set the SPHINXBUILD environment variable to point
|
|
||||||
echo.to the full path of the 'sphinx-build' executable. Alternatively you
|
|
||||||
echo.may add the Sphinx directory to PATH.
|
|
||||||
echo.
|
|
||||||
echo.If you don't have Sphinx installed, grab it from
|
|
||||||
echo.http://sphinx-doc.org/
|
|
||||||
exit /b 1
|
|
||||||
)
|
|
||||||
|
|
||||||
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
|
|
||||||
goto end
|
|
||||||
|
|
||||||
:help
|
|
||||||
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
|
|
||||||
|
|
||||||
:end
|
|
||||||
popd
|
|
||||||
@@ -1,177 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# Configuration file for the Sphinx documentation builder.
|
|
||||||
#
|
|
||||||
# This file does only contain a selection of the most common options. For a
|
|
||||||
# full list see the documentation:
|
|
||||||
# http://www.sphinx-doc.org/en/master/config
|
|
||||||
|
|
||||||
# -- Path setup --------------------------------------------------------------
|
|
||||||
|
|
||||||
# If extensions (or modules to document with autodoc) are in another directory,
|
|
||||||
# add these directories to sys.path here. If the directory is relative to the
|
|
||||||
# documentation root, use os.path.abspath to make it absolute, like shown here.
|
|
||||||
#
|
|
||||||
# import os
|
|
||||||
# import sys
|
|
||||||
# sys.path.insert(0, os.path.abspath('.'))
|
|
||||||
|
|
||||||
|
|
||||||
# -- Project information -----------------------------------------------------
|
|
||||||
|
|
||||||
project = u'Purpur'
|
|
||||||
copyright = u'2019, BillyGalbreath'
|
|
||||||
author = u'BillyGalbreath'
|
|
||||||
|
|
||||||
# The short X.Y version
|
|
||||||
version = u''
|
|
||||||
# The full version, including alpha/beta/rc tags
|
|
||||||
release = u''
|
|
||||||
|
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
|
||||||
|
|
||||||
# If your documentation needs a minimal Sphinx version, state it here.
|
|
||||||
#
|
|
||||||
# needs_sphinx = '1.0'
|
|
||||||
|
|
||||||
# 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.autodoc',
|
|
||||||
]
|
|
||||||
|
|
||||||
# Add any paths that contain templates here, relative to this directory.
|
|
||||||
templates_path = ['_templates']
|
|
||||||
|
|
||||||
# The suffix(es) of source filenames.
|
|
||||||
# You can specify multiple suffix as a list of string:
|
|
||||||
#
|
|
||||||
# source_suffix = ['.rst', '.md']
|
|
||||||
source_suffix = '.rst'
|
|
||||||
|
|
||||||
# The master toctree document.
|
|
||||||
master_doc = 'index'
|
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
|
||||||
# for a list of supported languages.
|
|
||||||
#
|
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
|
||||||
# Usually you set "language" from the command line for these cases.
|
|
||||||
language = None
|
|
||||||
|
|
||||||
# List of patterns, relative to source directory, that match files and
|
|
||||||
# directories to ignore when looking for source files.
|
|
||||||
# This pattern also affects html_static_path and html_extra_path.
|
|
||||||
exclude_patterns = []
|
|
||||||
|
|
||||||
# The name of the Pygments (syntax highlighting) style to use.
|
|
||||||
pygments_style = None
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTML output -------------------------------------------------
|
|
||||||
|
|
||||||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
|
||||||
# a list of builtin themes.
|
|
||||||
#
|
|
||||||
html_theme = 'sphinx_rtd_theme'
|
|
||||||
|
|
||||||
# Theme options are theme-specific and customize the look and feel of a theme
|
|
||||||
# further. For a list of options available for each theme, see the
|
|
||||||
# documentation.
|
|
||||||
#
|
|
||||||
# html_theme_options = {}
|
|
||||||
|
|
||||||
# Add any paths that contain custom static files (such as style sheets) here,
|
|
||||||
# relative to this directory. They are copied after the builtin static files,
|
|
||||||
# so a file named "default.css" will overwrite the builtin "default.css".
|
|
||||||
html_static_path = ['_static']
|
|
||||||
|
|
||||||
# Custom sidebar templates, must be a dictionary that maps document names
|
|
||||||
# to template names.
|
|
||||||
#
|
|
||||||
# The default sidebars (for documents that don't match any pattern) are
|
|
||||||
# defined by theme itself. Builtin themes are using these templates by
|
|
||||||
# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
|
|
||||||
# 'searchbox.html']``.
|
|
||||||
#
|
|
||||||
# html_sidebars = {}
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for HTMLHelp output ---------------------------------------------
|
|
||||||
|
|
||||||
# Output file base name for HTML help builder.
|
|
||||||
htmlhelp_basename = 'Purpurdoc'
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for LaTeX output ------------------------------------------------
|
|
||||||
|
|
||||||
latex_elements = {
|
|
||||||
# The paper size ('letterpaper' or 'a4paper').
|
|
||||||
#
|
|
||||||
# 'papersize': 'letterpaper',
|
|
||||||
|
|
||||||
# The font size ('10pt', '11pt' or '12pt').
|
|
||||||
#
|
|
||||||
# 'pointsize': '10pt',
|
|
||||||
|
|
||||||
# Additional stuff for the LaTeX preamble.
|
|
||||||
#
|
|
||||||
# 'preamble': '',
|
|
||||||
|
|
||||||
# Latex figure (float) alignment
|
|
||||||
#
|
|
||||||
# 'figure_align': 'htbp',
|
|
||||||
}
|
|
||||||
|
|
||||||
# Grouping the document tree into LaTeX files. List of tuples
|
|
||||||
# (source start file, target name, title,
|
|
||||||
# author, documentclass [howto, manual, or own class]).
|
|
||||||
latex_documents = [
|
|
||||||
(master_doc, 'Purpur.tex', u'Purpur Documentation',
|
|
||||||
u'BillyGalbreath', 'manual'),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for manual page output ------------------------------------------
|
|
||||||
|
|
||||||
# One entry per manual page. List of tuples
|
|
||||||
# (source start file, name, description, authors, manual section).
|
|
||||||
man_pages = [
|
|
||||||
(master_doc, 'purpur', u'Purpur Documentation',
|
|
||||||
[author], 1)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for Texinfo output ----------------------------------------------
|
|
||||||
|
|
||||||
# Grouping the document tree into Texinfo files. List of tuples
|
|
||||||
# (source start file, target name, title, author,
|
|
||||||
# dir menu entry, description, category)
|
|
||||||
texinfo_documents = [
|
|
||||||
(master_doc, 'Purpur', u'Purpur Documentation',
|
|
||||||
author, 'Purpur', 'One line description of project.',
|
|
||||||
'Miscellaneous'),
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
# -- Options for Epub output -------------------------------------------------
|
|
||||||
|
|
||||||
# Bibliographic Dublin Core info.
|
|
||||||
epub_title = project
|
|
||||||
|
|
||||||
# The unique identifier of the text. This can be a ISBN number
|
|
||||||
# or the project homepage.
|
|
||||||
#
|
|
||||||
# epub_identifier = ''
|
|
||||||
|
|
||||||
# A unique identification for the text.
|
|
||||||
#
|
|
||||||
# epub_uid = ''
|
|
||||||
|
|
||||||
# A list of files that should not be packed into the epub file.
|
|
||||||
epub_exclude_files = ['search.html']
|
|
||||||
|
|
||||||
|
|
||||||
# -- Extension configuration -------------------------------------------------
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
Purpur documentation
|
|
||||||
====================
|
|
||||||
|
|
||||||
.. image:: https://repository-images.githubusercontent.com/184300222/cb576500-74d1-11e9-9c48-9c61b85597a0
|
|
||||||
:width: 500px
|
|
||||||
:height: 250px
|
|
||||||
:alt: Purpur logo
|
|
||||||
:align: center
|
|
||||||
|
|
||||||
This documentation has moved over to the GitHub Wiki `here <https://github.com/pl3xgaming/Purpur/wiki/>`_.
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
gitcmd="git -c commit.gpgsign=false"
|
|
||||||
|
|
||||||
noapply=1
|
|
||||||
isreject=0
|
|
||||||
if [[ $1 == "--noapplied" ]]; then
|
|
||||||
noapply=1
|
|
||||||
shift
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -z "$1" ]; then
|
|
||||||
file="$1"
|
|
||||||
elif [ -z "$1" ] && [ -f .git/rebase-apply/patch ]; then
|
|
||||||
file=".git/rebase-apply/patch"
|
|
||||||
noapply=1
|
|
||||||
isreject=1
|
|
||||||
else
|
|
||||||
echo "Please specify a file"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
applied=$(echo $file | sed 's/.patch$/-applied\.patch/g')
|
|
||||||
if [ "$1" == "--reset" ]; then
|
|
||||||
$gitcmd am --abort
|
|
||||||
$gitcmd reset --hard
|
|
||||||
$gitcmd clean -f
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
(test "$isreject" != "1" && $gitcmd am -3 $file) || (
|
|
||||||
echo "Failures - Wiggling"
|
|
||||||
$gitcmd reset --hard
|
|
||||||
$gitcmd clean -f
|
|
||||||
errors=$($gitcmd apply --rej $file 2>&1)
|
|
||||||
echo "$errors" >> ~/patch.log
|
|
||||||
export missingfiles=""
|
|
||||||
export summaryfail=""
|
|
||||||
export summarygood=""
|
|
||||||
for i in $(find . -name \*.rej); do
|
|
||||||
base=$(echo "$i" | sed 's/.rej//g')
|
|
||||||
if [ -f "$i" ]; then
|
|
||||||
sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i"
|
|
||||||
rm "$base.porig" "$i"
|
|
||||||
else
|
|
||||||
echo "No such file: $base"
|
|
||||||
missingfiles="$missingfiles\n$base"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
for i in $($gitcmd status --porcelain | awk '{print $2}'); do
|
|
||||||
filedata=$(cat "$i")
|
|
||||||
if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
|
|
||||||
export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
|
|
||||||
else
|
|
||||||
$gitcmd add "$i"
|
|
||||||
export summarygood="$summarygood\nAPPLIED CLEAN: $i"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo -e "$summarygood"
|
|
||||||
echo -e "$summaryfail"
|
|
||||||
if [[ "$errors" == *"No such file"* ]]; then
|
|
||||||
echo "===========================";
|
|
||||||
echo " "
|
|
||||||
echo " MISSING FILES"
|
|
||||||
echo $(echo "$errors" | grep "No such file")
|
|
||||||
echo -e "$missingfiles"
|
|
||||||
echo " "
|
|
||||||
echo "===========================";
|
|
||||||
fi
|
|
||||||
$gitcmd status
|
|
||||||
$gitcmd diff
|
|
||||||
)
|
|
||||||
if [[ "$noapply" != "1" ]] && [[ "$file" != *-applied.patch ]]; then
|
|
||||||
mv "$file" "$applied"
|
|
||||||
fi
|
|
||||||
@@ -62,8 +62,8 @@ function applyPatch {
|
|||||||
git reset --hard upstream/upstream
|
git reset --hard upstream/upstream
|
||||||
echo " Applying patches to $target..."
|
echo " Applying patches to $target..."
|
||||||
git am --abort >/dev/null 2>&1
|
git am --abort >/dev/null 2>&1
|
||||||
git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
|
if ! git am --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
|
||||||
if [ "$?" != "0" ]; then
|
then
|
||||||
echo " Something did not apply cleanly to $target."
|
echo " Something did not apply cleanly to $target."
|
||||||
echo " Please review above details and finish the apply then"
|
echo " Please review above details and finish the apply then"
|
||||||
echo " save the changes with rebuildPatches.sh"
|
echo " save the changes with rebuildPatches.sh"
|
||||||
|
|||||||
Reference in New Issue
Block a user