diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-11-08 22:22:39 -0800 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-11-08 22:22:39 -0800 |
| commit | 222d5621fd8298dd8eb44b52a7774e98e6eb21b7 (patch) | |
| tree | c636b866e76a9fed7ff97512f42ca4ea52519f4e | |
| parent | bdd9777505b8954ec5d52f5236f1c3afba3a7667 (diff) | |
DRTVWR-418: Use separate XML string elements for command arguments.
autobuild now passes a vector of arguments to the commands it executes,
instead of smashing everything together into a single string only to have
cmd.exe parse it back into individual arguments again. In general, this is a
good thing and more robust than before.
However, it surfaces the fact that sometimes people were lazy and encoded
things like "-configuration Release" or "-j 12" as single <string> elements in
the XML. When such things are handed to the command as a single argument string
containing a space, it can get confused.
Code (e.g.) <string>-configuration</string><string>Release</string> instead.
| -rwxr-xr-x | autobuild.xml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/autobuild.xml b/autobuild.xml index 148506caa7..34ea70cb11 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -3296,8 +3296,8 @@ </array> <key>options</key> <array> - <string>-configuration RelWithDebInfo</string> - <string>-project SecondLife.xcodeproj</string> + <string>-configuration</string><string>RelWithDebInfo</string> + <string>-project</string><string>SecondLife.xcodeproj</string> </array> </map> <key>configure</key> @@ -3325,8 +3325,8 @@ <string>xcodebuild</string> <key>options</key> <array> - <string>-configuration RelWithDebInfo</string> - <string>-project SecondLife.xcodeproj</string> + <string>-configuration</string><string>RelWithDebInfo</string> + <string>-project</string><string>SecondLife.xcodeproj</string> </array> </map> <key>configure</key> @@ -3352,8 +3352,8 @@ </array> <key>options</key> <array> - <string>-configuration Release</string> - <string>-project SecondLife.xcodeproj</string> + <string>-configuration</string><string>Release</string> + <string>-project</string><string>SecondLife.xcodeproj</string> <string>-DENABLE_SIGNING:BOOL=YES</string> <string>-DSIGNING_IDENTITY:STRING="Developer ID Application: Linden Research, Inc."</string> </array> @@ -3416,7 +3416,7 @@ <string>make</string> <key>options</key> <array> - <string>-j 12</string> + <string>-j</string><string>12</string> </array> </map> <key>configure</key> @@ -3444,7 +3444,7 @@ <string>make</string> <key>options</key> <array> - <string>-j 7</string> + <string>-j</string><string>7</string> </array> </map> <key>configure</key> @@ -3466,7 +3466,7 @@ <string>make</string> <key>options</key> <array> - <string>-j 12</string> + <string>-j</string><string>12</string> </array> </map> <key>configure</key> @@ -3492,7 +3492,7 @@ <string>make</string> <key>options</key> <array> - <string>-j 7</string> + <string>-j</string><string>7</string> </array> </map> <key>configure</key> |