Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: build_release.py

Issue 11440031: Ignore errors from nmake, we expect some right now (Closed)
Patch Set: Created Aug. 9, 2013, 9:16 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 import sys, os, re, subprocess 3 import sys, os, re, subprocess
4 4
5 if len(sys.argv) < 2: 5 if len(sys.argv) < 2:
6 print >>sys.stderr, "Please add a command line parameter with the path of the signing key file" 6 print >>sys.stderr, "Please add a command line parameter with the path of the signing key file"
7 sys.exit(1) 7 sys.exit(1)
8 8
9 basedir = os.path.dirname(os.path.abspath(sys.argv[0])) 9 basedir = os.path.dirname(os.path.abspath(sys.argv[0]))
10 key = sys.argv[1] 10 key = sys.argv[1]
(...skipping 30 matching lines...) Expand all
41 "msbuild", 41 "msbuild",
42 os.path.join(basedir, "build", arch, "adblockplus.sln"), 42 os.path.join(basedir, "build", arch, "adblockplus.sln"),
43 "/p:Configuration=Release", "/target:AdblockPlus;AdblockPlusEngine", 43 "/p:Configuration=Release", "/target:AdblockPlus;AdblockPlusEngine",
44 ]) 44 ])
45 45
46 sign(os.path.join(basedir, "build", arch, "Release", "AdblockPlus.dll"), 46 sign(os.path.join(basedir, "build", arch, "Release", "AdblockPlus.dll"),
47 os.path.join(basedir, "build", arch, "Release", "AdblockPlusEngine.exe")) 47 os.path.join(basedir, "build", arch, "Release", "AdblockPlusEngine.exe"))
48 48
49 installerParams = os.environ.copy() 49 installerParams = os.environ.copy()
50 installerParams["VERSION"] = version 50 installerParams["VERSION"] = version
51 subprocess.check_call(["nmake", "/A"], env=installerParams, cwd=os.path.join(bas edir, "installer")) 51 try:
52 subprocess.check_call(["nmake", "/A"], env=installerParams, cwd=os.path.join(b asedir, "installer"))
53 except subprocess.CalledProcessError:
54 print("An error occurred during nmake, continuing anyway")
52 sign(os.path.join(basedir, "build", "ia32", "adblockplusie-%s-en-us-ia32.msi" % version), 55 sign(os.path.join(basedir, "build", "ia32", "adblockplusie-%s-en-us-ia32.msi" % version),
53 os.path.join(basedir, "build", "x64", "adblockplusie-%s-en-us-x64.msi" % ver sion)) 56 os.path.join(basedir, "build", "x64", "adblockplusie-%s-en-us-x64.msi" % ver sion))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld