Fix build

This commit is contained in:
Victor Shcherb 2014-06-18 01:45:13 +02:00
parent e92b0d0476
commit b3e3c2ce02

View file

@ -135,14 +135,30 @@
<target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile"> <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
<!-- osmchange : Osmand plus support --> <!-- osmchange : Osmand plus support -->
<mkdir dir="${gen.absolute.dir}/net/osmand/plus"/> <mkdir dir="${gen.absolute.dir}/net/osmand/plus"/>
<copy todir="${gen.absolute.dir}/net/osmand/plus"> <if>
<fileset dir="${gen.absolute.dir}/net/osmand"> <condition>
<include name="R.java" /> <isset property="net.osmand.sherpafy" />
</fileset> </condition>
<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy"> <then>
<include name="R.java" /> <copy todir="${gen.absolute.dir}/net/osmand/plus">
</fileset> <fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
</copy> <include name="R.java" />
</fileset>
</copy>
</then>
</if>
<if>
<condition>
<isset property="net.osmand" />
</condition>
<then>
<copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand">
<include name="R.java" />
</fileset>
</copy>
</then>
</if>
<replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" /> <replaceregexp file="${gen.absolute.dir}/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
<!-- osmchange : Osmand plus support --> <!-- osmchange : Osmand plus support -->