chiark / gitweb /
Daniel Martí [Sat, 5 Jul 2014 13:29:12 +0000 (15:29 +0200)]
More log level fixes
Daniel Martí [Sat, 5 Jul 2014 13:25:39 +0000 (15:25 +0200)]
Move more logging.info stuff to debug
Daniel Martí [Sat, 5 Jul 2014 12:17:02 +0000 (14:17 +0200)]
Use logging with proper format when warning about improper verbose/quiet usage
Daniel Martí [Sat, 5 Jul 2014 12:15:31 +0000 (14:15 +0200)]
Using $(levelname) in --quiet makes no sense
Daniel Martí [Sat, 5 Jul 2014 12:10:26 +0000 (14:10 +0200)]
All logging goes to stderr, FDroidPopen should too
Daniel Martí [Sat, 5 Jul 2014 12:07:53 +0000 (14:07 +0200)]
Don't directly print FDroidPopen output unless verbose
Daniel Martí [Sat, 5 Jul 2014 12:04:51 +0000 (14:04 +0200)]
Use counters in lint
Daniel Martí [Sat, 5 Jul 2014 11:06:01 +0000 (13:06 +0200)]
Simpler fd-commit arg logic
Daniel Martí [Sat, 5 Jul 2014 11:01:17 +0000 (13:01 +0200)]
Rewrite fd-commit in POSIX Shell
Daniel Martí [Sat, 5 Jul 2014 10:15:20 +0000 (12:15 +0200)]
Try the old git svn find-rev format as well
Daniel Martí [Sat, 5 Jul 2014 10:05:54 +0000 (12:05 +0200)]
Little doc fixes
Daniel Martí [Fri, 4 Jul 2014 07:55:06 +0000 (09:55 +0200)]
checkupdates: don't print traces independently
Daniel Martí [Fri, 4 Jul 2014 06:59:30 +0000 (08:59 +0200)]
Avoid lint on all new plugin versions, remove TODO
Daniel Martí [Fri, 4 Jul 2014 06:50:20 +0000 (08:50 +0200)]
Add support for gradle plugin version 0.12
Daniel Martí [Thu, 3 Jul 2014 20:33:40 +0000 (22:33 +0200)]
Fix the test suite
Daniel Martí [Thu, 3 Jul 2014 20:30:30 +0000 (22:30 +0200)]
Add android-20 to the SDK
Daniel Martí [Thu, 3 Jul 2014 16:28:49 +0000 (18:28 +0200)]
Add config.buildserver.py to the pre-commit hook
Daniel Martí [Thu, 3 Jul 2014 16:26:49 +0000 (18:26 +0200)]
No need to print a trace when the user did a ^C
Daniel Martí [Thu, 3 Jul 2014 16:23:35 +0000 (18:23 +0200)]
Also check that platform-tools and tools exist
Daniel Martí [Thu, 3 Jul 2014 16:21:33 +0000 (18:21 +0200)]
Also use adb via a full path
Daniel Martí [Thu, 3 Jul 2014 15:35:28 +0000 (17:35 +0200)]
Use shorter and non-redundant 'or' clauses for 'if True else' assignments
Daniel Martí [Thu, 3 Jul 2014 15:25:31 +0000 (17:25 +0200)]
Recognise changes in subdirs in Tags and RepoManifest
Daniel Martí [Thu, 3 Jul 2014 14:25:24 +0000 (16:25 +0200)]
Use any of the branches that point to origin/HEAD if there are multiple
'set-head origin --auto' fails if there are multiple branches that are the
same as origin/HEAD:
error: Multiple remote HEAD branches. Please choose one explicitly with:
git remote set-head origin develop
git remote set-head origin master
So we want to grab any of them, e.g. the first branch that it gives us, and
just use that as it will work just fine.
Daniel Martí [Thu, 3 Jul 2014 13:36:43 +0000 (15:36 +0200)]
Update the SDK to 23.0.2, supposedly fixing all issues
Daniel Martí [Thu, 3 Jul 2014 11:59:36 +0000 (13:59 +0200)]
Make use of FDroidException in the main fdroid script
This should improve the output shown when exceptions are found
Daniel Martí [Thu, 3 Jul 2014 11:53:54 +0000 (13:53 +0200)]
vcs_* stuff should not raise BuildExceptions
Daniel Martí [Thu, 3 Jul 2014 11:44:27 +0000 (13:44 +0200)]
Also make the Tags UCM complain about unknown package id
Ciaran Gultnieks [Thu, 3 Jul 2014 07:56:48 +0000 (08:56 +0100)]
Fix failure to do anything when ndk_path is not defined
Daniel Martí [Wed, 2 Jul 2014 22:43:03 +0000 (00:43 +0200)]
Some more slight logging improvements
Daniel Martí [Wed, 2 Jul 2014 22:35:43 +0000 (00:35 +0200)]
Remove more prints in favour of logging
Daniel Martí [Wed, 2 Jul 2014 22:34:16 +0000 (00:34 +0200)]
Find the 'android' executable in the same manner
Daniel Martí [Wed, 2 Jul 2014 22:31:10 +0000 (00:31 +0200)]
Also find zipalign at the start
Daniel Martí [Wed, 2 Jul 2014 22:27:44 +0000 (00:27 +0200)]
Find aapt as part of the main config initialisation
Daniel Martí [Wed, 2 Jul 2014 15:21:45 +0000 (17:21 +0200)]
Refuse to try downloading a repo twice
Daniel Martí [Wed, 2 Jul 2014 13:30:05 +0000 (15:30 +0200)]
Exception handling improvements
* Replace some prints with proper logging messages
* Make VCSException as verbose as BuildException, including error output
Daniel Martí [Wed, 2 Jul 2014 13:01:08 +0000 (15:01 +0200)]
Don't set $SDK, it's too ambiguous with e.g. the Java SDK
Daniel Martí [Tue, 1 Jul 2014 19:03:50 +0000 (21:03 +0200)]
Set up SDK and NDK env vars from python
No need to make the buildserver do it
Daniel Martí [Tue, 1 Jul 2014 18:32:49 +0000 (20:32 +0200)]
Improve some log levels
Daniel Martí [Tue, 1 Jul 2014 17:39:41 +0000 (19:39 +0200)]
Remove @dir support from gradle
Daniel Martí [Tue, 1 Jul 2014 17:18:12 +0000 (19:18 +0200)]
Simpler way to get the available gradle versions
Also, sort by version names instead of alphabetically
Daniel Martí [Tue, 1 Jul 2014 16:22:05 +0000 (18:22 +0200)]
Fix the default config.py descriptions following the tuple syntax
Daniel Martí [Tue, 1 Jul 2014 16:13:00 +0000 (18:13 +0200)]
Merge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver
Daniel Martí [Tue, 1 Jul 2014 16:04:41 +0000 (18:04 +0200)]
Rename PopenResult.stdout to output since it also contains stderr
Daniel Martí [Tue, 1 Jul 2014 15:51:17 +0000 (17:51 +0200)]
Fix very silly typo that broke all apps using buildjni
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:47:47 +0000 (21:47 -0400)]
only move GPG signature if APK exists
The .asc moving code just needed to be indented so it only runs when
'srcname' exists in apk[], otherwise it just throws a KeyError
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:40:31 +0000 (21:40 -0400)]
run pre-commit hook as part of test suite
Hans-Christoph Steiner [Tue, 1 Jul 2014 01:37:46 +0000 (21:37 -0400)]
replace redundant build_tools check that breaks `fdroid init`
This reverts
b637568a624cc75f4e67a0df59a017872e2129c6 since it added a
redundant check that broke `fdroid init` when the default version dir of
build_tools does not exist on the local system. It then uses the function
that was already in place for checking the build_tools setup in a way that
does not break `fdroid init`.
Now that the fake android home version is not matching the default version,
the tests will catch this bug in the future.
Hans-Christoph Steiner [Mon, 30 Jun 2014 20:09:57 +0000 (16:09 -0400)]
fix bad syncing from local copy, force trailing slash to make rsync happy
It seems that paths for rsync must have a trailing slash in order to sync
rather than make a subdir, i.e. this makes a duplicate subdir:
rsync /tmp/fdroid/repo repo
While this syncs the dirs
rsync /tmp/fdroid/repo/ repo/
Hans-Christoph Steiner [Mon, 30 Jun 2014 16:19:47 +0000 (12:19 -0400)]
check repo icons exist now before running through all of `fdroid update`
Before, if repo_icon or archive_icon pointed to a non-existent file, then
`fdroid update` would run through the whole process of building a repo,
then fail at the very end because of the non-existent file. On the next
run, `fdroid update` then starts from the beginning.
This just checks for those files at the beginning, and exits with an error
if they are not found.
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:31:38 +0000 (11:31 -0400)]
use 'python2' everywhere since fdroidserver has not been tested with 3.x
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:28:38 +0000 (11:28 -0400)]
tests: create_fake_android_home should create old build-tools version
This is testing the build-tools version auto-detect in `fdroid init`, so it
should be kept as an older version. This is not meant to test the current
version of the build tools.
Hans-Christoph Steiner [Mon, 30 Jun 2014 15:27:21 +0000 (11:27 -0400)]
fix PEP8 fdroidserver/common.py:65:13: E126 continuation line over-indented for hanging indent
Ciaran Gultnieks [Mon, 30 Jun 2014 21:53:02 +0000 (22:53 +0100)]
Move gpg signatures to archive along with the other files
Ciaran Gultnieks [Mon, 30 Jun 2014 21:49:54 +0000 (22:49 +0100)]
Generate gpg signatures for apks in archive repo also
Ciaran Gultnieks [Mon, 30 Jun 2014 20:32:43 +0000 (21:32 +0100)]
Fix indent
Daniel Martí [Mon, 30 Jun 2014 17:52:59 +0000 (19:52 +0200)]
Don't change the behaviour in debian setups
Daniel Martí [Mon, 30 Jun 2014 17:38:38 +0000 (19:38 +0200)]
Support calling of 'fdroid init' from other places
e.g. from a symlink to fdroid or from a script. Also more reliable in other
cases where argv[0] is not what we want.
Daniel Martí [Mon, 30 Jun 2014 15:03:26 +0000 (17:03 +0200)]
Update the SDK to version 23.0.0
Daniel Martí [Mon, 30 Jun 2014 15:03:16 +0000 (17:03 +0200)]
Update build-tools to 20.0.0
Daniel Martí [Mon, 30 Jun 2014 14:34:26 +0000 (16:34 +0200)]
Report the vercode as well as the version name when building
Daniel Martí [Mon, 30 Jun 2014 14:22:31 +0000 (16:22 +0200)]
Add optipng, useful for some apps
Specifically, for cz.jirkovsky.lukas.chmupocasi
Daniel Martí [Mon, 30 Jun 2014 14:15:14 +0000 (16:15 +0200)]
Always run aapt with SilentPopen
Daniel Martí [Mon, 30 Jun 2014 12:39:52 +0000 (14:39 +0200)]
Always run read_srclibs as part of read_metadata
Ciaran Gultnieks [Mon, 30 Jun 2014 11:04:22 +0000 (12:04 +0100)]
Recognise published .asc signatures in web repo browser
Ciaran Gultnieks [Mon, 30 Jun 2014 11:04:04 +0000 (12:04 +0100)]
Generate gpg signatures with .asc extension
Ciaran Gultnieks [Mon, 30 Jun 2014 11:03:45 +0000 (12:03 +0100)]
Fix stats update bug
Daniel Martí [Sun, 29 Jun 2014 22:08:10 +0000 (00:08 +0200)]
Fix the copyright notice in gpgsign.py
Daniel Martí [Sat, 28 Jun 2014 23:29:31 +0000 (01:29 +0200)]
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.
Daniel Martí [Sat, 28 Jun 2014 17:57:45 +0000 (19:57 +0200)]
Merge branch 'fix-and-test-source-tarball-process' of https://gitlab.com/eighthave/fdroidserver
Daniel Martí [Sat, 28 Jun 2014 17:57:14 +0000 (19:57 +0200)]
Place more examples/config.py stuff into the defaults
Hans-Christoph Steiner [Fri, 27 Jun 2014 21:06:52 +0000 (17:06 -0400)]
tests: create a source tarball and use that to build a repo
This tests that setup.py is in working order and creating a functional
source tarball.
Hans-Christoph Steiner [Fri, 27 Jun 2014 21:06:18 +0000 (17:06 -0400)]
tests: by default, run on included urzip.apk
This means you can just do `cd tests/ && ./run-tests` to run the tests now.
You can still override the APK source with the first argument, like:
cd tests/ && ./run-tests /path/to/lots/of/apks/dir
Daniel Martí [Fri, 27 Jun 2014 19:11:52 +0000 (21:11 +0200)]
Merge branch 'add-local_copy_dir-and-v0.2-fixes' of https://gitlab.com/eighthave/fdroidserver
Hans-Christoph Steiner [Thu, 26 Jun 2014 23:52:19 +0000 (19:52 -0400)]
set version to v0.2
Hans-Christoph Steiner [Thu, 26 Jun 2014 23:52:11 +0000 (19:52 -0400)]
include getsig.java and opensc-fdroid.cfg in the source tarball
Hans-Christoph Steiner [Thu, 26 Jun 2014 19:46:47 +0000 (15:46 -0400)]
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.
Hans-Christoph Steiner [Thu, 26 Jun 2014 18:18:29 +0000 (14:18 -0400)]
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.
Hans-Christoph Steiner [Thu, 26 Jun 2014 17:05:24 +0000 (13:05 -0400)]
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.
Hans-Christoph Steiner [Thu, 26 Jun 2014 15:57:40 +0000 (11:57 -0400)]
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.
Daniel Martí [Thu, 26 Jun 2014 11:07:49 +0000 (13:07 +0200)]
Raise gotorevision exceptions with more useful info
Daniel Martí [Thu, 26 Jun 2014 11:03:51 +0000 (13:03 +0200)]
Always try to recover origin/HEAD in case it's not there
Daniel Martí [Thu, 26 Jun 2014 10:52:16 +0000 (12:52 +0200)]
Easier multiline strings
Daniel Martí [Thu, 26 Jun 2014 10:41:50 +0000 (12:41 +0200)]
Error if UCM:Tags is used with git-svn without tags set up
Daniel Martí [Thu, 26 Jun 2014 10:39:42 +0000 (12:39 +0200)]
Simplify check_metadata
Ciaran Gultnieks [Wed, 25 Jun 2014 11:38:25 +0000 (12:38 +0100)]
Fix pep8 error in previous commit
Ciaran Gultnieks [Wed, 25 Jun 2014 10:43:23 +0000 (11:43 +0100)]
Fix nasty problem caused by
7c2e61a4
Daniel Martí [Wed, 25 Jun 2014 09:12:53 +0000 (11:12 +0200)]
Use origin/HEAD as the default checkout for git
This should fix many RepoManifest UCMs where 'master' is not the default
branch
Ciaran Gultnieks [Wed, 25 Jun 2014 08:54:14 +0000 (09:54 +0100)]
Be more specific when logging repository deletes
Ciaran Gultnieks [Wed, 25 Jun 2014 08:25:47 +0000 (09:25 +0100)]
Fix popen command logging
Daniel Martí [Tue, 24 Jun 2014 20:31:39 +0000 (22:31 +0200)]
Small buildjni= fixes
Daniel Martí [Tue, 24 Jun 2014 20:09:05 +0000 (22:09 +0200)]
Don't error about native code if buildjni=no
Daniel Martí [Sun, 22 Jun 2014 19:34:14 +0000 (21:34 +0200)]
Only report files that were actually cleaned of signing stuff
Daniel Martí [Sun, 22 Jun 2014 19:29:07 +0000 (21:29 +0200)]
Set the FDroidOpen output default back to true
Having it at False just makes SilentPopen useless.
Daniel Martí [Sun, 22 Jun 2014 19:28:33 +0000 (21:28 +0200)]
Don't use logging.info with verbose ifs
Daniel Martí [Sun, 22 Jun 2014 19:24:05 +0000 (21:24 +0200)]
Warn about config permissions before loading the defaults
Now, configs that don't contain passwords don't trigger the warning.
Daniel Martí [Sun, 22 Jun 2014 15:36:00 +0000 (17:36 +0200)]
A bit more None magic to fix some UCMs
Daniel Martí [Sat, 21 Jun 2014 21:03:36 +0000 (23:03 +0200)]
Don't output everything when using --verbose
This is especially painful when using stuff like aapt to obtain data
Daniel Martí [Fri, 20 Jun 2014 09:10:52 +0000 (11:10 +0200)]
Revert "Keep version names even if found separate from the code"
This reverts commit
75381ef14718f3821acefaa64a4f7d5243ba15df.
Daniel Martí [Thu, 19 Jun 2014 10:41:34 +0000 (12:41 +0200)]
Better support for gradle plugin versions
Daniel Martí [Thu, 19 Jun 2014 10:32:21 +0000 (12:32 +0200)]
Use gradle_dir, not root_dir, to fetch the plugin version