summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.eslintignore1
-rwxr-xr-xbuildscripts/clang_format.py3
-rw-r--r--buildscripts/utils.py11
3 files changed, 13 insertions, 2 deletions
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000000..a1ded284b11
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+src/mongo/gotools/*
diff --git a/buildscripts/clang_format.py b/buildscripts/clang_format.py
index 0e9cb7e7416..ce6ea8538e8 100755
--- a/buildscripts/clang_format.py
+++ b/buildscripts/clang_format.py
@@ -500,7 +500,8 @@ class Repo(object):
file_list = [line.rstrip()
for line in gito.splitlines()
if (line.startswith("jstests") or line.startswith("src"))
- and not line.startswith("src/third_party")]
+ and not line.startswith("src/third_party/")
+ and not line.startswith("src/mongo/gotools/")]
files_match = re.compile('\\.(h|cpp|js)$')
diff --git a/buildscripts/utils.py b/buildscripts/utils.py
index a05a4f6f9f9..63a4ba6c405 100644
--- a/buildscripts/utils.py
+++ b/buildscripts/utils.py
@@ -22,13 +22,22 @@ def getAllSourceFiles( arr=None , prefix="." ):
return arr
for x in os.listdir( prefix ):
- if x.startswith( "." ) or x.startswith( "pcre-" ) or x.startswith( "32bit" ) or x.startswith( "mongodb-" ) or x.startswith("debian") or x.startswith( "mongo-cxx-driver" ):
+ if ( x.startswith( "." )
+ or x.startswith( "pcre-" )
+ or x.startswith( "32bit" )
+ or x.startswith( "mongodb-" )
+ or x.startswith( "debian" )
+ or x.startswith( "mongo-cxx-driver" )
+ or 'gotools' in x ):
continue
+
# XXX: Avoid conflict between v8, v8-3.25 and mozjs source files in
# src/mongo/scripting
# Remove after v8-3.25 migration.
+
if x.find("v8-3.25") != -1 or x.find("mozjs") != -1:
continue
+
full = prefix + "/" + x
if os.path.isdir( full ) and not os.path.islink( full ):
getAllSourceFiles( arr , full )