1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 04:30:12 +01:00
Commit Graph

4974 Commits

Author SHA1 Message Date
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í
ebfce778bc Update the SDK to 23.0.2, supposedly fixing all issues 2014-07-03 15:36:43 +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
Daniel Martí
ee99d55e30 Also make the Tags UCM complain about unknown package id 2014-07-03 13:44:27 +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í
e8284225c9 Improve some log levels 2014-07-01 20:32:49 +02:00
Daniel Martí
76ac2f591c Remove @dir support from gradle 2014-07-01 19:39:41 +02:00
Daniel Martí
7be0634a52 Simpler way to get the available gradle versions
Also, sort by version names instead of alphabetically
2014-07-01 19:18:12 +02:00
Daniel Martí
b0fef49328 Fix the default config.py descriptions following the tuple syntax 2014-07-01 18:22:05 +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
Daniel Martí
22f4ed4b7a Fix very silly typo that broke all apps using buildjni 2014-07-01 17:51:17 +02:00
Hans-Christoph Steiner
d0c767ce5e 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
2014-06-30 23:01:48 -04:00
Hans-Christoph Steiner
a58a9bff18 run pre-commit hook as part of test suite 2014-06-30 23:01:48 -04: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
9dd138b253 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/
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
3dbe503071 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.
2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
7a3992aa1a use 'python2' everywhere since fdroidserver has not been tested with 3.x 2014-06-30 23:01:47 -04:00
Hans-Christoph Steiner
40d4e30010 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.
2014-06-30 21:19:55 -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
1a11982897 Move gpg signatures to archive along with the other files 2014-06-30 22:53:02 +01:00
Ciaran Gultnieks
693cb7ce70 Generate gpg signatures for apks in archive repo also 2014-06-30 22:49:54 +01:00
Ciaran Gultnieks
b1192f7b66 Fix indent 2014-06-30 21:32:43 +01:00
Daniel Martí
34151241f4 Don't change the behaviour in debian setups 2014-06-30 19:52:59 +02:00
Daniel Martí
cef7cd2888 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.
2014-06-30 19:38:38 +02:00
Daniel Martí
348c6a1085 Update the SDK to version 23.0.0 2014-06-30 17:03:26 +02:00
Daniel Martí
cbdcdd1e78 Update build-tools to 20.0.0 2014-06-30 17:03:16 +02:00
Daniel Martí
fdb53b75f4 Report the vercode as well as the version name when building 2014-06-30 16:34:26 +02:00
Daniel Martí
4d63ed0568 Add optipng, useful for some apps
Specifically, for cz.jirkovsky.lukas.chmupocasi
2014-06-30 16:22:31 +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
dc8eb49b31 Recognise published .asc signatures in web repo browser 2014-06-30 12:04:22 +01: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í
6dd19063e9 Merge branch 'fix-and-test-source-tarball-process' of https://gitlab.com/eighthave/fdroidserver 2014-06-28 19:57:45 +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
25a94dced2 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.
2014-06-27 20:31:28 -04:00
Hans-Christoph Steiner
0e47d62024 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
2014-06-27 20:31:28 -04:00