Commit graph

1430 commits

Author SHA1 Message Date
Daniel Martí
fdb53b75f4 Report the vercode as well as the version name when building 2014-06-30 16:34:26 +02:00
Daniel Martí
c750b02a6c Always run aapt with SilentPopen 2014-06-30 16:15:14 +02:00
Daniel Martí
49208b257d Always run read_srclibs as part of read_metadata 2014-06-30 14:39:52 +02:00
Ciaran Gultnieks
07006e4c00 Generate gpg signatures with .asc extension 2014-06-30 12:04:04 +01:00
Ciaran Gultnieks
3cb4a80efb Fix stats update bug 2014-06-30 12:03:45 +01:00
Daniel Martí
2bab6b83c1 Fix the copyright notice in gpgsign.py 2014-06-30 00:08:10 +02:00
Daniel Martí
4ba9da0906 git-svn: use 'origin/' when passing a treeish (branches) to find-rev
This fixes the builds of de.blau.android. This worked before for some reason.
Git-svn probably changed in some way.
2014-06-29 01:29:31 +02:00
Daniel Martí
a831d484e6 Place more examples/config.py stuff into the defaults 2014-06-28 19:57:14 +02:00
Hans-Christoph Steiner
0466d4aa4f server update: mkdir 'archive' if it does not exist
If `fdroid server update` is run with config that includes an archive, but
the 'archive' subdir does not exist, create it.  This mirrors the code that
is in `fdroid update`.  Seems to trivial to move to common.py.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
25f6b0c246 server: --sync-from-local-copy-dir for updating from offline signing repo
To support a fully offline build/signing machine, there is the "local copy
dir".  The repo is generated on the offline machine and then copied to a
local dir where a thumb drive or SD Card is mounted.  Then on the online
machine, using `fdroid server update --sync-from-local-copy-dir` allows
the whole server update process to happen in a single command:

0. read config.py on online machine's repo
1. rsync from the local_copy_dir to the current dir
2. copy to serverwebroot, awsbucket, etc.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
fd24416f4e switch serverwebroot rsync to --archive for guaranteed full sync
In `fdroid server update`, the rsync command used --update, which
`man rsync` says: "skip files that are newer on the receiver".  That could
cause issues of the public repo getting out of sync with the private,
master repo.  --archive is a better sync method since it aims to exactly
reproduce the sending dir to the receiving dir.
2014-06-26 20:47:36 -04:00
Hans-Christoph Steiner
d73b43c5fc server: 'local_copy_dir' config/options to automate offline repo signing
This allows a dir to be specified in config.py that `fdroid server update`
will automatically rsync the repo to.  The idea is that the path would
point to an SD card on a fully offline machine that serves as the secure
repo signing machine.
2014-06-26 20:47:36 -04:00
Daniel Martí
0ee6fc8c22 Raise gotorevision exceptions with more useful info 2014-06-26 13:07:49 +02:00
Daniel Martí
e49b7aafda Always try to recover origin/HEAD in case it's not there 2014-06-26 13:03:51 +02:00
Daniel Martí
4ad7e8be06 Easier multiline strings 2014-06-26 12:52:16 +02:00
Daniel Martí
4e153cc60d Error if UCM:Tags is used with git-svn without tags set up 2014-06-26 12:41:50 +02:00
Daniel Martí
33ed7f077d Simplify check_metadata 2014-06-26 12:39:42 +02:00
Ciaran Gultnieks
9a70575feb Fix pep8 error in previous commit 2014-06-25 12:38:25 +01:00
Ciaran Gultnieks
95d8f29479 Fix nasty problem caused by 7c2e61a4 2014-06-25 11:43:44 +01:00
Daniel Martí
c0f026c9c4 Use origin/HEAD as the default checkout for git
This should fix many RepoManifest UCMs where 'master' is not the default
branch
2014-06-25 11:13:28 +02:00
Ciaran Gultnieks
c9638cf7dd Be more specific when logging repository deletes 2014-06-25 09:54:14 +01:00
Ciaran Gultnieks
9df3a491de Fix popen command logging 2014-06-25 09:25:55 +01:00
Daniel Martí
2c8df2c1ef Small buildjni= fixes 2014-06-24 22:31:39 +02:00
Daniel Martí
53aba5365f Don't error about native code if buildjni=no 2014-06-24 22:21:04 +02:00
Daniel Martí
26154127e6 Only report files that were actually cleaned of signing stuff 2014-06-22 21:34:14 +02:00
Daniel Martí
7c2e61a407 Set the FDroidOpen output default back to true
Having it at False just makes SilentPopen useless.
2014-06-22 21:29:07 +02:00
Daniel Martí
14f865a5b1 Don't use logging.info with verbose ifs 2014-06-22 21:28:33 +02:00
Daniel Martí
0bce840571 Warn about config permissions before loading the defaults
Now, configs that don't contain passwords don't trigger the warning.
2014-06-22 21:24:29 +02:00
Daniel Martí
2686fa6faa A bit more None magic to fix some UCMs 2014-06-22 17:36:00 +02:00
Daniel Martí
25268a728d Don't output everything when using --verbose
This is especially painful when using stuff like aapt to obtain data
2014-06-21 23:03:36 +02:00
Daniel Martí
5500787935 Revert "Keep version names even if found separate from the code"
This reverts commit 75381ef147.
2014-06-20 11:10:52 +02:00
Daniel Martí
04b61302dc Better support for gradle plugin versions 2014-06-19 12:44:01 +02:00
Daniel Martí
69da721f02 Use gradle_dir, not root_dir, to fetch the plugin version 2014-06-19 12:43:05 +02:00
Daniel Martí
1fcf81b1f4 Current build-tools is 19.1.0, not 19.1 2014-06-16 23:12:47 +02:00
Daniel Martí
a1c3c2033a Bump default build_tools, small fixes 2014-06-16 12:42:43 +02:00
Daniel Martí
b637568a62 Warn if build_tools is not set up properly 2014-06-16 12:40:04 +02:00
Daniel Martí
75381ef147 Keep version names even if found separate from the code 2014-06-16 12:30:33 +02:00
Daniel Martí
596b3b44c5 Avoiding lintVital is no longer necessary in 0.11 2014-06-15 13:34:41 +02:00
Daniel Martí
fcface673e Fix crash in 'fdroid import' 2014-06-15 12:30:03 +02:00
Daniel Martí
0f6cb94041 Fix bug in reading old recipes 2014-06-15 12:16:10 +02:00
Daniel Martí
0c8512ca26 Install and lint were missing -q 2014-06-12 21:48:45 +02:00
Daniel Martí
71a09b700e Apk output path is build/outputs/apk/*.apk since 0.11 2014-06-12 10:04:20 +02:00
Daniel Martí
9779979e3a lintVital was added in 0.8, only exclude it then 2014-06-12 10:00:46 +02:00
Daniel Martí
b63ce63017 Fix small issue in import.py 2014-06-11 22:48:12 +02:00
Ciaran Gultnieks
9bde500765 Merge branch 'rsync-improvements-for-fdroid-server-update' into 'master'
rsync improvements for fdroid server update

This is a couple of improvements to how `fdroid server update` uses `rsync`.

(also, please remove the branch when accepting any of my merge requests)
2014-06-09 22:14:34 +00:00
Daniel Martí
ef73fd8920 Exclude lint from gradle build tasks 2014-06-08 00:50:19 +02:00
Daniel Martí
7d8e9bbcaa jni problem is critical, so make it an error 2014-06-08 00:38:11 +02:00
Hans-Christoph Steiner
e68413a752 server: specify an identity file for SSH when rsyncing
This allows the SSH key used to sync with the server to be specified via
the config.py or the command line.  I need it for running automated tests
and setups.
2014-06-05 16:21:12 -04:00
Hans-Christoph Steiner
0adb2575fe update: add stricter checking when updating repo index using rsync
rsync uses the modification time and size of the file when deciding whether
to update a file.  These are relatively easy to control in malicious code,
so instead make rsync use a full MD5 checksum when decided whether the
index needs to be updated.  I suppose we could add an option to use
checksum checking on all files, but since the signed repo already provides
a checksum check, it seems not worth the added load on the process.

Also, renamed 'index' to 'indexxml' to make it clear what is the XML and
what is the JAR.
2014-06-05 15:50:21 -04:00
Ciaran Gultnieks
b86bfb94fb Merge branch 'test-updates-and-related-bug-fixes' into 'master'
Test updates and related bug fixes

I just set up some big tests of generating repos based on feeding as many random APKs into `fdroid update` as possible.  On our jenkins server, the tests copy all of the APKs that the jenkins server has generated and builds a repo from them.  This process caught lots of little glitches in the whole process.  While these little glitches are usually caused by problematic APKs, `fdroid update` should handle them gracefully.  Hopefully this set of fixes accomplishes that.
2014-06-05 15:51:24 +00:00