Issue 2483 - Give Adblock Browser its own app ID

adblockplus/build.py

Index: adblockplus/build.py
===================================================================
--- a/adblockplus/build.py
+++ b/adblockplus/build.py
@@ -2,16 +2,39 @@
 # coding: utf-8
 
 import os
+import shutil
 import sys
 
-import buildtools.build
-import buildtools.packager
-
 BUILD_DIR = os.path.dirname(os.path.abspath(__file__))
 BASE_DIR = os.path.join(BUILD_DIR, "adblockplus")
 
-def getMetadataPath(baseDir, type):
-  return os.path.join(BUILD_DIR, "metadata.gecko")
+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.mkdir(xpi_dir)

[Wladimir Palant, 2015/05/15 19:16:16]

os.makedirs() please - you don't know whether its parent directory exists.

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

Done.

 
-buildtools.packager.getMetadataPath = getMetadataPath
-buildtools.build.processArgs(BASE_DIR, sys.argv)
+  sys.path.insert(0, base_dir)
+  import buildtools.build
+  import buildtools.packager
+  def get_metadata_path(base_dir, type):
+    return os.path.join(BUILD_DIR, "metadata.gecko")
+  buildtools.packager.getMetadataPath = get_metadata_path

[Wladimir Palant, 2015/05/15 19:16:16]

Funny how you replace getMetadataPath yet use a patch instead of assigning to
buildtools.packagerGecko.KNOWN_APPS["adblockbrowser"]. Should be simple enough
and won't require patching dependencies file as an added bonus.

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

Sticking to applying the issue 2509 patch file as discussed.

+  buildtools.build.processArgs(base_dir, ["", "build", xpi_path])
+
+if __name__ == "__main__":
+  if len(sys.argv) < 2:
+    print "Usage: %s XPI_PATH" % os.path.basename(sys.argv[0])
+    sys.exit(1)
+
+  xpi_path = sys.argv[1]
+  patched_base_dir = os.path.join(os.sep, "tmp",
+                                  "adblockplus-patched-%s" % os.getpid())

[Wladimir Palant, 2015/05/15 19:16:16]

Please use tempfile.mkdtemp(), even though Windows compatibility certainly isn't
your top concern.

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

Forgot about tempfile, much nicer indeed. Ended up using
tempfile.NamedTemporaryFile().name since copytree doesn't want the target
directory to exist.

+  shutil.copytree(BASE_DIR, patched_base_dir)
+  try:
+    os.system('patch -s -p1 -d "%s/buildtools" < "%s/issue-2509.patch"' % (
+      patched_base_dir, BUILD_DIR))
+    os.system('patch -s -p1 -d "%s" < "%s/issue-2510.patch"' % (
+      patched_base_dir, BUILD_DIR))

[Wladimir Palant, 2015/05/15 19:16:16]

1) Call hg import maybe?
2) Please use subprocess.call() with a list as parameter (meaning shell=False).

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

Done.

+    build_abp(patched_base_dir, xpi_path)
+  finally:
+    shutil.rmtree(patched_base_dir)