including the coffee manager JAR in build system and project directory
This commit is contained in:
parent
cdcf783ac6
commit
3847927a43
|
@ -10,6 +10,8 @@
|
||||||
<property name="cooja_jar" value="${cooja}/dist/cooja.jar"/>
|
<property name="cooja_jar" value="${cooja}/dist/cooja.jar"/>
|
||||||
<property name="mspsim" location="../../../mspsim"/>
|
<property name="mspsim" location="../../../mspsim"/>
|
||||||
<property name="mspsim_jar" value="${lib}/mspsim.jar"/>
|
<property name="mspsim_jar" value="${lib}/mspsim.jar"/>
|
||||||
|
<property name="coffee" location="../../../coffee-manager"/>
|
||||||
|
<property name="coffee_jar" value="${lib}/coffee.jar"/>
|
||||||
<property name="cooja_mspsim_jar" value="${lib}/cooja_mspsim.jar"/>
|
<property name="cooja_mspsim_jar" value="${lib}/cooja_mspsim.jar"/>
|
||||||
|
|
||||||
<target name="init">
|
<target name="init">
|
||||||
|
@ -27,10 +29,16 @@
|
||||||
<copy todir="${lib}" file="${mspsim}/mspsim.jar" />
|
<copy todir="${lib}" file="${mspsim}/mspsim.jar" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="compile" depends="init,mspsim">
|
<target name="coffee" depends="init">
|
||||||
|
<ant antfile="build.xml" dir="${coffee}" target="jar" inheritAll="false"/>
|
||||||
|
<copy todir="${lib}" file="${coffee}/coffee.jar" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="compile" depends="init,mspsim,coffee">
|
||||||
<javac srcdir="${src}" destdir="${build}" debug="on">
|
<javac srcdir="${src}" destdir="${build}" debug="on">
|
||||||
<classpath>
|
<classpath>
|
||||||
<pathelement location="${mspsim_jar}"/>
|
<pathelement location="${mspsim_jar}"/>
|
||||||
|
<pathelement location="${coffee_jar}"/>
|
||||||
<pathelement location="${cooja_jar}"/>
|
<pathelement location="${cooja_jar}"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</javac>
|
</javac>
|
||||||
|
@ -43,6 +51,7 @@
|
||||||
<fileset dir="${src}/" includes="**/*.java"/>
|
<fileset dir="${src}/" includes="**/*.java"/>
|
||||||
<classpath>
|
<classpath>
|
||||||
<pathelement location="${mspsim_jar}"/>
|
<pathelement location="${mspsim_jar}"/>
|
||||||
|
<pathelement location="${coffee_jar}"/>
|
||||||
<pathelement location="${cooja_jar}"/>
|
<pathelement location="${cooja_jar}"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</javadoc>
|
</javadoc>
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
se.sics.cooja.GUI.MOTETYPES = + se.sics.cooja.mspmote.ESBMoteType se.sics.cooja.mspmote.SkyMoteType
|
se.sics.cooja.GUI.MOTETYPES = + se.sics.cooja.mspmote.ESBMoteType se.sics.cooja.mspmote.SkyMoteType
|
||||||
se.sics.cooja.GUI.JARFILES = + cooja_mspsim.jar mspsim.jar
|
se.sics.cooja.GUI.JARFILES = + cooja_mspsim.jar mspsim.jar coffee.jar
|
||||||
se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.mspmote.plugins.MspCLI se.sics.cooja.mspmote.plugins.MspCodeWatcher se.sics.cooja.mspmote.plugins.MspStackWatcher se.sics.cooja.mspmote.plugins.MspCycleWatcher
|
se.sics.cooja.GUI.PLUGINS = + se.sics.cooja.mspmote.plugins.MspCLI se.sics.cooja.mspmote.plugins.MspCodeWatcher se.sics.cooja.mspmote.plugins.MspStackWatcher se.sics.cooja.mspmote.plugins.MspCycleWatcher
|
||||||
|
|
Loading…
Reference in a new issue