Merge lp:~brian.curtin/ubuntuone-windows-installer/jenkins-output-fixes into lp:ubuntuone-windows-installer

[Brian Curtin]

- Look in BitRock's installation folder for output files when running on Jenkins

Due to how the Jenkins service runs, running build_installer.py as a target doesn't result in BitRock placing the AutoUpdate and InstallBuilder output files in the expected place like they do when you run it on your own machine. We now check if we're on Jenkins and then look in the expected places to find the executables, which is in the BitRock installation folder.

[Manuel de la Peña (mandel)]

Nice work!

review: Approve

=== modified file 'scripts/build_installer.py'
--- scripts/build_installer.py	2012-05-23 21:29:35 +0000
+++ scripts/build_installer.py	2012-05-24 19:41:18 +0000
@@ -38,11 +38,21 @@
     return path if os.path.exists(path) else None
 
 def _find_output_dir(type):
-    user_dir = os.getenv("USERPROFILE")
-    if not user_dir:
-        return None
-    folder = "My Documents" if "Windows-2008" in platform() else "Documents"
-    output = os.path.join(user_dir, folder, type, "output")
+    if os.getenv("JENKINS"):
+        # On Jenkins, InstallBuilder goes straight to `output` while
+        # AutoUpdate gets its own folder. Both of these folders are under
+        # the BitRock installation.
+        args = ["output"]
+        if type == "AutoUpdate":
+            args.insert(0, type)
+        output = os.path.join(_find_bitrock(), *args)
+    else:
+        user_dir = os.getenv("USERPROFILE")
+        if not user_dir:
+            print("No USERPROFILE available")
+            return None
+        dir = "My Documents" if "Windows-2008" in platform() else "Documents"
+        output = os.path.join(user_dir, dir, type, "output")
     return output if os.path.exists(output) else None
 
 def _get_last_file(dir):
@@ -63,6 +73,10 @@
 
 def bitrock_command(cmd, rename=False):
     """Run one of the BitRock binaries with some arguments"""
+
+    if not cmd.output:
+        raise Exception("Unable to find {} output".format(cmd.bin))
+
     print("Running BitRock", cmd.bin)
     subprocess.check_output(
             [os.path.join(_find_bitrock(), cmd.bin)] + cmd.args,