Metadata: new droidnotify version

diff --git a/build/extlib/.gitignore b/build/extlib/.gitignore
index c18d20da0f84ae48a73dee237b09d0a3b868b402..1efb0a1c310f08e46f30b06d87de30d1cae5950b 100644 (file)
--- a/build/extlib/.gitignore
+++ b/build/extlib/.gitignore
@@ -1,3 +1,4 @@
 !*/
 GreenDroid/
 ActionBarSherlock/
+FacebookSDK/

diff --git a/common.py b/common.py
index 3b0929c2642476e8cd47dbf71b470937cd564ef4..d91077e510381f3c5d4566cafc5b3f7edddd76bd 100644 (file)
--- a/common.py
+++ b/common.py
@@ -563,6 +563,18 @@ def getsrclib(spec, extlib_dir):
             raise BuildException('Error updating ActionBarSherlock project')
         return libdir
 
+    if name == 'FacebookSDK':
+        sdir = os.path.join(extlib_dir, 'FacebookSDK')
+        vcs = getvcs('git',
+                'git://github.com/facebook/facebook-android-sdk.git', sdir)
+        vcs.gotorevision(ref)
+        libdir = os.path.join(sdir, 'facebook')
+        if subprocess.call(['android', 'update', 'project', '-p',
+            libdir]) != 0:
+            raise BuildException('Error updating FacebookSDK project')
+        return libdir
+
+
     raise BuildException('Unknown srclib ' + name)
 
 

diff --git a/metadata/apps.droidnotify.txt b/metadata/apps.droidnotify.txt
index 003b9a99403476928606e8d8927b98e3bcbdabd9..55d8c9f9b9300928d5c70df4a069a2568f77eb8f 100644 (file)
--- a/metadata/apps.droidnotify.txt
+++ b/metadata/apps.droidnotify.txt
@@ -14,13 +14,10 @@ It is extremely customizable with many options to suit your needs and style.
 Repo Type:svn
 Repo:http://droid-notify.googlecode.com/svn/trunk
 
-Build Version:2.20,27,707,patch=facebook.patch,prebuild=mv lib/ libs/ \
-       && git clone git://github.com/facebook/facebook-android-sdk.git \
-       && cp facebook-android-sdk/facebook/default.properties facebook-android-sdk/facebook/project.properties \
-       && cp build.xml facebook-android-sdk/facebook/ \
-       && cp local.properties facebook-android-sdk/facebook/
+Build Version:2.20,27,707,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
+Build Version:2.22,29,759,srclibs=FacebookSDK@c58af0b,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$FacebookSDK$$@' project.properties && mv lib/ libs/
 
 Update Check Mode:Market
-Current Version:2.21
-Current Version Code:28
+Current Version:2.22
+Current Version Code:29
 

diff --git a/metadata/apps.droidnotify/facebook.patch b/metadata/apps.droidnotify/facebook.patch
deleted file mode 100644 (file)
index 6382c13..0000000
--- a/metadata/apps.droidnotify/facebook.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: project.properties
-===================================================================
---- a/project.properties       (revision 707)
-+++ b/project.properties       (working copy)
-@@ -9,4 +9,4 @@
- 
- # Project target.
- target=android-8
--android.library.reference.1=../com_facebook_android
-+android.library.reference.1=facebook-android-sdk/facebook