From: Reggie Burnett
Date: September 4 2012 8:04pm
Subject: bzr commit into wex-installer-build_tools branch (reggie.burnett:8)
List-Archive: http://lists.mysql.com/commits/144690
Message-Id: <201209042004.q84K4ov8013521@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1740169332=="

--===============1740169332==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///C:/work/wex/installer/build_tools/ based on revid:iggy.galarza@stripped

    8 Reggie Burnett	2012-09-04
      added the option for manifestupdater to take a manifest version on the command line

    modified:
      ManifestUpdater/Program.cs
=== modified file 'ManifestUpdater/Program.cs'
=== modified file 'ManifestUpdater/Program.cs'
--- a/ManifestUpdater/Program.cs	2012-09-01 14:54:54 +0000
+++ b/ManifestUpdater/Program.cs	2012-09-04 20:04:43 +0000
@@ -38,6 +38,7 @@
 
     static bool wait = true;
     static bool increment_version = false;
+    static int manifestVersion = -1;
 
     static void Main(string[] args)
     {
@@ -49,6 +50,7 @@
         .Add("update_msi:|um:", "Location of the last update MSI", msi => updateMsi = msi)
         .Add("update_version:|uv:", "Version of the last update MSI", ver => updateVersion = ver)
         .Add("i|increment_version", "Increment the Manifest version in the output.", option => increment_version = option != null)
+        .Add("mv=|manifest_version=", "Manifest version to use verbatim", mv => manifestVersion = Int32.Parse(mv))
         .Add("wait=", "Wait for input after execution.", dowait => wait = (dowait == "y" || dowait == "Y"));
       p.Parse(args);
 
@@ -75,6 +77,10 @@
           manifest.Version += 1;
         }
 
+        // if a manifest version was given as an option, let's use it
+        if (manifestVersion > 0)
+          manifest.Version = manifestVersion;
+
         if (!String.IsNullOrEmpty(updateMsi)) // && !String.IsNullOrEmpty(updateVersion))
         {
           if (File.Exists(updateMsi))


--===============1740169332==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/reggie.burnett@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: reggie.burnett@stripped\
#   tvdjlyuve5ye1wld
# target_branch: file:///C:/work/wex/installer/build_tools/
# testament_sha1: bc12a55a32919d3b6cd3edf4376d7a64551c1b07
# timestamp: 2012-09-04 15:04:43 -0500
# base_revision_id: iggy.galarza@stripped\
#   fxrvcxrbwlfdx2vf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWY0OjuUAAaBfgEUSUOf//3Ii
UQC////0UAP7rb3onvbuvQNbsGipspmk009TQabUaHqNNGgAAAAlII0m9TTU8k1NAANDQAAMgBlN
MkaSekzajU2p5Q0aaaaaGhoD1NADEpiammU8SNpqekwTQYgBpoMgBJIRpoTEaGhpNDTTRHomjQ00
aeoaMRVcJj6bMjq+NqxOgQV1WYgRmVg+wKiXTPS9+MkqRbHvz291CCRs3eYFD7wqCQZyAkVb4Hgv
KdUb3SBev4um7HNJ+4Uyp3wy4YuV5zuD6FSloUFc4bLljnpvcX2oJzKohAgovvsiWfuVVmILBCYT
AKX2laRNC6WVjtoEBOYgZ4VYqHy46YApBkLZwc1OABxcQYIxDgXg/JBPYRGSip2OJQPfSDZnE7bu
UMfH2L7TbKsIcZ3oAu3K56zSPiPJhrWhqPDNxWLkR7c0JCSmwUSCCoAKITX5zDAeWUyCHLkPxP6E
5VXBniqfWX2m+mBdJ+ekwrqtybKpgYkmi6QszikTDxXxB4V6Go4EDSR2Yx5z32s5nWIMQkWBr2Z5
9xVxLhTTzPMCLsG4kYpUSaW56DmTjblKCwSjKxReHLYSRS5s6pLCLI3m06uZaIPvClKz7FL7HkMr
mwaorcLmXhZkcGQudMiiIE07m0bRIBOTCzpBXNrt1P2a7QMBOjBS4mOrzhvpPC6HDJMJgN0ICzUI
40lCbzEDAFD6BeOickJ5JOCWgNLko+js5qYgYXIa+QIdFZQZbp58Tj0SxcSxHm1KYOkWjiV7Rj/a
psGZIkkZ6nLgGk20M4YnYbpKMUKdUS8znU9jQwuEd9YnqWZIDhBjusATbpnvcxBJ4LLwYj8xMUis
OF3bvzxN7q4hXb46KOooxPBo3PgsP3pJfNGxX9zCyUIo4BLyM6/+AMUua7FWQEjC4CsKVNOW8es1
ceGvWZAuVpydWhc+3uvZVWt9Q6zvDuR0AVB2AS7k4OBuDErd5lyKZjoZst3+TVATelk6R2GQPDWo
qfkGNr/XZKF4UMmYWIR7LoU95quFqNmkL9QSCTgmDyRizUJDFjwaGWVcur0FKAiKbLI5sYN7t9+l
Ua6SVJCBGVEZwzMRYRO4gh8gHdMEh0/uwOZMt20iG6WCFOKpkHjGJAT/xIUBD3IY1Qqc45g8LB98
oMNgsCZJEISecs/2CRIaXCSHbrSjrrVgGX1ykzUxERsBk8XvrXkTdEZxy6azmpueTkCCEkx6ZiR/
XgGChVDXxGDMnOJcDsBuwwbUVPJMHZmXsUxKiVoKEGJcBF5MS7F2a4m/UyVZ+RdSyBEWkVdiiFvx
C4NFxN5isDMGwLwoVp1g28VQnBquJ+f/F3JFOFCQjQ6O5Q==


--===============1740169332==--