From f37a84fb853ce8cc5f00bebfb1e877312157cb56 Mon Sep 17 00:00:00 2001
From: Scott Hunter <shunter@agi.com>
Date: Mon, 7 Apr 2014 17:25:32 -0400
Subject: [PATCH] Fix build for new transferTypedArrayTest worker.

---
 Source/Workers/transferTypedArrayTest.js |  4 +++-
 build.xml                                | 24 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Source/Workers/transferTypedArrayTest.js b/Source/Workers/transferTypedArrayTest.js
index afc53c0d7aa..01c34cfb400 100644
--- a/Source/Workers/transferTypedArrayTest.js
+++ b/Source/Workers/transferTypedArrayTest.js
@@ -1,6 +1,8 @@
 /*global self:true*/
 // make sure self is defined so that the Dojo build can evaluate this file without crashing.
-self = self || {};
+if (typeof self === 'undefined') {
+    self = {};
+}
 
 self.onmessage = function(event) {
     "use strict";
diff --git a/build.xml b/build.xml
index ed67fa80685..36eeeff3f98 100644
--- a/build.xml
+++ b/build.xml
@@ -365,8 +365,8 @@
 	</target>
 
 	<target name="combineJavaScript.combineCesiumWorkers" depends="combineJavaScript.combineCesiumWorkers.check" unless="no.combineCesiumWorkers.create">
-		<!-- create cesiumWorkerBootstrapper -->
-		<exec executable="${nodePath}" dir="${sourceDirectory}">
+		<!-- create standalone worker files -->
+		<apply executable="${nodePath}" dir="${sourceDirectory}" relative="true" force="true">
 			<arg value="${rjsPath}" />
 			<arg value="-o" />
 			<arg value="${rjsOptions}" />
@@ -375,11 +375,22 @@
 			<arg value="baseUrl=." />
 			<arg value="skipModuleInsertion=true" />
 			<arg value="wrap=false" />
-			<arg value="include=Workers/cesiumWorkerBootstrapper.js" />
-			<arg value="out=${relativeCombineOutputDirectory}/Workers/cesiumWorkerBootstrapper.js" />
-		</exec>
+			<srcfile prefix="include=Workers/" />
+			<targetfile prefix="out=" />
+			<globmapper from="*" to="${relativeCombineOutputDirectory}/Workers/*.js" />
+			<mappedresources>
+				<fileset dir="${sourceDirectory}/Workers">
+					<include name="cesiumWorkerBootstrapper.js" />
+					<include name="transferTypedArrayTest.js" />
+				</fileset>
+				<chainedmapper>
+					<flattenmapper />
+					<globmapper from="*.js" to="*" />
+				</chainedmapper>
+			</mappedresources>
+		</apply>
 
-		<!-- create each combined worker layer -->
+		<!-- create combined worker layer files -->
 		<apply executable="${nodePath}" dir="${sourceDirectory}" relative="true" force="true">
 			<arg value="${rjsPath}" />
 			<arg value="-o" />
@@ -396,6 +407,7 @@
 					<include name="*.js" />
 					<exclude name="*.profile.js" />
 					<exclude name="cesiumWorkerBootstrapper.js" />
+					<exclude name="transferTypedArrayTest.js" />
 					<exclude name="createTaskProcessorWorker.js" />
 				</fileset>
 				<chainedmapper>