This commit is contained in:
BetaSteward 2010-04-11 22:16:51 +00:00
parent a321138dfc
commit efdceacaf6
4 changed files with 23 additions and 23 deletions

View file

@ -339,9 +339,9 @@ is divided into following sections:
--> -->
<target depends="init" name="deps-jar" unless="no.deps"> <target depends="init" name="deps-jar" unless="no.deps">
<ant antfile="${project.Mage}/build.xml" inheritall="false" target="jar"/> <ant antfile="${project.Mage}/build.xml" inheritall="false" target="jar"/>
<ant antfile="${project.Mage_AI}/build.xml" inheritall="false" target="jar"/>
<ant antfile="${project.Mage_Common}/build.xml" inheritall="false" target="jar"/> <ant antfile="${project.Mage_Common}/build.xml" inheritall="false" target="jar"/>
<ant antfile="${project.Mage_HumanPlayer}/build.xml" inheritall="false" target="jar"/> <ant antfile="${project.Mage_Player_AI}/build.xml" inheritall="false" target="jar"/>
<ant antfile="${project.Mage_Player_Human}/build.xml" inheritall="false" target="jar"/>
<ant antfile="${project.Mage_Sets}/build.xml" inheritall="false" target="jar"/> <ant antfile="${project.Mage_Sets}/build.xml" inheritall="false" target="jar"/>
</target> </target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
@ -696,9 +696,9 @@ is divided into following sections:
--> -->
<target depends="init" name="deps-clean" unless="no.deps"> <target depends="init" name="deps-clean" unless="no.deps">
<ant antfile="${project.Mage}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.Mage}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.Mage_AI}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.Mage_Common}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.Mage_Common}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.Mage_HumanPlayer}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.Mage_Player_AI}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.Mage_Player_Human}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.Mage_Sets}/build.xml" inheritall="false" target="clean"/> <ant antfile="${project.Mage_Sets}/build.xml" inheritall="false" target="clean"/>
</target> </target>
<target depends="init" name="-do-clean"> <target depends="init" name="-do-clean">

View file

@ -3,6 +3,6 @@ build.xml.script.CRC32=7fe29de1
build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45 build.xml.stylesheet.CRC32=958a1d3e@1.26.2.45
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=c70740ce nbproject/build-impl.xml.data.CRC32=6d7d5003
nbproject/build-impl.xml.script.CRC32=5b9b3297 nbproject/build-impl.xml.script.CRC32=ba175561
nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45 nbproject/build-impl.xml.stylesheet.CRC32=5c621a33@1.26.2.45

View file

@ -27,8 +27,8 @@ javac.classpath=\
${reference.Mage.jar}:\ ${reference.Mage.jar}:\
${reference.Mage_Common.jar}:\ ${reference.Mage_Common.jar}:\
${reference.Mage_Sets.jar}:\ ${reference.Mage_Sets.jar}:\
${reference.Mage_HumanPlayer.jar}:\ ${reference.Mage_Player_AI.jar}:\
${reference.Mage_AI.jar} ${reference.Mage_Player_Human.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options
javac.compilerargs= javac.compilerargs=
javac.deprecation=false javac.deprecation=false
@ -60,24 +60,24 @@ meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform platform.active=default_platform
project.license=bsd project.license=bsd
project.Mage=../Mage project.Mage=../Mage
project.Mage_AI=../Mage.AI
project.Mage_Common=../Mage.Common project.Mage_Common=../Mage.Common
project.Mage_HumanPlayer=../Mage.HumanPlayer project.Mage_Player_AI=../Mage.Player.AI
project.Mage_Player_Human=../Mage.Player.Human
project.Mage_Sets=../Mage.Sets project.Mage_Sets=../Mage.Sets
reference.Mage.jar=${project.Mage}/dist/Mage.jar reference.Mage.jar=${project.Mage}/dist/Mage.jar
reference.Mage_AI.jar=${project.Mage_AI}/dist/Mage.AI.jar
reference.Mage_Common.jar=${project.Mage_Common}/dist/Mage.Common.jar reference.Mage_Common.jar=${project.Mage_Common}/dist/Mage.Common.jar
reference.Mage_HumanPlayer.jar=${project.Mage_HumanPlayer}/dist/Mage.HumanPlayer.jar reference.Mage_Player_AI.jar=${project.Mage_Player_AI}/dist/Mage.Player.AI.jar
reference.Mage_Player_Human.jar=${project.Mage_Player_Human}/dist/Mage.Player.Human.jar
reference.Mage_Sets.jar=${project.Mage_Sets}/dist/Mage.Sets.jar reference.Mage_Sets.jar=${project.Mage_Sets}/dist/Mage.Sets.jar
run-sys-prop.java.endorsed.dirs=${jaxbwiz.endorsed.dirs} run-sys-prop.java.endorsed.dirs=${jaxbwiz.endorsed.dirs}
run.classpath=\ run.classpath=\
${javac.classpath}:\ ${javac.classpath}:\
${build.classes.dir} ${build.classes.dir}
run.jvmargs=-server -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.config run.jvmargs=-cp plugins/*; -server -Djava.security.policy=./config/security.policy -Djava.util.logging.config.file=./config/logging.properties
run.test.classpath=\ run.test.classpath=\
${javac.test.classpath}:\ ${javac.test.classpath}:\
${build.test.classes.dir} ${build.test.classes.dir}
source.encoding=UTF-8 source.encoding=UTF-8
src.dir=src src.dir=src
test.src.dir=test test.src.dir=test
app.version=0.1 app.version=0.2

View file

@ -25,14 +25,6 @@
<clean-target>clean</clean-target> <clean-target>clean</clean-target>
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference>
<foreign-project>Mage_AI</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
<reference> <reference>
<foreign-project>Mage_Common</foreign-project> <foreign-project>Mage_Common</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
@ -42,7 +34,15 @@
<id>jar</id> <id>jar</id>
</reference> </reference>
<reference> <reference>
<foreign-project>Mage_HumanPlayer</foreign-project> <foreign-project>Mage_Player_AI</foreign-project>
<artifact-type>jar</artifact-type>
<script>build.xml</script>
<target>jar</target>
<clean-target>clean</clean-target>
<id>jar</id>
</reference>
<reference>
<foreign-project>Mage_Player_Human</foreign-project>
<artifact-type>jar</artifact-type> <artifact-type>jar</artifact-type>
<script>build.xml</script> <script>build.xml</script>
<target>jar</target> <target>jar</target>