add ability to specify target arch

Author: mmckegg

README.md

@@ -47,6 +47,7 @@ var options = {
 
   // optional
   description: "Some description",
+  arch: 'x86',
   localInstall: true
 
 }
@@ -75,6 +76,7 @@ Options:
    -n, --name           
    -v, --version        Specify application version
    -m, --manufacturer   
+   -a, --arch           Specify the target architecture: x86 or x64 (optional)
    -u, --upgrade-code   Specify GUID to use for upgrading from other versions
    -i, --icon           Specify an icon to use on shortcuts and installer
    -e, --executable     Specify file to create shortcuts for

cli.js

@@ -35,6 +35,11 @@ var opts = require("nomnom")
       required: true
     },
 
+    'arch': {
+      abbr: 'a',
+      help: 'Specify the target architecture: x86 or x64 (optional)'
+    },
+
     'upgradeCode': {
       abbr: 'u',
       full: 'upgrade-code',

generate-xml.js

@@ -81,7 +81,7 @@ function installerFor (components, options) {
         Name: 'SourceDir'
       }, [
         el('Directory', {
-          Id: options.localInstall ? 'LocalAppDataFolder' : 'ProgramFilesFolder', 
+          Id: getProgramsFolder(options), 
         }, [
           el('Directory', {
             Id: 'INSTALLDIR',
@@ -168,6 +168,18 @@ function getComponents (path, options, cb) {
   })
 }
 
+function getProgramsFolder (options) {
+  if (options.localInstall) {
+    return 'LocalAppDataFolder'
+  } else {
+    if (options.arch === 'x64') {
+      return 'ProgramFiles64Folder'
+    } else {
+      return 'ProgramFilesFolder'
+    }
+  }
+}
+
 function escapeId (id) {
   return encodeURIComponent(id)
 }

index.js

@@ -11,12 +11,19 @@ module.exports = function(options, cb) {
   //  upgradeCode
   //  version
   //  manufacturer
+  //  arch
   //  iconPath
   //  executable
   //  localInstall
 
   writeXml(options, function (err, path) {
-    execFile('wixl', [path, '-o', options.output], cb)
+    var args = [path, '-o', options.output]
+
+    if (options.arch) {
+      args.push('--arch', options.arch)
+    }
+
+    execFile('wixl', args, cb)
   })
 }
 

lib/hyperxml.js

@@ -2,10 +2,31 @@ var Xml = require('xmlbuilder')
 
 module.exports = h
 
-var proto = {}
+var proto = {
+  constructor: h
+}
+
 Object.defineProperty(proto, 'toXml', {
   value: function (options) {
-    return Xml.create(this).end(options)
+
+    var root = Xml.create(this.name, this.attributes)
+    addChildren.call(root, this.childNodes)
+
+    function addChildren(child) {
+      var parent = this
+      if (Array.isArray(child)) {
+        child.forEach(addChildren, parent)
+      } else if (typeof child === 'string') {
+        parent.text(child)
+      } else if (child instanceof Object) {
+        if (child.name) {
+          var node = parent.element(child.name, child.attributes)
+          addChildren.call(node, child.childNodes)
+        }
+      }
+    }
+
+    return root.toString(options)
   },
   writable: true,
   configurable: true,
@@ -15,25 +36,13 @@ Object.defineProperty(proto, 'toXml', {
 function h (name, attr, children) {
   var obj = Object.create(proto)
 
-  obj[name] = []
-
-  if (Array.isArray(attr)) {
+  if (Array.isArray(attr) && !children) {
     children = attr
-    attr = null
-  }
-
-  if (attr && Object.keys(attr).length) {
-    var mappedAttributes = {}
-    for (var k in attr) {
-      mappedAttributes['@' + k] = attr[k]
-    }
-    obj[name].push(mappedAttributes)
-  }
-
-
-  if (children) {
-    obj[name].push(children)
+    attr = {}
   }
 
+  obj.name = name
+  obj.attributes = attr
+  obj.childNodes = children
   return obj
 }