Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated deliver_sdk

Browse source 
Conflicts:
	default.properties
This commit is contained in:
Sylvain Berfini 2012-12-07 11:49:11 +01:00
parent 704fd320b6
commit 1ad330c8a4
2 changed files with 96 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
custom_rules.xml
View file

@ -49,6 +49,19 @@
<target name="-post-compile" depends="javah, build-libs"> <target name="-post-compile" depends="javah, build-libs">
</target> </target>
<target name="javadoc">
<echo level="info">Generate Javadoc</echo>
<javadoc
destdir="${javadoc.dir}"
verbose="off"
use="true"
classpath="${sdk.dir}/platforms/${target}/android.jar:libs/aXMLRPC.jar"
sourcepath="${source.dir}:gen"
linkoffline="http://developer.android.com/reference file:/${sdk.dir}/docs/reference"
stylesheetfile="${sdk.dir}/docs/assets/android-developer-docs.css">
</javadoc>
</target>
<target name="-package-resources" depends="-crunch"> <target name="-package-resources" depends="-crunch">
<!-- only package resources if *not* a library project --> <!-- only package resources if *not* a library project -->
<do-only-if-not-library elseText="Library project: do not package resources..."> <do-only-if-not-library elseText="Library project: do not package resources...">

93
deliver_sdk.sh
View file

@ -17,15 +17,15 @@ mkdir -p $D/gen
cat > $D/.classpath <<EOF cat > $D/.classpath <<EOF
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/> <classpathentry kind="src" path="gen"/>
<classpathentry kind="src" path="submodules/linphone/coreapi/help/java"/>
<classpathentry kind="src" path="submodules/linphone/java/common"/>
<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
<classpathentry kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
<classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/> <classpathentry excluding="org/linphone/mediastream/MediastreamerActivity.java" kind="src" path="submodules/linphone/mediastreamer2/java/src"/>
<classpathentry kind="src" path="submodules/linphone/java/j2se"/>
<classpathentry kind="src" path="submodules/linphone/java/common"/>
<classpathentry kind="src" path="submodules/linphone/java/impl"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="output" path="bin"/> <classpathentry exported="true" kind="lib" path="libs/aXMLRPC.jar"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath> </classpath>
EOF EOF
@ -40,21 +40,37 @@ cat > $D/AndroidManifest.xml <<EOF
<?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="org.linphone" android:versionCode="1" android:versionName="1.0"> package="org.linphone" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="4"/>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
<uses-permission android:name="android.permission.CALL_PHONE"></uses-permission>
<uses-permission android:name="android.permission.BOOT_COMPLETED"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.CAMERA" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
<application> <application>
<activity android:name="org.linphone.TestConferenceActivity"
android:label="Conf test"
<activity android:name="org.linphone.core.tutorials.TestVideoActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:label="Video test" android:enabled="false">
android:theme="@android:style/Theme.NoTitleBar"
android:enabled="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="org.linphone.core.tutorials.TutorialHelloWorldActivity" <activity android:name="org.linphone.core.tutorials.TutorialHelloWorldActivity"
android:label="Hello World" android:label="Hello World"
android:enabled="true"> android:enabled="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -62,7 +78,7 @@ cat > $D/AndroidManifest.xml <<EOF
</activity> </activity>
<activity android:name="org.linphone.core.tutorials.TutorialRegistrationActivity" <activity android:name="org.linphone.core.tutorials.TutorialRegistrationActivity"
android:label="Registration" android:label="Registration"
android:enabled="true"> android:enabled="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -70,7 +86,7 @@ cat > $D/AndroidManifest.xml <<EOF
</activity> </activity>
<activity android:name="org.linphone.core.tutorials.TutorialBuddyStatusActivity" <activity android:name="org.linphone.core.tutorials.TutorialBuddyStatusActivity"
android:label="Buddy status" android:label="Buddy status"
android:enabled="true"> android:enabled="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -78,35 +94,26 @@ cat > $D/AndroidManifest.xml <<EOF
</activity> </activity>
<activity android:name="org.linphone.core.tutorials.TutorialChatRoomActivity" <activity android:name="org.linphone.core.tutorials.TutorialChatRoomActivity"
android:label="Chat Room" android:label="Chat Room"
android:enabled="true"> android:enabled="false">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="org.mediastreamer2.test.Ring"
android:label="Ring+Echo"
android:enabled="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
<uses-permission android:name="android.permission.CALL_PHONE"></uses-permission>
<uses-permission android:name="android.permission.BOOT_COMPLETED"></uses-permission>
<uses-permission android:name="android.permission.VIBRATE"></uses-permission>
<uses-permission android:name="android.permission.CAMERA" />
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:anyDensity="true"/>
</manifest> </manifest>
EOF EOF
cat > $D/default.properties <<EOF cat > $D/default.properties <<EOF
split.density=false target=`android list target -c | grep android | tail -n1`
target=android-9
EOF EOF
mkdir -p $D/.settings mkdir -p $D/.settings
@ -131,12 +138,10 @@ D="../$DBASE"
rm -rf $D.zip $D rm -rf $D.zip $D
copy submodules/linphone/coreapi/help/java $D copy submodules/linphone/coreapi/help/java $D
copy libs $D copy libs $D
copy src/org/linphone/core $D
copy submodules/linphone/java/j2se $D copy submodules/linphone/java/j2se $D
copy submodules/linphone/java/common $D copy submodules/linphone/java/common $D
copy submodules/linphone/java/impl $D
copy submodules/linphone/mediastreamer2/java/src $D copy submodules/linphone/mediastreamer2/java/src $D
copy res/layout/hello_world.xml $D
copy res/layout/videotest.xml $D
androidize $D androidize $D
@ -150,16 +155,10 @@ rm -rf $DBASE
DBASE="liblinphone-android-javadoc" DBASE="liblinphone-android-javadoc"
D="../$DBASE.zip" D="../$DBASE.zip"
echo "Generating javadoc to $D" echo "Generating javadoc to $D"
javadoc -quiet -d $DBASE src/org/linphone/*.java \ cat >> local.properties <<EOF
src/org/linphone/ui/*.java \ javadoc.dir=$DBASE
src/org/linphone/core/*.java \ EOF
src/org/linphone/core/video/*.java \ ant javadoc
src/org/linphone/core/tutorials/* \
submodules/linphone/java/common/org/linphone/core/*.java \
submodules/linphone/java/j2se/org/linphone/core/*.java \
submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/*.java \
submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/video/capture/*.java \
submodules/linphone/mediastreamer2/java/src/org/linphone/mediastream/video/display/*.java
rm -rf $D rm -rf $D
zip -rq $D $DBASE zip -rq $D $DBASE
rm -rf $DBASE rm -rf $DBASE