Skip to content

Commit 979fddd

Browse files
authored
Merge pull request #6199 from BOINC/vko_fix_trailing_whitespaces_check_py_script
Ignore MacOs specific folders and files during trailing whitespace check
2 parents 361f60b + fbb7f46 commit 979fddd

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

ci_tools/trailing_whitespaces_check.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def check(directory, exclude_dirs, exclude_extensions, exclude_files, fix_errors
3535
if (pathlib.Path(filename).suffix in exclude_extensions):
3636
continue
3737
src_file = os.path.join(root, filename)
38-
if (os.path.islink(src_file) or src_file in exclude_files):
38+
if (os.path.islink(src_file) or src_file in exclude_files or filename in exclude_files):
3939
continue
4040
with open(src_file, "rb") as f:
4141
if verbose:
@@ -100,21 +100,29 @@ def check(directory, exclude_dirs, exclude_extensions, exclude_files, fix_errors
100100
os.path.join(directory, "html", "inc", "random_compat"),
101101
os.path.join(directory, "html", "inc", "ReCaptcha"),
102102
os.path.join(directory, "locale"),
103+
os.path.join(directory, "mac_build", "build"),
104+
os.path.join(directory, "mac_build", "boinc.xcodeproj", "project.xcworkspace"),
103105
os.path.join(directory, "samples", "example_app", "bin"),
104106
os.path.join(directory, "samples", "gfx_html"),
105107
os.path.join(directory, "samples", "glut"),
106108
os.path.join(directory, "samples", "image_libs"),
107109
os.path.join(directory, "samples", "jpeglib"),
110+
os.path.join(directory, "samples", "mac_build", "build"),
111+
os.path.join(directory, "samples", "mac_build", "UpperCase2.xcodeproj", "project.xcworkspace"),
112+
os.path.join(directory, "samples", "vboxwrapper", "build"),
113+
os.path.join(directory, "samples", "vboxwrapper", "vboxwrapper.xcodeproj", "project.xcworkspace"),
108114
os.path.join(directory, "tests", "old"),
109115
os.path.join(directory, "win_build", "Build"),
110116
os.path.join(directory, "win_build", ".vs"),
111117
os.path.join(directory, "win_build", "ipch"),
112118
os.path.join(directory, "win_build", "installerv2", "redist"),
113119
os.path.join(directory, "zip", "unzip"),
114120
os.path.join(directory, "zip", "zip"),
121+
os.path.join(directory, "zip", "boinc_zip.xcodeproj", "project.xcworkspace"),
115122
]
116123

117124
exclude_files = [
125+
".DS_Store",
118126
os.path.join(directory, "bolt_checkin_notes.txt"),
119127
os.path.join(directory, "checkin_notes"),
120128
os.path.join(directory, "checkin_notes_2004"),
@@ -131,6 +139,10 @@ def check(directory, exclude_dirs, exclude_extensions, exclude_files, fix_errors
131139
os.path.join(directory, "todo"),
132140
os.path.join(directory, "TODO_OLD"),
133141
os.path.join(directory, "aclocal.m4"),
142+
os.path.join(directory, "api", "MultiGPUMig.h"),
143+
os.path.join(directory, "api", "MultiGPUMigServer.c"),
144+
os.path.join(directory, "api", "MultiGPUMigServer.h"),
145+
os.path.join(directory, "api", "MultiGPUMigUser.c"),
134146
os.path.join(directory, "client", "boinc_client"),
135147
os.path.join(directory, "client", "boinccmd"),
136148
os.path.join(directory, "client", "boinc"),
@@ -140,6 +152,7 @@ def check(directory, exclude_dirs, exclude_extensions, exclude_files, fix_errors
140152
os.path.join(directory, "html", "inc", "geoip.inc"),
141153
os.path.join(directory, "html", "inc", "htmLawed.php"),
142154
os.path.join(directory, "html", "inc", "recaptcha_loader.php"),
155+
os.path.join(directory, "samples", "vboxwrapper", "x86_64", "vboxwrapper"),
143156
os.path.join(directory, "samples", "wrapper", "regerror.c"),
144157
os.path.join(directory, "samples", "wrapper", "regexp_custom.h"),
145158
os.path.join(directory, "samples", "wrapper", "regexp_int.h"),
@@ -160,7 +173,9 @@ def check(directory, exclude_dirs, exclude_extensions, exclude_files, fix_errors
160173
".bmp",
161174
".cub",
162175
".dll",
176+
".DS_Store",
163177
".exe",
178+
".gch",
164179
".gif",
165180
".icns",
166181
".ico",

0 commit comments

Comments
 (0)