Commit graph

882 commits

Author SHA1 Message Date
Daniel Martí
f3dd6d9510 More generic usual suspects regex 2014-07-09 18:17:28 +02:00
Daniel Martí
acbbc6a973 Revert "Always print command output when --verbose"
This reverts commit a4cdd92448.
2014-07-09 11:11:41 +02:00
Daniel Martí
fad659921f Remove some gradle @dir leftovers 2014-07-09 11:11:13 +02:00
Daniel Martí
b404e1b69c Support git-svn refs in the form of rN 2014-07-09 10:41:35 +02:00
Daniel Martí
2c55fb499c Do write .fdroidvcs if the clone succeeded
If the clone succeeded but the checkout failed, it didn't. Now it does, by
keeping the exception and raising it a bit later.
2014-07-09 10:30:28 +02:00
Daniel Martí
f857169317 Support origin/ checkouts with tags as well in gitsvn 2014-07-08 12:04:24 +02:00
Daniel Martí
a4cdd92448 Always print command output when --verbose 2014-07-08 11:16:03 +02:00
Daniel Martí
ff06694adc Don't use generic Exception raises
That hides bugs, since all exceptions (including bugs that cause raises that
weren't our doing) fall under the "Exception" except
2014-07-07 15:41:50 +02:00
Daniel Martí
d8cd9a3163 Move more logging.info stuff to debug 2014-07-05 15:25:39 +02:00
Daniel Martí
17dc21b69b All logging goes to stderr, FDroidPopen should too 2014-07-05 14:10:26 +02:00
Daniel Martí
9d96ad3478 Don't directly print FDroidPopen output unless verbose 2014-07-05 14:07:53 +02:00
Daniel Martí
7d07e52e1f Try the old git svn find-rev format as well 2014-07-05 12:15:20 +02:00
Daniel Martí
8306bac7de Also check that platform-tools and tools exist 2014-07-03 18:23:35 +02:00
Daniel Martí
a8d4c8705f Also use adb via a full path 2014-07-03 18:21:33 +02:00
Daniel Martí
3dbf99a7f2 Use shorter and non-redundant 'or' clauses for 'if True else' assignments 2014-07-03 17:35:28 +02:00
Daniel Martí
00066a9b45 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.
2014-07-03 16:25:24 +02:00
Daniel Martí
73142c740b Make use of FDroidException in the main fdroid script
This should improve the output shown when exceptions are found
2014-07-03 14:01:22 +02:00
Daniel Martí
d9d5f30d7b vcs_* stuff should not raise BuildExceptions 2014-07-03 13:54:23 +02:00
Ciaran Gultnieks
327422af09 Fix failure to do anything when ndk_path is not defined 2014-07-03 08:56:56 +01:00
Daniel Martí
1d6b2378db Some more slight logging improvements 2014-07-03 00:43:03 +02:00
Daniel Martí
a67d80a011 Remove more prints in favour of logging 2014-07-03 00:35:43 +02:00
Daniel Martí
6e515ed34e Find the 'android' executable in the same manner 2014-07-03 00:34:16 +02:00
Daniel Martí
d73f2b9368 Also find zipalign at the start 2014-07-03 00:31:10 +02:00
Daniel Martí
d110c24eff Find aapt as part of the main config initialisation 2014-07-03 00:31:07 +02:00
Daniel Martí
5aad7b5d38 Refuse to try downloading a repo twice 2014-07-02 17:21:45 +02:00
Daniel Martí
d132adf63c Exception handling improvements
* Replace some prints with proper logging messages
* Make VCSException as verbose as BuildException, including error output
2014-07-02 15:44:46 +02:00
Daniel Martí
c64aafaf42 Don't set $SDK, it's too ambiguous with e.g. the Java SDK 2014-07-02 15:01:08 +02:00
Daniel Martí
70d77a1cce Set up SDK and NDK env vars from python
No need to make the buildserver do it
2014-07-01 21:03:50 +02:00
Daniel Martí
76ac2f591c Remove @dir support from gradle 2014-07-01 19:39:41 +02:00
Daniel Martí
1a1bdfc3d9 Merge branch 'bug-fixes-for-v0.2.1' of https://gitlab.com/eighthave/fdroidserver 2014-07-01 18:13:00 +02:00
Daniel Martí
8888962ace Rename PopenResult.stdout to output since it also contains stderr 2014-07-01 18:04:41 +02:00
Hans-Christoph Steiner
4d913d646a replace redundant build_tools check that breaks fdroid init
This reverts b637568a62 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.
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
afb98f9327 fix PEP8 fdroidserver/common.py:65:13: E126 continuation line over-indented for hanging indent 2014-06-30 21:19:55 -04:00
Ciaran Gultnieks
b1192f7b66 Fix indent 2014-06-30 21:32:43 +01:00
Daniel Martí
cbdcdd1e78 Update build-tools to 20.0.0 2014-06-30 17:03:16 +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
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
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
Ciaran Gultnieks
9a70575feb Fix pep8 error in previous commit 2014-06-25 12:38:25 +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í
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í
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