I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 245f69f2 authored by sponge's avatar sponge
Browse files

Fix build problems for the routerjars libs stuff... Should build fine now.

parent 28230c91
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.i2p.android.router" package="net.i2p.android.router"
android.versionCode="4720660" android.versionCode="4720656"
android.versionName="0.9.1-1_b5-API8" android.versionName="0.9.1-1_b1-API8"
android:installLocation="preferExternal" android:installLocation="preferExternal"
> >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
......
...@@ -367,10 +367,12 @@ ...@@ -367,10 +367,12 @@
<!-- overrides of those in main_rules.xml --> <!-- overrides of those in main_rules.xml -->
<target name="-pre-build" depends="copy-i2p-resources" > <target name="-pre-build" depends="copy-i2p-resources" >
<!-- aapt messes up when resources are added or deleted, just build every time --> <!-- aapt messes up when resources are added or deleted, just build every time
<delete dir="${gen.absolute.dir}/net" verbose="${verbose}" /> <delete dir="${gen.absolute.dir}/net" verbose="${verbose}" />
<!-- screw it, do the classes too, until I add the depend class --> -->
<!-- screw it, do the classes too, until I add the depend class
<delete dir="${out.absolute.dir}/classes/net" verbose="${verbose}" /> <delete dir="${out.absolute.dir}/classes/net" verbose="${verbose}" />
-->
</target> </target>
<!-- <!--
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.i2p.android.router" package="net.i2p.android.router"
android.versionCode="4720660" android.versionCode="4720656"
android.versionName="0.9.1-1_b5-API8" android.versionName="0.9.1-1_b1-API8"
android:installLocation="preferExternal" android:installLocation="preferExternal"
> >
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<!-- override with i2psrc=path/to/source in local.properties --> <!-- override with i2psrc=path/to/source in local.properties -->
<property name="i2psrc" value="../../i2p.i2p" /> <property name="i2psrc" value="../../i2p.i2p" />
<property name="i2pbase" location="${i2psrc}" /> <property name="i2pbase" location="${i2psrc}" />
<available file="${i2psrc}" property="i2p.present" /> <available file="${i2pbase}" property="i2p.present" />
<fail message="I2P source directory ${i2psrc} was not found. Install it there or set i2psrc=/path/to/source in local.properties" > <fail message="I2P source directory ${i2pbase} was not found. Install it there or set i2psrc=/path/to/source in local.properties" >
<condition> <condition>
<not> <not>
<isset property="i2p.present" /> <isset property="i2p.present" />
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<target name="-pre-compile" depends="jbigi, buildrouter" /> <target name="-pre-compile" depends="jbigi, buildrouter" />
<!-- <!--
Creates the output directories if they don't exist yet. Creates the output directories if they don't exist yet.
--> -->
<target name="-dirs"> <target name="-dirs">
<echo>Creating output directories if needed...</echo> <echo>Creating output directories if needed...</echo>
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<target name="buildrouter" depends="-dirs" > <target name="buildrouter" depends="-dirs" >
<!-- build router and core --> <!-- build router and core -->
<ant dir="${i2pbase}" > <ant dir="${i2pbase}" inheritall="false" useNativeBasedir="true" >
<target name="buildRouter" /> <target name="buildRouter" />
<target name="buildI2PTunnel" /> <target name="buildI2PTunnel" />
<target name="buildAddressbook" /> <target name="buildAddressbook" />
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<copy file="${i2pbase}/build/router.jar" todir="${jar.libs.dir}" /> <copy file="${i2pbase}/build/router.jar" todir="${jar.libs.dir}" />
<!-- bob --> <!-- bob -->
<copy file="${i2pbase}/build/BOB.jar" todir="${jar.libs.dir}" /> <copy file="${i2pbase}/apps/BOB/dist/BOB.jar" todir="${jar.libs.dir}" />
<!-- core --> <!-- core -->
<!-- lots of unneeded stuff could be deleted here --> <!-- lots of unneeded stuff could be deleted here -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment