Moved src/as and src/ms into src/main along with their java brethren.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1091 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Michael Bayne
2010-11-23 19:35:01 +00:00
parent de1d4fe492
commit 26abce367c
109 changed files with 6 additions and 5 deletions
+6 -5
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" standalone="yes"?> <?xml version="1.0" standalone="yes"?>
<project name="nenya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant"> <project name="nenya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<property name="src.dir" value="src/main/java"/> <property name="src.dir" value="src/main/java"/>
<property name="asrc.dir" value="src/main/as"/>
<property name="tsrc.dir" value="src/test/java"/> <property name="tsrc.dir" value="src/test/java"/>
<property name="deploy.dir" value="dist"/> <property name="deploy.dir" value="dist"/>
<property name="classes.dir" value="${deploy.dir}/classes"/> <property name="classes.dir" value="${deploy.dir}/classes"/>
@@ -101,7 +102,7 @@
<condition property="no_rebuild_aslib"><or> <condition property="no_rebuild_aslib"><or>
<isset property="no_build_aslib"/> <isset property="no_build_aslib"/>
<uptodate targetfile="${deploy.dir}/${ant.project.name}lib.swc"> <uptodate targetfile="${deploy.dir}/${ant.project.name}lib.swc">
<srcfiles dir="src/as" includes="**/*.as"/> <srcfiles dir="${asrc.dir}" includes="**/*.as"/>
</uptodate> </uptodate>
</or></condition> </or></condition>
</target> </target>
@@ -130,8 +131,8 @@
<arg value="-load-config"/> <arg value="-load-config"/>
<arg value="${deploy.dir}/aslib-config.xml"/> <arg value="${deploy.dir}/aslib-config.xml"/>
<arg value="-compiler.optimize"/> <arg value="-compiler.optimize"/>
<arg value="-compiler.source-path=src/as/"/> <arg value="-compiler.source-path=${asrc.dir}/"/>
<arg value="-include-sources=src/as/"/> <arg value="-include-sources=${asrc.dir}/"/>
<arg value="-output"/> <arg value="-output"/>
<arg value="${deploy.dir}/${ant.project.name}lib.swc"/> <arg value="${deploy.dir}/${ant.project.name}lib.swc"/>
</java> </java>
@@ -180,7 +181,7 @@
<arg line="-library-path ${flexsdk.dir}/frameworks/libs"/> <arg line="-library-path ${flexsdk.dir}/frameworks/libs"/>
<arg line="-library-path ${deploy.dir}/lib"/> <arg line="-library-path ${deploy.dir}/lib"/>
<arg line="-templates-path ${flexsdk.dir}/asdoc/templates"/> <arg line="-templates-path ${flexsdk.dir}/asdoc/templates"/>
<arg line="-doc-sources src/as"/> <arg line="-doc-sources ${asrc.dir}"/>
<arg line="-output ${deploy.dir}/asdocs"/> <arg line="-output ${deploy.dir}/asdocs"/>
</java> </java>
</target> </target>
@@ -305,7 +306,7 @@
<target name="genascript" depends="-preptools" <target name="genascript" depends="-preptools"
description="Generates ActionScript versions of our Streamable classes."> description="Generates ActionScript versions of our Streamable classes.">
<genascript header="lib/SOURCE_HEADER" asroot="src/as"> <genascript header="lib/SOURCE_HEADER" asroot="${asrc.dir}">
<fileset dir="${src.dir}" includes="**/data/*.java"/> <fileset dir="${src.dir}" includes="**/data/*.java"/>
</genascript> </genascript>
</target> </target>

Some files were not shown because too many files have changed in this diff Show More