Metadata: enabled OpenDocument reader

diff --git a/build/extlib/.gitignore b/build/extlib/.gitignore
index 7e1e8ff26da567b09b99ff5bbf008f66f281b2f4..0eedae0ebe15ce19f774768fdd57a8b142389acd 100644 (file)
--- a/build/extlib/.gitignore
+++ b/build/extlib/.gitignore
@@ -3,3 +3,4 @@ GreenDroid/
 ActionBarSherlock/
 FacebookSDK/
 OI/
+JOpenDocument/

diff --git a/common.py b/common.py
index 2e115d1c69281c38480a725a78c27bd913eda6a7..d007ef476a530b7b6933d1c2adfea426e7d3138e 100644 (file)
--- a/common.py
+++ b/common.py
@@ -626,6 +626,14 @@ def getsrclib(spec, extlib_dir):
         vcs.gotorevision(ref)
         return sdir
 
+    if name == 'JOpenDocument':
+        sdir = os.path.join(extlib_dir, 'JOpenDocument')
+        vcs = getvcs('git',
+                'https://github.com/andiwand/JOpenDocument.git', sdir)
+        vcs.gotorevision(ref)
+        shutil.rmtree(os.path.join(sdir, 'bin'))
+        return sdir
+
     raise BuildException('Unknown srclib ' + name)
 
 

diff --git a/metadata/at.tomtasche.reader.txt b/metadata/at.tomtasche.reader.txt
index 35cbc387afab6edcc651228ceeaf1c06fd2b22dd..b01ee3931f18ff2ae52ea9463a38f3a62069411a 100644 (file)
--- a/metadata/at.tomtasche.reader.txt
+++ b/metadata/at.tomtasche.reader.txt
@@ -1,4 +1,3 @@
-Disabled:Requires this https://github.com/andiwand/JOpenDocument which has no license
 AntiFeatures:Tracking
 Category:Office
 License:GPLv3+
@@ -18,7 +17,8 @@ Repo:https://github.com/TomTasche/OpenDocument.droid.git
 Build Version:1.1.9,11,243eba4f441b3601de96
 Build Version:1.2,12,d174bed05a6026ddb5db
 Build Version:1.2.3,15,8fe022fd67e5bb62c6d8
-Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,prebuild=rm *.apk && rm -rf bin/
+Build Version:1.3.0,22,4b8ea7438125e90d43bdadfc042723a7a485a217,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm -rf bin/ && rm -rf gen/ && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
+Build Version:1.3.2,24,4bcf9024ac9fb96bc5c03c3129f9d401272caaf0,srclibs=JOpenDocument@35ec3d3ddfc11592cefe8cae9eea3608ad2b30c2,prebuild=rm *.apk && rm -rf bin/ && rm -rf gen/ && rm libs/jopendocument.jar && cp -r $$JOpenDocument$$/src/* src/ && rm -rf src/test/
 
 Update Check Mode:Market
 Current Version:1.3.0