Skip to content

Commit

Permalink
Fix build for new transferTypedArrayTest worker.
Browse files Browse the repository at this point in the history
  • Loading branch information
shunter committed Apr 7, 2014
1 parent a3a6aeb commit f37a84f
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
4 changes: 3 additions & 1 deletion 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";
Expand Down
24 changes: 18 additions & 6 deletions build.xml
Expand Up @@ -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}" />
Expand All @@ -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" />
Expand All @@ -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>
Expand Down

0 comments on commit f37a84f

Please sign in to comment.