AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to ooo-build 2.5 since the maven-ant-tasks jar 2.1 uses is no longer available

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6667 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Charlie Groves
2011-06-24 20:12:08 +00:00
parent 2820d6797a
commit 85262d498d
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.classpath
+6 -5
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/depot"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="dist/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="dist/classes" path="src/main/resources"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="src" output="dist/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="dist/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="dist/classes"/>
</classpath> </classpath>
build.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<property name="classes.dir" location="${deploy.dir}/classes"/> <property name="classes.dir" location="${deploy.dir}/classes"/>
<property name="tclasses.dir" location="${deploy.dir}/test-classes"/> <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
<property name="ooo-build.vers" value="2.1"/> <property name="ooo-build.vers" value="2.5"/>
<ant antfile="etc/bootstrap.xml"/> <ant antfile="etc/bootstrap.xml"/>
<import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/> <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
etc/as-pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<dependency> <dependency>
<groupId>com.threerings</groupId> <groupId>com.threerings</groupId>
<artifactId>aspirin</artifactId> <artifactId>aspirin</artifactId>
<version>1.6</version> <version>1.7-SNAPSHOT</version>
<type>swc</type> <type>swc</type>
</dependency> </dependency>
<dependency> <dependency>
src/main/as/com/threerings/presents/dobj/DSet.as
+1 -6
View File
@@ -110,12 +110,7 @@ public class DSet
} }
/** /**
* Copies the elements of this distributed set into the supplied * Returns the elements of this distributed set in an Array.
* array. If the array is not large enough to hold all of the
* elements, as many as fit into the array will be copied. If the
* <code>array</code> argument is null, an object array of sufficient
* size to contain all of the elements of this set will be created and
* returned.
*/ */
public function toArray () :Array public function toArray () :Array
{ {