[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r22703: {projects} update BUILD with new android target, update strings for new (in projects/android/trunk/Orbot: . res/layout res/values)
Author: erinn
Date: 2010-07-29 15:00:10 +0000 (Thu, 29 Jul 2010)
New Revision: 22703
Modified:
projects/android/trunk/Orbot/AndroidManifest.xml
projects/android/trunk/Orbot/BUILD
projects/android/trunk/Orbot/build.xml
projects/android/trunk/Orbot/default.properties
projects/android/trunk/Orbot/res/layout/layout_about.xml
projects/android/trunk/Orbot/res/values/strings.xml
Log:
update BUILD with new android target, update strings for new versions of Tor and Orbot
Modified: projects/android/trunk/Orbot/AndroidManifest.xml
===================================================================
--- projects/android/trunk/Orbot/AndroidManifest.xml 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/AndroidManifest.xml 2010-07-29 15:00:10 UTC (rev 22703)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
package="org.torproject.android"
- android:versionName="0.2.2.13-orbot-alpha-0.0.8" android:versionCode="8">
+ android:versionName="0.2.2.14-orbot-alpha-0.0.9" android:versionCode="8">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
Modified: projects/android/trunk/Orbot/BUILD
===================================================================
--- projects/android/trunk/Orbot/BUILD 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/BUILD 2010-07-29 15:00:10 UTC (rev 22703)
@@ -122,7 +122,7 @@
cd ../Orbot/
cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy
cp ~/mydroid/external/tor/tor/src/or/tor assets/tor
- $APP_SDK/android update project --name Orbot --target 1 --path .
+ $APP_SDK/android update project --name Orbot --target 3 --path .
ant release
This will produce an unsigned Tor package in ./bin/Orbot-unsigned.apk!
Modified: projects/android/trunk/Orbot/build.xml
===================================================================
--- projects/android/trunk/Orbot/build.xml 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/build.xml 2010-07-29 15:00:10 UTC (rev 22703)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="Orbot">
+<project name="Orbot" default="help">
<!-- The local.properties file is created and updated by the 'android' tool.
It contains the path to the SDK. It should *NOT* be checked in in Version
Modified: projects/android/trunk/Orbot/default.properties
===================================================================
--- projects/android/trunk/Orbot/default.properties 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/default.properties 2010-07-29 15:00:10 UTC (rev 22703)
@@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density.
split.density=false
# Project target.
-target=android-3
+target=Google Inc.:Google APIs:3
apk-configurations=
Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml
===================================================================
--- projects/android/trunk/Orbot/res/layout/layout_about.xml 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/res/layout/layout_about.xml 2010-07-29 15:00:10 UTC (rev 22703)
@@ -80,7 +80,7 @@
android:paddingLeft="15px"
android:textStyle="bold"
android:textColor="#00ff00" />
- <TextView android:text="Tor v0.2.2.13: https://www.torproject.org";
+ <TextView android:text="Tor v0.2.2.14: https://www.torproject.org";
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:autoLink="web"
Modified: projects/android/trunk/Orbot/res/values/strings.xml
===================================================================
--- projects/android/trunk/Orbot/res/values/strings.xml 2010-07-29 14:52:39 UTC (rev 22702)
+++ projects/android/trunk/Orbot/res/values/strings.xml 2010-07-29 15:00:10 UTC (rev 22703)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Orbot</string>
- <string name="app_version">0.0.8</string>
+ <string name="app_version">0.0.9</string>
<string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string>