Merge lp:~mikemc/ubuntuone-windows-installer/add-translations-mac into lp:ubuntuone-windows-installer

[Mike McCracken]

- Bundle translated strings files into mac app wrapper. (LP: #1074116)

- Bundle translated strings files into mac app wrapper. (LP: #1074116)

[dobey (dobey)]

review: Approve

=== modified file 'scripts/setup-mac.py'
--- scripts/setup-mac.py	2012-12-10 18:13:57 +0000
+++ scripts/setup-mac.py	2012-12-14 18:08:25 +0000
@@ -203,6 +203,20 @@
             # default is to do everything:
             self.only_prepare = "sso, controlpanel, client, storage-protocol"
 
+    def copy_translation_files(self, src_root, dst_root):
+        """Merge .mo files from src_root into dst_root."""
+        for src_dir, dirs, files in os.walk(src_root):
+            dst_dir = src_dir.replace(src_root, dst_root)
+            if not os.path.exists(dst_dir):
+                os.mkdir(dst_dir)
+            for f in files:
+                src_f = os.path.join(src_dir, f)
+                dst_f = os.path.join(dst_dir, f)
+                if os.path.exists(dst_f):
+                    raise Exception("Error copying translations: %r "
+                                    "exists already" % dst_f)
+                shutil.copyfile(src_f, dst_f)
+
     def run(self):
         """Copy, build and munge things to prepare for packaging."""
 
@@ -262,6 +276,11 @@
 
         shutil.copyfile(os.path.join(self.source_dir,
                                      "ubuntuone-control-panel", "bin",
+                                     "ubuntuone-updater"),
+                        os.path.join("bin", "ubuntuone-updater.py"))
+
+        shutil.copyfile(os.path.join(self.source_dir,
+                                     "ubuntuone-control-panel", "bin",
                                      "ubuntuone-control-panel-qt"),
                         os.path.join("bin", "ubuntuone-control-panel-qt.py"))
 
@@ -320,6 +339,7 @@
                 print "tried to copy", os.path.abspath('ubuntu_sso'),
                 print "to ", dest_sso
 
+
         sso_revno = subprocess.check_output(["bzr", "revno", "."],
                                             env=BZR_ENV).strip()
 
@@ -347,7 +367,9 @@
         os.chdir(start_dir)
 
         # install controlpanel files
-        os.chdir(os.path.join(self.source_dir, "ubuntuone-control-panel"))
+        cp_source_dir = os.path.join(self.source_dir,
+                                     "ubuntuone-control-panel")
+        os.chdir(cp_source_dir)
 
         if "controlpanel" in self.only_prepare:
             print "building ubuntuone-controlpanel"
@@ -368,6 +390,11 @@
             shutil.copytree(os.path.join("ubuntuone", "controlpanel"),
                             dest_cp)
 
+            # copy translations over: (we are already in cp_source_dir)
+            self.copy_translation_files(os.path.join('build', 'mo'),
+                                        os.path.join(INSTALL_DIR,
+                                                     'share', 'locale'))
+
         u1cp_revno = subprocess.check_output(["bzr", "revno", "."],
                                              env=BZR_ENV).strip()
 
@@ -857,8 +884,12 @@
 
     main_zip.close()
 
-    # make a package to send for signing
+    print "copying translation files"
+    shutil.copytree(os.path.join(INSTALL_DIR, 'share', 'locale'),
+                    os.path.join(control_panel_resources_path,
+                                 'translations'))
 
+    print "building signing package"
     sign_dir = os.path.join("dist", "build_to_sign")
     os.makedirs(sign_dir)