Issue 2483 - Give Adblock Browser its own app ID

adblockplus/build.py

 #!/usr/bin/env python
 # coding: utf-8
 
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))

[Felix Dahlke, 2015/05/15 22:09:08]

Realised the naming here was inconsistent with our other scripts, changed that.

 ABP_DIR = os.path.join(BASE_DIR, "adblockplus")
 
 def build_abp(base_dir, xpi_path):
   xpi_dir = os.path.dirname(os.path.abspath(xpi_path))
   if not os.path.exists(xpi_dir):
     os.makedirs(xpi_dir)
 
   sys.path.insert(0, base_dir)
   import buildtools.build
   import buildtools.packager
   def get_metadata_path(base_dir, type):
     return os.path.join(BASE_DIR, "metadata.gecko")
   buildtools.packager.getMetadataPath = get_metadata_path
   buildtools.build.processArgs(base_dir, ["", "build", xpi_path])
 
 if __name__ == "__main__":
   if len(sys.argv) < 2:
+    print >>sys.stderr, "Usage: %s XPI_PATH" % os.path.basename(sys.argv[0])
     sys.exit(1)

[Wladimir Palant, 2015/05/18 11:01:22]

Exiting without an error message is strange, why did you remove it? Besides,
that message belongs on stderr.

[Felix Dahlke, 2015/05/18 19:43:28]

Oops, forgot that one.

 
   xpi_path = sys.argv[1]
   patched_abp_dir = tempfile.NamedTemporaryFile().name
 
   shutil.copytree(ABP_DIR, patched_abp_dir)
   try:
-    subprocess.call(
-      ["hg", "import", "-q", os.path.join(BASE_DIR, "issue-2509.patch")],
-      cwd=os.path.join(patched_abp_dir, "buildtools"))

[Wladimir Palant, 2015/05/18 11:01:22]

I'd prefer -R parameter instead of cwd but doesn't really matter.

Please use subprocess.check_call() - we shouldn't continue if the patch failed
to apply.

[Felix Dahlke, 2015/05/18 19:43:28]

Yeah that's nicer, done.

-    subprocess.call(
-      ["hg", "import", "-q", os.path.join(BASE_DIR, "issue-2510.patch")],
-      cwd=patched_abp_dir)
+    subprocess.check_call(["hg", "import", "-q", "-R",
+                           os.path.join(patched_abp_dir, "buildtools"),
+                           os.path.join(BASE_DIR, "issue-2509.patch")]),
+    subprocess.check_call(["hg", "import", "-q", "-R", patched_abp_dir,
+                           os.path.join(BASE_DIR, "issue-2510.patch")]),
     build_abp(patched_abp_dir, xpi_path)
   finally:
     shutil.rmtree(patched_abp_dir)