chiark / gitweb /
Daniel Martí [Thu, 20 Aug 2015 16:42:10 +0000 (09:42 -0700)]
config: bump default build_tools after update in BS
Daniel Martí [Thu, 20 Aug 2015 16:41:47 +0000 (09:41 -0700)]
Remove default config settings from the BS
Daniel Martí [Thu, 20 Aug 2015 16:39:38 +0000 (16:39 +0000)]
Merge branch 'two-fixes' into 'master'
Two fixes
I pulled two commits out of !57 since it would be good to have them included, and specifically the `buildToolsVersion` issue was just discussed.
The current state of the `buildToolsVersion` replacement is not good. It will replace this:
```
buildToolsVersion '21.0.1'
```
with this:
```
buildToolsVersion = '21.0.1'
```
That is incorrect, since the first form is more like a function call than a variable assignment. So most likely that is causing the `buildToolsVersion` to be unset. The commit here includes a fix that works for both the rare, non-standard variable assignment way, i.e. `buildToolsVersion = '21.0.1'` as well as the standard way: `buildToolsVersion '21.0.1'`. It also includes tests for both cases.
See merge request !65
Hans-Christoph Steiner [Tue, 11 Aug 2015 13:33:03 +0000 (15:33 +0200)]
build: improve regsub pattern for setting buildToolsVersion
This addresses the discussion in !64
https://gitlab.com/fdroid/fdroidserver/merge_requests/64
Sometimes, buildToolsVersion is a kind of gradle macro call, and other
times it is a variable assignment. This regsub pattern now handles both of
those cases.
Hans-Christoph Steiner [Wed, 5 Aug 2015 22:19:30 +0000 (00:19 +0200)]
fix syntax error in manual generation and add ./gendocs.sh to the tests
Daniel Martí [Wed, 19 Aug 2015 06:46:35 +0000 (23:46 -0700)]
Only do the magic import/except dance once
No need to do it for every file, once per app is enough
Daniel Martí [Wed, 19 Aug 2015 01:13:18 +0000 (18:13 -0700)]
lint: also do http warnings on descriptions
Daniel Martí [Wed, 19 Aug 2015 01:07:01 +0000 (18:07 -0700)]
lint: better type safety
Daniel Martí [Wed, 19 Aug 2015 00:54:32 +0000 (17:54 -0700)]
Warn about url shorteners being used
Daniel Martí [Wed, 19 Aug 2015 00:53:56 +0000 (17:53 -0700)]
Warn about misplaced flattr donation links
Daniel Martí [Tue, 18 Aug 2015 23:28:58 +0000 (16:28 -0700)]
import: remove support for gitorious
Same as google code.
Daniel Martí [Tue, 18 Aug 2015 23:26:12 +0000 (16:26 -0700)]
import: remove google code support
Google code is dead and going read-only. import is just a helper program, and
we don't want to help people add apps from google code anymore. Apps should
move to other hosting sites.
Daniel Martí [Tue, 18 Aug 2015 21:01:14 +0000 (14:01 -0700)]
lint: Update Check Name with unchanged app id
Daniel Martí [Tue, 18 Aug 2015 20:40:21 +0000 (13:40 -0700)]
Add gradle 2.6 to the buildserver
Daniel Martí [Tue, 18 Aug 2015 20:39:00 +0000 (13:39 -0700)]
Update buildserver for android-23
Daniel Martí [Tue, 18 Aug 2015 05:04:20 +0000 (22:04 -0700)]
Fix type issue
Daniel Martí [Fri, 14 Aug 2015 22:30:03 +0000 (15:30 -0700)]
Also enforce https on urls without path
Daniel Martí [Fri, 14 Aug 2015 21:25:06 +0000 (14:25 -0700)]
Specify that CVC 0 means infinity
Daniel Martí [Fri, 14 Aug 2015 21:16:43 +0000 (14:16 -0700)]
lint: warn about CVCs that don't make sense
Daniel Martí [Fri, 14 Aug 2015 17:30:27 +0000 (10:30 -0700)]
Line numbers start at 1, not 0
Daniel Martí [Fri, 14 Aug 2015 17:27:16 +0000 (10:27 -0700)]
Add "Update Check Name:Ignore"
Daniel Martí [Fri, 14 Aug 2015 05:37:42 +0000 (22:37 -0700)]
lint: Fix unicode issues in list warnings
Daniel Martí [Fri, 14 Aug 2015 05:14:59 +0000 (22:14 -0700)]
lint: don't warn multiple times about lists
Daniel Martí [Fri, 14 Aug 2015 05:13:58 +0000 (22:13 -0700)]
lint: warn about incorrect lists
Daniel Martí [Thu, 13 Aug 2015 19:44:35 +0000 (12:44 -0700)]
Fix test that broke with
c813a3cdbb7e
Daniel Martí [Thu, 13 Aug 2015 18:28:01 +0000 (11:28 -0700)]
Add gradle 2.5, fixes #108
Daniel Martí [Thu, 13 Aug 2015 17:45:43 +0000 (10:45 -0700)]
Always end config list items with a comma
Ciaran Gultnieks [Thu, 13 Aug 2015 17:16:28 +0000 (19:16 +0200)]
Fix multiple errors in get_mime_type
Closes #111
Daniel Martí [Sun, 9 Aug 2015 01:40:20 +0000 (01:40 +0000)]
Merge branch 'fix-custom-buildToolsVersion' into 'master'
Fix gradle adaptation for custom buildToolsVersion configurations
I have ```build_tools = "22.0.1"``` configured in my config.py, however a recent fdroidserver update broke this. This PR fixes it for me.
See merge request !64
Lode Hoste [Sat, 8 Aug 2015 19:29:48 +0000 (21:29 +0200)]
fix gradle adaptation for custom buildToolsVersion configurations
Hans-Christoph Steiner [Fri, 7 Aug 2015 18:15:37 +0000 (18:15 +0000)]
Merge branch 'master' into 'master'
Add configuration for pypi
See: [http://peterdowns.com/posts/first-time-with-pypi.html](http://peterdowns.com/posts/first-time-with-pypi.html)
See merge request !63
Nico Alt [Fri, 7 Aug 2015 09:41:38 +0000 (11:41 +0200)]
Add configuration for pypi
Daniel Martí [Wed, 5 Aug 2015 17:52:53 +0000 (10:52 -0700)]
lint: complain about UCMs that haven't been used
Mainly for MRs from people who don't fill the automatic fields
Daniel Martí [Wed, 5 Aug 2015 17:33:18 +0000 (10:33 -0700)]
Properly default to NDK r10e
Daniel Martí [Wed, 5 Aug 2015 16:38:27 +0000 (16:38 +0000)]
Merge branch 'master' into 'master'
final 0.4.0 fixes
Because `setup.py` is broken because `MANIFEST.in` is still pointing to `README` and not `README.md`, the 0.4.0 tag needs to be deleted. This merge requests fixes that and two other minor issues. This has passed multiple runs of the test suite, both on my machine and the jenkins box.
See merge request !61
Hans-Christoph Steiner [Wed, 5 Aug 2015 11:48:42 +0000 (13:48 +0200)]
fix `fdroid rewritemeta` reference in manual
Hans-Christoph Steiner [Wed, 5 Aug 2015 11:26:35 +0000 (13:26 +0200)]
run-tests: fix quoting to prevent spurious execution of `fdroid update`
Hans-Christoph Steiner [Wed, 5 Aug 2015 08:35:14 +0000 (10:35 +0200)]
rename README to README.md in MANIFEST.in
this stops `python setup.py` from failing...
Daniel Martí [Wed, 5 Aug 2015 06:00:11 +0000 (23:00 -0700)]
Bump to 0.4.0
Hans-Christoph Steiner [Tue, 4 Aug 2015 20:56:16 +0000 (20:56 +0000)]
Merge branch 'master' into 'master'
Port README to markdown
Also add instructions for Arch-Linux.
You can take a look on it [here](https://gitlab.com/NicoAlt/fdroidserver/blob/master/README.md).
See merge request !60
Nico Alt [Tue, 4 Aug 2015 19:02:06 +0000 (21:02 +0200)]
Correct filename in setup.py
Nico Alt [Tue, 4 Aug 2015 10:54:06 +0000 (12:54 +0200)]
Port README to markdown
Also add instructions for Arch-Linux.
Daniel Martí [Tue, 4 Aug 2015 04:49:32 +0000 (21:49 -0700)]
Add automake1.11 for gpg
Daniel Martí [Mon, 3 Aug 2015 21:02:56 +0000 (21:02 +0000)]
Merge branch 'master' into 'master'
let setuptools determine the base install path on OSX
This is the last commit from me before the 0.4.0 release. Its ready to go!
A gentle reminder:
* sign the tag: `git tag -s 0.4.0 -m "tagging release 0.4.0"`
* release tags are `0.4.0` format, not `v0.4.0`
* change the version in `setup.py` to match the tag exactly, char by char
Then I'll post the update to pypi.python.org
See merge request !59
Hans-Christoph Steiner [Mon, 3 Aug 2015 20:03:25 +0000 (22:03 +0200)]
let setuptools determine the base install path on OSX
Instead of trying to guess which absolute path and .egg name
everything will be installed into, just use a relative path and the
setup process will do the right thing (so far, at least).
Daniel Martí [Mon, 3 Aug 2015 18:34:20 +0000 (11:34 -0700)]
Add gradle plugin version 1.3 to our wrapper
Ciaran Gultnieks [Mon, 3 Aug 2015 12:44:30 +0000 (12:44 +0000)]
Merge branch 'update-install' into 'master'
README: ppa only works for Ubuntu based systems
See merge request !58
Ciaran Gultnieks [Mon, 3 Aug 2015 12:43:15 +0000 (12:43 +0000)]
Merge branch 'bsd-osx-porting-and-tests' into 'master'
BSD/OSX porting and tests
This makes `fdroid init` and `fdroid update` work on BSD/OSX and maybe Cygwin also (I didn't test Cygwin). It also makes the install process more tolerant, like not requiring `python-magic` to run, while using it if its available.
Some fixes and additional tests are also included. The commit messages have more info.
See merge request !56
Hong Xu [Mon, 3 Aug 2015 00:11:44 +0000 (17:11 -0700)]
README: ppa only works for Ubuntu based systems
Hans-Christoph Steiner [Fri, 31 Jul 2015 22:49:33 +0000 (00:49 +0200)]
jenkins-build: run test suite from `pip install` using source tarball
Since `python setup.py sdist` provides the actual tarball that will be
installed via `easy_install`, `pip install`, etc. it should also be tested.
The existing `pip install -e $WORKSPACE` tests the .egg-link install format
Hans-Christoph Steiner [Fri, 31 Jul 2015 22:36:51 +0000 (00:36 +0200)]
support egg-link format when installed from git repo
If you run `python setup.py install` from the git repo, then it will be
installed using the .egg-link format, which just points to the git repo.
`fdroid init` needs to handle that when looking for example files to copy.
Hans-Christoph Steiner [Fri, 31 Jul 2015 14:23:05 +0000 (16:23 +0200)]
update install instructions in README
Hans-Christoph Steiner [Fri, 31 Jul 2015 13:54:50 +0000 (15:54 +0200)]
chmod keystore after checking whether it was created
On OSX, when Java is not installed, it'll fail to create the keystore, but
then give an error from chmod failing. This changes things so that the
missing Java is reported instead.
Hans-Christoph Steiner [Fri, 31 Jul 2015 13:53:39 +0000 (15:53 +0200)]
support installing as a Python .egg
For platforms where easy_install is a good option, like OSX, support
the Python .egg library format.
Hans-Christoph Steiner [Fri, 31 Jul 2015 13:50:20 +0000 (15:50 +0200)]
get MIME types without strictly requiring python-magic
There are two forms of python-magic, one included in libmagic that is
default on Debian, and another Python wrapper for libmagic that is
called 'python-magic' on pypi. Those both rely on the compiled binary
library libmagic. For platforms without good package management, fallback
to using the built-in 'mimetypes' library if 'magic' is not available.
This supports OSX, Windows, and BSD.
Hans-Christoph Steiner [Fri, 31 Jul 2015 12:47:48 +0000 (14:47 +0200)]
fix installing via OSX's easy_install
Hans-Christoph Steiner [Fri, 31 Jul 2015 10:27:57 +0000 (12:27 +0200)]
remove non-existant files from the MANIFEST.in
Hans-Christoph Steiner [Thu, 30 Jul 2015 20:13:36 +0000 (22:13 +0200)]
test new common.regsub_file() method that replaces sed calls
Hans-Christoph Steiner [Thu, 30 Jul 2015 20:13:12 +0000 (22:13 +0200)]
use common.regsub_file() instead of Popen(sed)
Python libraries work better in Python than running external commands, and
it also makes the code much more portable. For example, the GNU and BSD
sed commands have different, and sometimes conflicting, flags.
This also reworks the regexp patterns to be more tightly focused, and not
change the same variable name in comments or elsewhere.
Alex Burka [Mon, 27 Jul 2015 18:34:01 +0000 (11:34 -0700)]
tests: short args for mktemp to support BSD
*BSD and OSX do not have compatible long args
Hans-Christoph Steiner [Fri, 24 Jul 2015 23:27:45 +0000 (16:27 -0700)]
show commented out examples for setting sdk_path and ndk_paths
Instead of just mirroring the defaults in the example config.py, show a
useful example of how they might be set.
Hans-Christoph Steiner [Fri, 24 Jul 2015 22:52:13 +0000 (15:52 -0700)]
run-tests: fix copying of urzip.apk into new repo
Hans-Christoph Steiner [Fri, 24 Jul 2015 22:39:00 +0000 (15:39 -0700)]
run-tests: run `fdroid readmeta` after each --create-metadata
Just another basic check, this time for `fdroid readmeta`.
Daniel Martí [Thu, 30 Jul 2015 19:46:42 +0000 (12:46 -0700)]
lint: exit with an error code if any errors are found
Daniel Martí [Thu, 30 Jul 2015 18:35:25 +0000 (11:35 -0700)]
Also use OptionParser in readmeta to add -h/--help
Daniel Martí [Mon, 27 Jul 2015 17:41:23 +0000 (10:41 -0700)]
Merge branch 'some-compatibility-fixes' of https://gitlab.com/eighthave/fdroidserver
Daniel Martí [Sat, 25 Jul 2015 01:15:39 +0000 (18:15 -0700)]
Add --no-refresh to the completion
Daniel Martí [Sat, 25 Jul 2015 01:11:15 +0000 (18:11 -0700)]
Merge branch 'no-refresh' of https://gitlab.com/aelmahmoudy/fdroidserver
Daniel Martí [Sat, 25 Jul 2015 01:08:48 +0000 (18:08 -0700)]
Be more specific about empty build flags
Hans-Christoph Steiner [Fri, 24 Jul 2015 04:42:21 +0000 (21:42 -0700)]
remove dependency on wget for 'build' and 'verify'
To make the core tools portable to platforms like Mac OS X and Windows,
remove the dependency on wget and instead use Python Requests, which
probably has better performance anyway.
Hans-Christoph Steiner [Mon, 20 Jul 2015 23:42:40 +0000 (16:42 -0700)]
update: warn if APK has a date that is newer than the system clock
If the date in an APK is in the future, that could cause confusion. If the
system clock is wrong, then the APK will also have a date in the future.
This is most likely on offline signing machines, since they do not have a
time source to sync to.
Hans-Christoph Steiner [Wed, 15 Jul 2015 21:43:38 +0000 (14:43 -0700)]
extend text char limits to match other app stores
We should be compatible with other apps stores unless there is a specific
reason not to be.
* Google Play, Amazon, and iTunes all have 4000 char descriptions
For the summary, we can just bump it up to the same as what Play has
* Google Play allows an 80 char "Short Description"
https://support.google.com/googleplay/android-developer/answer/113469?hl=en
* Amazon allows a 1200 char "Short Description"
https://developer.amazon.com/public/support/submitting-your-app/tech-docs/submitting-your-app#Add Metadata and Image Assets
Ciaran Gultnieks [Tue, 21 Jul 2015 20:12:52 +0000 (22:12 +0200)]
Update recommended base box
أحمد المحمودي (Ahmed El-Mahmoudy) [Tue, 14 Jul 2015 10:32:39 +0000 (12:32 +0200)]
Add an option to disable repository refresh
This is useful for testing builds with no internet connection, and the
repositories were already fetched previously
Daniel Martí [Sun, 5 Jul 2015 21:26:41 +0000 (14:26 -0700)]
Also find usual suspects in gradle files
Ciaran Gultnieks [Mon, 29 Jun 2015 09:17:59 +0000 (11:17 +0200)]
Fix update fail when icons are missing
Introduced yesterday, I believe.
Daniel Martí [Mon, 29 Jun 2015 02:37:28 +0000 (19:37 -0700)]
Always clean and reset all submodules
Daniel Martí [Sun, 28 Jun 2015 18:45:06 +0000 (11:45 -0700)]
Hotfix: Client 0.92 breaks if web/source/tracker are missing
Revert this commit after a few stable releases
Daniel Martí [Fri, 26 Jun 2015 16:00:34 +0000 (18:00 +0200)]
Stable clients understand UpstreamNonFree now
Daniel Martí [Fri, 26 Jun 2015 15:58:57 +0000 (17:58 +0200)]
Hotfix for
7b68b90569 - don't cal .split() on None
Daniel Martí [Fri, 26 Jun 2015 15:41:19 +0000 (17:41 +0200)]
update: never include empty elements in the index
Ciaran Gultnieks [Thu, 25 Jun 2015 20:53:11 +0000 (22:53 +0200)]
Fix imagemagick (broken in
d9bbb507)
Daniel Martí [Sun, 21 Jun 2015 11:51:23 +0000 (13:51 +0200)]
Replace some FDroid strings with F-Droid
Daniel Martí [Fri, 19 Jun 2015 19:17:43 +0000 (21:17 +0200)]
Update the Android SDK to 24.3.3
Daniel Martí [Thu, 18 Jun 2015 15:54:56 +0000 (17:54 +0200)]
Improve xml string extracting support
* Shield ourselves from newlines that would break metadata files
* Properly use string resources for version names
Daniel Martí [Thu, 18 Jun 2015 15:05:48 +0000 (17:05 +0200)]
Replace NDK r10d with r10e
Daniel Martí [Thu, 18 Jun 2015 14:57:00 +0000 (16:57 +0200)]
Add gradle 2.4
Daniel Martí [Thu, 18 Jun 2015 14:56:08 +0000 (16:56 +0200)]
Bump build-tools to 22.0.1
Daniel Martí [Wed, 17 Jun 2015 17:55:30 +0000 (19:55 +0200)]
lint: start warning about invalid categories
Daniel Martí [Tue, 9 Jun 2015 21:11:42 +0000 (23:11 +0200)]
Bump index version to 13: <changelog> added
Daniel Martí [Tue, 9 Jun 2015 21:10:10 +0000 (23:10 +0200)]
update: don't always place the changelog element
It's not that common, so often it'd just be <changelog/>
Daniel Martí [Sun, 7 Jun 2015 12:14:56 +0000 (14:14 +0200)]
lint: take forcevercode into account for UCM warnings
Daniel Martí [Sun, 7 Jun 2015 12:05:29 +0000 (14:05 +0200)]
lint: get rid of -p/--pedantic
Only one check was left, and it's of little use anyway.
Daniel Martí [Sun, 7 Jun 2015 12:03:15 +0000 (14:03 +0200)]
lint: complain about useless Name: fields
Daniel Martí [Sun, 7 Jun 2015 12:02:50 +0000 (14:02 +0200)]
Always make sure that we don't encode None
Apparently, we can have a non-nil element that has a nil text.
Daniel Martí [Fri, 5 Jun 2015 15:15:13 +0000 (17:15 +0200)]
lint: Move the UCM:Tags warning out of pedantic
It's much more reliable now
Daniel Martí [Fri, 5 Jun 2015 15:04:05 +0000 (17:04 +0200)]
lint: Improve UCM:Tags warning
If the vercode is higher than CVC, then we're probably only following stable
versions or something like that
Daniel Martí [Fri, 5 Jun 2015 14:59:01 +0000 (16:59 +0200)]
lint: don't be pedantic about downloading code
We don't really control this if run via a script, which happens more often.
Daniel Martí [Fri, 5 Jun 2015 14:56:25 +0000 (16:56 +0200)]
lint: don't assume trailing slashes in urls are redundant
Daniel Martí [Fri, 5 Jun 2015 14:52:35 +0000 (14:52 +0000)]
Merge branch 'graphviz' into 'master'
Add graphviz to buildserver
Add graphviz to buildserver. Like inkscape and imagemagick it is used to "build" images from "source code".
See merge request !53