Fixed ant build scripts, changed run shell scripts to not rely on ant, and removed binary.

This commit is contained in:
Travis Burtrum 2012-03-14 01:27:38 -04:00
parent e8689c531f
commit 533f779a4f
6 changed files with 25 additions and 20 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
.classpath .classpath
.project .project
rscd.jar rscd.jar
moparclassic.jar
ls.jar ls.jar
*.ipr *.ipr
*.iws *.iws

View File

@ -30,16 +30,6 @@
<fileset refid="libraries_managed" /> <fileset refid="libraries_managed" />
</path> </path>
<pathconvert property="manifest-classpath" pathsep=" ">
<path refid="library-managed-path" />
<mapper>
<chainedmapper>
<flattenmapper />
<globmapper from="*.jar" to="${lib_managed}/*.jar" />
</chainedmapper>
</mapper>
</pathconvert>
<path id="library-path"> <path id="library-path">
<fileset refid="libraries" /> <fileset refid="libraries" />
<fileset refid="libraries_managed" /> <fileset refid="libraries_managed" />
@ -50,10 +40,6 @@
<path refid="library-path" /> <path refid="library-path" />
</path> </path>
<manifestclasspath property="jar-classpath" jarfile="${jar}">
<classpath refid="library-managed-path" />
</manifestclasspath>
<target name="init"> <target name="init">
<mkdir dir="${bin}" /> <mkdir dir="${bin}" />
<mkdir dir="${doc}" /> <mkdir dir="${doc}" />
@ -63,6 +49,20 @@
<target name="resolve" depends="init"> <target name="resolve" depends="init">
<ivy:retrieve sync="true" /> <ivy:retrieve sync="true" />
<pathconvert property="manifest-classpath" pathsep=" ">
<path refid="library-managed-path" />
<mapper>
<chainedmapper>
<flattenmapper />
<globmapper from="*.jar" to="${lib_managed}/*.jar" />
</chainedmapper>
</mapper>
</pathconvert>
<manifestclasspath property="jar-classpath" jarfile="${jar}">
<classpath refid="library-managed-path" />
</manifestclasspath>
</target> </target>
<target name="build" depends="resolve"> <target name="build" depends="resolve">
@ -87,7 +87,7 @@
<delete file="${jar}" /> <delete file="${jar}" />
</target> </target>
<target name="run"> <target name="run" depends="build">
<java classpathref="master-path" fork="true" classname="${main-class}" /> <java classpathref="master-path" fork="true" classname="${main-class}" />
</target> </target>
@ -97,7 +97,7 @@
</scaladoc> </scaladoc>
</target> </target>
<target name="run-jar"> <target name="run-jar" depends="jar">
<java fork="true" jar="${jar}" /> <java fork="true" jar="${jar}" />
</target> </target>

Binary file not shown.

View File

@ -1 +1,2 @@
ant run #!/bin/sh
java -jar moparclassic.jar

View File

@ -8,10 +8,10 @@
<target name="clean"> <target name="clean">
<delete file="${jar}" /> <delete file="${jar}" />
<delete dir="${build}" /> <delete dir="${build}" />
<mkdir dir="${build}" />
</target> </target>
<target name="build"> <target name="build">
<mkdir dir="${build}" />
<javac srcdir="${src}" destdir="${build}" debug="on"> <javac srcdir="${src}" destdir="${build}" debug="on">
<classpath> <classpath>
<pathelement location="${lib}/mina.jar" /> <pathelement location="${lib}/mina.jar" />
@ -31,7 +31,7 @@
</target> </target>
<target name="run"> <target name="run" depends="jar">
<java classname="org.moparscape.msc.ls.Server" fork="true"> <java classname="org.moparscape.msc.ls.Server" fork="true">
<classpath> <classpath>
<pathelement location="${lib}/mina.jar" /> <pathelement location="${lib}/mina.jar" />

View File

@ -1 +1,4 @@
ant run #!/bin/bash
libs=$(find lib/ -type f -print0 | sed "s/\x0/:/g")
#libs="lib/slf4j.jar:lib/hex-string.jar:lib/mysql-connector.jar:lib/xstream.jar:lib/xpp3.jar:lib/mina.jar:"
java -cp "$libs./ls.jar" org.moparscape.msc.ls.Server