Skip to content

Commit

Permalink
Merge pull request CesiumGS#1356 from AnalyticalGraphicsInc/issue1355
Browse files Browse the repository at this point in the history
Fix build on OS X.
  • Loading branch information
pjcozzi committed Dec 21, 2013
2 parents 2bd4f29 + e8cac1b commit 2733f78
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@

<!-- properties controlling which steps get run -->
<property name="build.minification" value="false" />
<property name="pragmas.debug" value="true" />

<!-- properties controlling how to run the server-->
<property name="runServer.public" value="false" />
Expand Down Expand Up @@ -355,15 +356,11 @@
</target>

<target name="combineJavaScript.combineCesium" depends="combineJavaScript.combineCesium.check" unless="no.combineCesium.create">
<condition property="debugOption" value="pragmas.debug=${pragmas.debug}" else="">
<isset property="pragmas.debug" />
</condition>

<exec executable="${nodePath}" dir="${sourceDirectory}">
<arg value="${rjsPath}" />
<arg value="-o" />
<arg value="${rjsOptions}" />
<arg value="${debugOption}" />
<arg value="pragmas.debug=${pragmas.debug}" />
<arg value="optimize=${optimize}" />
<arg value="baseUrl=." />
<arg value="skipModuleInsertion=true" />
Expand All @@ -374,16 +371,12 @@
</target>

<target name="combineJavaScript.combineCesiumWorkers" depends="combineJavaScript.combineCesiumWorkers.check" unless="no.combineCesiumWorkers.create">
<condition property="debugOption" value="pragmas.debug=${pragmas.debug}" else="">
<isset property="pragmas.debug" />
</condition>

<!-- create cesiumWorkerBootstrapper -->
<exec executable="${nodePath}" dir="${sourceDirectory}">
<arg value="${rjsPath}" />
<arg value="-o" />
<arg value="${rjsOptions}" />
<arg value="${debugOption}" />
<arg value="pragmas.debug=${pragmas.debug}" />
<arg value="optimize=${optimize}" />
<arg value="baseUrl=." />
<arg value="skipModuleInsertion=true" />
Expand All @@ -398,7 +391,7 @@
<arg value="-o" />
<arg value="${rjsOptions}" />
<arg value="optimize=${optimize}" />
<arg value="${debugOption}" />
<arg value="pragmas.debug=${pragmas.debug}" />
<arg value="baseUrl=." />

<srcfile prefix="name=Workers/" />
Expand Down

0 comments on commit 2733f78

Please sign in to comment.