aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Rouget <me@paulrouget.com>2019-09-17 07:33:12 +0200
committerPaul Rouget <me@paulrouget.com>2019-09-17 07:47:01 +0200
commit94eeea36645a8279ef0aa7a7344244f6b60baf19 (patch)
tree197c80b5894bef55ee9b4370c9bc5f0da43b511f
parentc90c32238c76f4b437598d6c162d6c03ccb01e62 (diff)
downloadservo-94eeea36645a8279ef0aa7a7344244f6b60baf19.tar.gz
servo-94eeea36645a8279ef0aa7a7344244f6b60baf19.zip
"mach clean" cleans uwp artifacts
-rw-r--r--.gitignore36
-rw-r--r--python/servo/build_commands.py20
2 files changed, 23 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index c9d754bc569..ba1ba3c1d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,37 +55,7 @@ support/hololens/ServoApp/ARM64/
support/hololens/ServoApp/Generated\ Files
support/hololens/ServoApp/BundleArtifacts/
support/hololens/ServoApp/support/
-
-# Ignore thumbnails created by Windows
-support/hololens/ServoApp/Thumbs.db
-
-# Ignore files built by Visual Studio
-support/hololens/ServoApp/*.obj
-support/hololens/ServoApp/*.exe
-support/hololens/ServoApp/*.pdb
-support/hololens/ServoApp/*.user
-support/hololens/ServoApp/*.aps
-support/hololens/ServoApp/*.pch
-support/hololens/ServoApp/*.vspscc
-support/hololens/ServoApp/*_i.c
-support/hololens/ServoApp/*_p.c
-support/hololens/ServoApp/*.ncb
-support/hololens/ServoApp/*.suo
-support/hololens/ServoApp/*.tlb
-support/hololens/ServoApp/*.tlh
-support/hololens/ServoApp/*.bak
-support/hololens/ServoApp/*.cache
-support/hololens/ServoApp/*.ilk
-support/hololens/ServoApp/*.log
-support/hololens/ServoApp/[Bb]in
-support/hololens/ServoApp/[Dd]ebug*/
-support/hololens/ServoApp/*.lib
-support/hololens/ServoApp/*.sbr
-support/hololens/ServoApp/obj/
-support/hololens/ServoApp/[Rr]elease*/
-support/hololens/ServoApp/_ReSharper*/
-support/hololens/ServoApp/[Tt]est[Rr]esult*
-support/hololens/.vs/
-
-# Nuget packages folder
+support/hololens/ServoApp/Debug/
+support/hololens/ServoApp/Release/
support/hololens/packages/
+support/hololens/.vs/
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index e07a7666e0e..bbd4eca73da 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -741,6 +741,26 @@ class MachCommands(CommandBase):
print('Removing virtualenv directory: %s' % virtualenv_path)
shutil.rmtree(virtualenv_path)
+ uwp_artifacts = [
+ "support/hololens/x64/",
+ "support/hololens/ARM/",
+ "support/hololens/ARM64/",
+ "support/hololens/ServoApp/x64/",
+ "support/hololens/ServoApp/ARM/",
+ "support/hololens/ServoApp/ARM64/",
+ "support/hololens/ServoApp/Generated Files/",
+ "support/hololens/ServoApp/BundleArtifacts/",
+ "support/hololens/ServoApp/support/",
+ "support/hololens/ServoApp/Debug/",
+ "support/hololens/ServoApp/Release/",
+ "support/hololens/packages/",
+ ]
+
+ for uwp_artifact in uwp_artifacts:
+ dir_path = path.join(self.get_top_dir(), uwp_artifact)
+ if path.exists(dir_path):
+ shutil.rmtree(dir_path)
+
opts = ["--manifest-path", manifest_path or path.join(self.context.topdir, "Cargo.toml")]
if verbose:
opts += ["-v"]