tidied up build.xml with Zells permission, which exposed a problem with the Environment switcheroo, also fixed
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5055 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -174,9 +174,11 @@
|
|||||||
<and>
|
<and>
|
||||||
<uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
|
<uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
|
||||||
<srcfiles dir="src/as" includes="**/*.as"/>
|
<srcfiles dir="src/as" includes="**/*.as"/>
|
||||||
|
<srcfiles dir="src/as" includes="**/Environment.as-fp"/>
|
||||||
</uptodate>
|
</uptodate>
|
||||||
<uptodate targetfile="${deploy.dir}/${lib.name}lib.abc">
|
<uptodate targetfile="${deploy.dir}/${lib.name}lib.abc">
|
||||||
<srcfiles dir="src/as" includes="**/*.as"/>
|
<srcfiles dir="src/as" includes="**/*.as"/>
|
||||||
|
<srcfiles dir="src/as" includes="**/Environment.as-tm"/>
|
||||||
</uptodate>
|
</uptodate>
|
||||||
</and>
|
</and>
|
||||||
</or></condition>
|
</or></condition>
|
||||||
@@ -203,6 +205,7 @@
|
|||||||
<arg value="${deploy.dir}/${lib.name}lib.swc"/>
|
<arg value="${deploy.dir}/${lib.name}lib.swc"/>
|
||||||
</java>
|
</java>
|
||||||
<delete file="${deploy.dir}/aslib-config.xml"/>
|
<delete file="${deploy.dir}/aslib-config.xml"/>
|
||||||
|
<delete file="src/as/com/threerings/util/env/Environment.as"/>
|
||||||
|
|
||||||
<copy file="src/as/com/threerings/util/env/Environment.as-tm"
|
<copy file="src/as/com/threerings/util/env/Environment.as-tm"
|
||||||
tofile="src/as/com/threerings/util/env/Environment.as"/>
|
tofile="src/as/com/threerings/util/env/Environment.as"/>
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ public class Environment
|
|||||||
if (obj != null) {
|
if (obj != null) {
|
||||||
return Domain.currentDomain.getVariables(obj);
|
return Domain.currentDomain.getVariables(obj);
|
||||||
}
|
}
|
||||||
|
return new Array();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user