From fbfcf7fc7568c385c5c67c5713ec784f43c2a5bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 6 Mar 2013 20:22:43 +0100 Subject: [PATCH 1/8] Probably fix agit, update to version 1.37 --- metadata/com.madgag.agit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt index d97495b106..f2cf350dd8 100644 --- a/metadata/com.madgag.agit.txt +++ b/metadata/com.madgag.agit.txt @@ -12,7 +12,7 @@ A git client - currently read-only. Repo Type:git Repo:https://github.com/rtyley/agit.git -Build Version:1.34,120801417,!can't find output (at agit-parent-1.34),maven=yes,bindir=agit/target +Build Version:1.37,130300220,!not 100% sure it'll work on the server agit-parent-1.37,subdir=agit,bindir=agit/target,maven=yes,forcevercode=yes Auto Update Mode:None Update Check Mode:Market From 28d4b1ba85a55d78c3625d88aa921e751f5b3e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 6 Mar 2013 20:40:34 +0100 Subject: [PATCH 2/8] Added yet another openvpn broken build --- metadata/de.blinkt.openvpn.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metadata/de.blinkt.openvpn.txt b/metadata/de.blinkt.openvpn.txt index cd43f63d47..38b0d084f7 100644 --- a/metadata/de.blinkt.openvpn.txt +++ b/metadata/de.blinkt.openvpn.txt @@ -21,6 +21,8 @@ Build Version:0.5.21,48,!broken v0.5.21,buildjni=yes Build Version:0.5.22,49,!broken v0.5.22,buildjni=yes Build Version:0.5.24,51,!broken too v0.5.24,buildjni=no,target=android-14,prebuild=\ sed -i 's/ndk-build APP_API=all -j 8/ndk-build APP_ABI=all -j 2/g' build-native.sh && ./build-native.sh +Build Version:0.5.35,63,!broken too v0.5.35,buildjni=no,target=android-17,prebuild=\ +sed -i 's/-j 8/-j 2/g' build-native.sh && ./build-native.sh Auto Update Mode:None Update Check Mode:Market From ec05fcbc20f1501a80140faa42d5ded3cd944825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 6 Mar 2013 21:45:06 +0100 Subject: [PATCH 3/8] Fix callerid and enable it --- metadata/com.integralblue.callerid.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/metadata/com.integralblue.callerid.txt b/metadata/com.integralblue.callerid.txt index 935c096d02..0ef2266a5d 100644 --- a/metadata/com.integralblue.callerid.txt +++ b/metadata/com.integralblue.callerid.txt @@ -13,10 +13,8 @@ their number. The web service is also FOSS. Repo Type:git Repo:git://gitorious.org/callerid-for-android/mainline.git -#Disabled pending figuring out how to stop it zipaligning.... -#Build Version:1.0,1,e6d5a9ac4bb24a,subdir=application,maven=yes,bindir=application/target,prebuild=wget http://osmdroid.googlecode.com/files/osmdroid-android-3.0.3.jar && mvn install:install-file -DgroupId=org.osmdroid -DartifactId=osmdroid -Dversion=3.0.3 -Dpackaging=jar -Dfile=osmdroid-android-3.0.3.jar - -Build Version:1.6,7,!can't find apk c54a018930a94d,subdir=application,maven=yes,bindir=application/target +Build Version:1.6,7,c54a018930a94d,subdir=application,maven=yes,bindir=application/target,prebuild=\ +sed -i 's/1.4-SNAPSHOT/1.6/' pom.xml ../pom.xml Update Check Mode:Market Current Version:1.6 From 18df392f3d9141e7592a8fb145f2b2bf7591e13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 6 Mar 2013 21:56:40 +0100 Subject: [PATCH 4/8] Enable electricsleepbeta --- metadata/com.androsz.electricsleepbeta.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.androsz.electricsleepbeta.txt b/metadata/com.androsz.electricsleepbeta.txt index a5218e301b..7da2341a21 100644 --- a/metadata/com.androsz.electricsleepbeta.txt +++ b/metadata/com.androsz.electricsleepbeta.txt @@ -13,7 +13,7 @@ ElectricSleep is a smarter alarm clock. Repo Type:git Repo:https://github.com/jondwillis/ElectricSleep.git -Build Version:1.1.1,50,!can't find output 1.1.1,maven=yes,bindir=target +Build Version:1.1.1,50,1.1.1,maven=yes,bindir=target Update Check Mode:Tags Current Version:1.1.1 From e62ff65cb4616a3e86870ff6a44a3a0bfc7eeff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 6 Mar 2013 22:54:35 +0100 Subject: [PATCH 5/8] Latest build.py fix fixes github 1.6.1 --- metadata/com.github.mobile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.github.mobile.txt b/metadata/com.github.mobile.txt index aa955a17a5..a55d9b5224 100644 --- a/metadata/com.github.mobile.txt +++ b/metadata/com.github.mobile.txt @@ -30,7 +30,7 @@ Build Version:1.2,700,1.2,maven=yes,bindir=app/target Build Version:1.3.1,900,1.3.1,maven=yes,bindir=app/target Build Version:1.4,1000,1.4,maven=yes,bindir=app/target Build Version:1.5,1100,1.5,maven=yes,bindir=app/target -Build Version:1.6.1,1300,!Build failes - can't find apk (at 1.6.1),maven=yes,bindir=app/target +Build Version:1.6.1,1300,1.6.1,maven=yes,bindir=app/target Auto Update Mode:Version %v Update Check Mode:Market From e55e36fd78146b3bad73e65b5875983a7ce8157c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 7 Mar 2013 07:29:08 +0100 Subject: [PATCH 6/8] Fixed antennapod --- metadata/de.danoeh.antennapod.txt | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/metadata/de.danoeh.antennapod.txt b/metadata/de.danoeh.antennapod.txt index 71ee27a84c..60e7fb3b97 100644 --- a/metadata/de.danoeh.antennapod.txt +++ b/metadata/de.danoeh.antennapod.txt @@ -63,21 +63,12 @@ Build Version:0.9.6.1,22,0.9.6.1,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndica Build Version:0.9.6.2,23,0.9.6.2,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar Build Version:0.9.6.3,24,0.9.6.3,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.3.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar Build Version:0.9.6.4,25,0.9.6.4,srclibs=ActionBarSherlock@4.1.0;ViewPagerIndicator@2.4.1,prebuild=sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' project.properties && sed -i 's@\(android.library.reference.2=\).*@\1$$ViewPagerIndicator$$@' project.properties && cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java,extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar -Build Version:0.9.7,26,0.9.7,submodules=yes,\ -extlibs=flattr4j/flattr4j-core-2.4.jar;commons-lang/commons-lang3-3.1.jar;commons-io/commons-io-2.4.jar,\ -prebuild=\ -$$SDK$$/tools/android update lib-project -p submodules/ActionBarSherlock/library/ -t "android-14" &&\ -$$SDK$$/tools/android update lib-project -p submodules/ViewPagerIndicator/library/ -t "android-16" &&\ -$$SDK$$/tools/android update lib-project -p submodules/dslv/library/ -t "android-14" &&\ -cp submodules/ViewPagerIndicator/library/libs/android-support-v4.jar submodules/dslv/library/libs/ &&\ -cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java +Build Version:0.9.7,26,0.9.7,maven=yes,submodules=yes,bindir=target,init=\ +ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,\ +prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java Auto Update Mode:Version %v Update Check Mode:Tags Current Version:0.9.7 Current Version Code:26 -#Build Version:0.9.7,26,!can't find apk 0.9.7,maven=yes,submodules=yes,init=\ -#ANDROID_HOME=$$SDK$$ mvn clean install -f submodules/dslv/pom.xml && rm -f submodules/dslv/demo/target/*.apk,\ -#prebuild=cp src/de/danoeh/antennapod/util/flattr/FlattrConfig.java.example src/de/danoeh/antennapod/util/flattr/FlattrConfig.java - From 7b8462ab990833aa9a65cd1a9a958787ad495369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 7 Mar 2013 07:29:24 +0100 Subject: [PATCH 7/8] Use David's mvn fix, which doesn't seem to work --- metadata/com.androsz.electricsleepbeta.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/com.androsz.electricsleepbeta.txt b/metadata/com.androsz.electricsleepbeta.txt index 7da2341a21..5b4d7c2bb1 100644 --- a/metadata/com.androsz.electricsleepbeta.txt +++ b/metadata/com.androsz.electricsleepbeta.txt @@ -13,7 +13,8 @@ ElectricSleep is a smarter alarm clock. Repo Type:git Repo:https://github.com/jondwillis/ElectricSleep.git -Build Version:1.1.1,50,1.1.1,maven=yes,bindir=target +Build Version:1.1.1,50,1.1.1,maven=no,bindir=target,prebuild=\ +mvn install:install-file -Dfile=$$FinfAgent$$/bin/classes.jar -DgroupId=com.flurry -DartifactId=flurry-sdk -Dversion=1.0 -Dpackaging=jar Update Check Mode:Tags Current Version:1.1.1 From c90f2ab01150c73107ff0870ab31ffd30ac0078d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 7 Mar 2013 07:31:08 +0100 Subject: [PATCH 8/8] Try to fix agit, fail miserably --- metadata/com.madgag.agit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/com.madgag.agit.txt b/metadata/com.madgag.agit.txt index f2cf350dd8..6d20175773 100644 --- a/metadata/com.madgag.agit.txt +++ b/metadata/com.madgag.agit.txt @@ -12,7 +12,7 @@ A git client - currently read-only. Repo Type:git Repo:https://github.com/rtyley/agit.git -Build Version:1.37,130300220,!not 100% sure it'll work on the server agit-parent-1.37,subdir=agit,bindir=agit/target,maven=yes,forcevercode=yes +Build Version:1.37,130300220,!not working agit-parent-1.37,bindir=agit/target,maven=yes,forcevercode=yes Auto Update Mode:None Update Check Mode:Market