Skip to content

Commit d1f0edd

Browse files
lethosorlethosor
committed
Apply initial pre-commit config
1 parent 0fc451d commit d1f0edd

118 files changed

Lines changed: 481 additions & 543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/buildmaster-rebuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
inputs:
66
pull_request:
77
description: Pull request ID
8-
type: number
8+
type: string
99
required: true # remove if we support commit rebuilds later
1010

1111
jobs:

‎CMake/Modules/FindSphinx.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,3 @@ find_package_handle_standard_args(Sphinx DEFAULT_MSG
1313
)
1414

1515
mark_as_advanced(SPHINX_EXECUTABLE)
16-

‎README.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
<body>
1414
Follow this <a href='./docs/index.html'>link to the documentation.</a>
1515
</body>
16-
</html>
16+
</html>

‎build/build-osx.sh‎

100644100755
Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,88 +7,88 @@ LUA_PATCH=1
77
ME=$PWD/`basename $0`
88

99
usage() {
10-
echo "Usage: $0 [options] {DF_OSX_PATH}"
11-
echo -e "\told\t- use on pre-Snow Leopard OSX installations"
12-
echo -e "\tbrew\t- if GCC 4.5 was installed with homebrew"
13-
echo -e "\tport\t- if GCC 4.5 was insalled with macports"
14-
echo -e "\tclean\t- delete ../build-osx before compiling"
15-
echo "Example:"
16-
echo -e "\t$0 old brew ../../../personal/df_osx"
17-
echo -e "\t$0 port clean /Users/dfplayer/df_osx"
18-
exit $1
10+
echo "Usage: $0 [options] {DF_OSX_PATH}"
11+
echo -e "\told\t- use on pre-Snow Leopard OSX installations"
12+
echo -e "\tbrew\t- if GCC 4.5 was installed with homebrew"
13+
echo -e "\tport\t- if GCC 4.5 was insalled with macports"
14+
echo -e "\tclean\t- delete ../build-osx before compiling"
15+
echo "Example:"
16+
echo -e "\t$0 old brew ../../../personal/df_osx"
17+
echo -e "\t$0 port clean /Users/dfplayer/df_osx"
18+
exit $1
1919
}
2020

2121
options() {
22-
case $1 in
23-
brew)
24-
echo "Using homebrew gcc."
25-
export CC=/usr/local/bin/gcc-4.5
26-
export CXX=/usr/local/bin/g++-4.5
27-
targetted=1
28-
;;
29-
port)
30-
echo "Using macports gcc."
31-
export CC=/opt/local/bin/gcc-mp-4.5
32-
export CXX=/opt/local/bin/g++-mp-4.5
33-
targetted=1
34-
;;
35-
old)
36-
LUA_PATCH=0
37-
;;
38-
clean)
39-
echo "Deleting ../build-osx"
40-
rm -rf ../build-osx
41-
;;
42-
*)
43-
;;
44-
esac
22+
case $1 in
23+
brew)
24+
echo "Using homebrew gcc."
25+
export CC=/usr/local/bin/gcc-4.5
26+
export CXX=/usr/local/bin/g++-4.5
27+
targetted=1
28+
;;
29+
port)
30+
echo "Using macports gcc."
31+
export CC=/opt/local/bin/gcc-mp-4.5
32+
export CXX=/opt/local/bin/g++-mp-4.5
33+
targetted=1
34+
;;
35+
old)
36+
LUA_PATCH=0
37+
;;
38+
clean)
39+
echo "Deleting ../build-osx"
40+
rm -rf ../build-osx
41+
;;
42+
*)
43+
;;
44+
esac
4545
}
4646

4747
# sanity checks
4848
if [[ $# -lt 1 ]]
4949
then
50-
echo "Not enough arguments."
51-
usage 0
50+
echo "Not enough arguments."
51+
usage 0
5252
fi
5353
if [[ $# -gt 4 ]]
5454
then
55-
echo "Too many arguments."
56-
usage 1
55+
echo "Too many arguments."
56+
usage 1
5757
fi
5858

5959
# run through the arguments
6060
for last
6161
do
62-
options $last
62+
options $last
6363
done
6464
# last keeps the last argument
6565

6666
if [[ $targetted -eq 0 ]]
6767
then
68-
echo "You did not specify whether you intalled GCC 4.5 from brew or ports."
69-
echo "If you continue, your default compiler will be used."
70-
read -p "Are you sure you want to continue? [y/N] " -n 1 -r
71-
echo # (optional) move to a new line
72-
if [[ ! $REPLY =~ ^[Yy]$ ]]
73-
then
74-
exit 0
75-
fi
68+
echo "You did not specify whether you intalled GCC 4.5 from brew or ports."
69+
echo "If you continue, your default compiler will be used."
70+
read -p "Are you sure you want to continue? [y/N] " -n 1 -r
71+
echo # (optional) move to a new line
72+
if [[ ! $REPLY =~ ^[Yy]$ ]]
73+
then
74+
exit 0
75+
fi
7676
fi
7777

7878
# check for build folder and start working there
7979
if [[ ! -d ../build-osx ]]
8080
then
81-
mkdir ../build-osx
81+
mkdir ../build-osx
8282
fi
8383
cd ../build-osx
8484

8585
# patch if necessary
8686
if [[ $LUA_PATCH -ne 0 ]]
8787
then
88-
cd ..
89-
echo "$PWD"
90-
sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0
91-
cd -
88+
cd ..
89+
echo "$PWD"
90+
sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0
91+
cd -
9292
fi
9393

9494
echo "Generate"
@@ -101,17 +101,17 @@ make install
101101
# unpatch if /libarary/luaTypes.cpp was patched
102102
if [[ $LUA_PATCH -ne 0 ]]
103103
then
104-
cd ..
105-
echo -n "un"
106-
sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 -R
107-
cd -
104+
cd ..
105+
echo -n "un"
106+
sed -e '1,/'"PATCH""CODE"'/d' "$ME" | patch -p0 -R
107+
cd -
108108
fi
109109

110110
exit 0
111111

112112
# PATCHCODE - everything below this line is fed into patch
113-
--- library/LuaTypes.cpp 2014-08-20 00:13:17.000000000 -0700
114-
+++ library/LuaTypes.cpp 2014-08-31 23:31:00.000000000 -0700
113+
--- library/LuaTypes.cpp 2014-08-20 00:13:17.000000000 -0700
114+
+++ library/LuaTypes.cpp 2014-08-31 23:31:00.000000000 -0700
115115
@@ -464,7 +464,7 @@
116116
{
117117
case struct_field_info::STATIC_STRING:

‎build/sublime/dfhack.sublime-project‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"folders":
3-
[
4-
{
5-
"path": "."
6-
}
7-
],
8-
"build_systems":
9-
[
10-
{
11-
"name": "DFHack make",
12-
"working_dir": "$project_path",
13-
"cmd": ["python", "$project_path/build/sublime/make.py", "$file"],
14-
"variants": [
15-
{
16-
"name": "Build all",
17-
"cmd": ["python", "$project_path/build/sublime/make.py", "-a"]
18-
},
19-
{
20-
"name": "Build+install all",
21-
"cmd": ["python", "$project_path/build/sublime/make.py", "-ai"]
22-
},
23-
{
24-
"name": "Build plugin",
25-
"cmd": ["python", "$project_path/build/sublime/make.py", "-ap", "$file"]
26-
},
27-
{
28-
"name": "Build+install plugin",
29-
"cmd": ["python", "$project_path/build/sublime/make.py", "-aip", "$file"]
30-
}
31-
]
32-
}
33-
]
2+
"folders":
3+
[
4+
{
5+
"path": "."
6+
}
7+
],
8+
"build_systems":
9+
[
10+
{
11+
"name": "DFHack make",
12+
"working_dir": "$project_path",
13+
"cmd": ["python", "$project_path/build/sublime/make.py", "$file"],
14+
"variants": [
15+
{
16+
"name": "Build all",
17+
"cmd": ["python", "$project_path/build/sublime/make.py", "-a"]
18+
},
19+
{
20+
"name": "Build+install all",
21+
"cmd": ["python", "$project_path/build/sublime/make.py", "-ai"]
22+
},
23+
{
24+
"name": "Build plugin",
25+
"cmd": ["python", "$project_path/build/sublime/make.py", "-ap", "$file"]
26+
},
27+
{
28+
"name": "Build+install plugin",
29+
"cmd": ["python", "$project_path/build/sublime/make.py", "-aip", "$file"]
30+
}
31+
]
32+
}
33+
]
3434
}

‎build/win32/build-debug.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
call "%VS140COMNTOOLS%vsvars32.bat"
22
cd VC2015_32
33
msbuild /m /p:Platform=Win32 /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj
4-
cd ..
4+
cd ..

‎build/win32/build-release.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ call "%VS140COMNTOOLS%vsvars32.bat"
22
cd VC2015_32
33
msbuild /m /p:Platform=Win32 /p:Configuration=Release ALL_BUILD.vcxproj
44
cd ..
5-
pause
5+
pause

‎build/win32/generate-MSVC-all.bat‎

100755100644
File mode changed.

‎build/win32/generate-MSVC-gui.bat‎

100755100644
File mode changed.

‎build/win32/generate-MSVC-minimal.bat‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)