From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 22 Jan 2013 23:45:56 +0000 (-0600)
Subject: mkwinpeimg: Add IA64 arch and update docs
X-Git-Tag: v1.2.4~17
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=ef55938bb51da1f29cd3213ee0341cfb4e1ad2b2

mkwinpeimg: Add IA64 arch and update docs

Add IA64 architecture as a valid argument to --arch, and also update the help
and man page.
---

diff --git a/doc/mkwinpeimg.1.in b/doc/mkwinpeimg.1.in
index 94092e64..1f2dc187 100644
--- a/doc/mkwinpeimg.1.in
+++ b/doc/mkwinpeimg.1.in
@@ -78,6 +78,11 @@ Adds all the files in DIR to the Windows PE image.
 \fB\-t\fR, \fB\-\-tmp\-dir\fR=\fIDIR\fR
 Use DIR for temporary files.  Defaults to a directory made using "mktemp -d".
 .TP
+\fB\-a\fR, \fB\-\-arch\fR=\fIARCH\fR
+Use the Windows PE version from the Windows Automated Installation Kit that has
+the CPU architecture \fIARCH\fR.  Only valid with \fB\-\-waik\-dir\fR.  Possible
+values: "x86", "amd64", or "ia64".  Default is "x86".
+.TP
 \fB\-h\fR, \fB\-\-help\fR
 Display help.
 .TP
diff --git a/programs/mkwinpeimg b/programs/mkwinpeimg
index 48cca301..3075c28d 100755
--- a/programs/mkwinpeimg
+++ b/programs/mkwinpeimg
@@ -106,8 +106,9 @@ Usage: $script_name [OPTIONS] IMAGE
   -O, --overlay=DIR        Adds all the files in DIR to the Windows PE image.
   -t, --tmp-dir=DIR        Use DIR as the temporary base of the ISO filesystem.  
                               Defaults to making one using "mktemp -d".
-  -a, --arch=ARCH          Use ARCH version (x86 or amd64)
-                              Defaults: x86
+  -a, --arch=ARCH          Use the Windows PE version from the WAIK that has
+                              the CPU architecture ARCH.  Possible values:
+                              "x86", "amd64", or "ia64".  Default is "x86".
   -h, --help               Display this information.
   -v, --version            Show version information.
 
@@ -182,13 +183,14 @@ process_command_line() {
 			if [ "$2" == "x86" ]; then
 				arch="X86"
 				arch_id="1"
-
+			elif [ "$2" == "ia64" ]; then
+				arch="IA64"
+				arch_id="2"
 			elif [ "$2" == "amd64" ]; then
 				arch="AMD64"
 				arch_id="3"
-
 			else 
-				echo "ERROR: $2 is not a valid arch (x86/amd64)"
+				echo "ERROR: $2 is not a valid arch (x86/amd64/ia64)"
 				exit 1
 			fi
 			shift