1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 05:10:10 +01:00
Commit Graph

734 Commits

Author SHA1 Message Date
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í
9779979e3a lintVital was added in 0.8, only exclude it then 2014-06-12 10:00:46 +02:00
Daniel Martí
7d8e9bbcaa jni problem is critical, so make it an error 2014-06-08 00:38:11 +02: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
Daniel Martí
6aeb57e950 Be less clumsy when removing signingConfigs 2014-06-05 10:02:30 +02:00
Hans-Christoph Steiner
ed73db65ae make FDroidPopen output based on --verbose
FDroidPopen outputs by default, this should be controlled by the --verbose
flag so that most of the time, only meaningful messages are shown like
errors and such.  For command output that should be shown everytime,
output=True can be set.
2014-06-04 22:01:25 -04:00
Hans-Christoph Steiner
6ca060e10d add more SDK checks: build-tools/19.0.3 and presense of aapt
Make sure that fdroid can find aapt in the current config, otherwise exit
with an error.  Some users don't have build_tools set, and their SDK does
not include the build-tools in the default versioned dir, so this should
warn them of what is wrong.
2014-06-04 21:54:55 -04:00
Daniel Martí
3d72c30fe5 Use ordered dicts for defaults in apps and builds 2014-05-31 23:54:50 +02:00
Daniel Martí
0f0ccdb1e1 Fix some more pep8 warnings 2014-05-28 09:33:14 +02:00
Daniel Martí
9301c50e3b More strict string search regex 2014-05-27 10:10:15 +02:00
Ciaran Gultnieks
3a73654d49 Centralise management of srclib metadata 2014-05-20 22:44:47 +01:00
Ciaran Gultnieks
e29da6b023 Restore friendly error messages
Use --verbose if you really want a full traceback with your 'you made a
typo in an package ID' messages.

It would be better to do this based on exception types (i.e. our own
exceptions - MetadataException, BuildException, VCSException) would not
print a traceback, but unexpected exceptions would. But the types are
not available at the 'fdroid' level currently.
2014-05-20 22:14:19 +01:00
Ciaran Gultnieks
0113f85448 Add ability to ignore updates based on version name matching 2014-05-13 20:04:22 +01:00
Ciaran Gultnieks
cf1201833b Add proprietary samsung jar to usual suspects 2014-05-11 22:14:32 +01:00
Hans-Christoph Steiner
37d6d87ff7 fix PEP8 "E226 missing whitespace around arithmetic operator" 2014-05-06 14:36:33 -04:00
Hans-Christoph Steiner
0e00b36db5 fix PEP8 E124/E125/126/127/128 indentation issues
* E124 closing bracket does not match visual indentation
* E125 continuation line does not distinguish itself from next logical line
* E126 continuation line over-indented for hanging indent
* E127 continuation line over-indented for visual indent
* E128 continuation line under-indented for visual indent
2014-05-06 14:36:33 -04:00
Hans-Christoph Steiner
aa5f317c26 fix PEP8 "W391 blank line at end of file" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
3f4f7a544b fix PEP8 "E302 expected 2 blank lines, found 1" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
2f2618e06c fix PEP8 "E401 multiple imports on one line" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
7e17fafc14 fix PEP8 "E225 missing whitespace around operator" 2014-05-06 11:45:03 -04:00
Hans-Christoph Steiner
2d271806f1 fix PEP8 "E251 unexpected spaces around keyword / parameter equals" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
58a484e74e fix PEP8 "W291 trailing whitespace" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
62204d1fe5 fix PEP8 "E202 whitespace before ']' or '}'" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
4af2e0004f fix PEP8 "E201 whitespace after '(' or '[' or '{'" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
998011d535 fix PEP8 "E231 missing whitespace after ','" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
f1812d5935 fix PEP8 "E203 whitespace before ':' or ','" 2014-05-06 11:45:02 -04:00
Hans-Christoph Steiner
fccb990521 fix PEP8 "E711 comparison to None should be 'if cond is None:'" 2014-05-06 11:45:02 -04:00
Daniel Martí
13af519069 Run git submodule sync before git submodule update
Fixes changes in submodule urls
2014-04-29 12:00:03 +02:00
Hans-Christoph Steiner
66df02d5f8 init: --android-home for forcing the path to the Android SDK
This allows the user to set the path to their Android SDK from the command
line. This option is named after the standard env var ANDROID_HOME, as used
in the build.xml generated by `android update project`.  --android-home
takes precendence over the ANDROID_HOME env var if it is set.
2014-04-23 19:33:10 -04:00
Hans-Christoph Steiner
186aec46ba init: split out defconfig and sdk test to run before config is loaded
`fdroid init` runs before any config.py exists, but it still needs to have
the default config and the SDK path tests.  So split those two bits out of
common.read_config() so that they can be run separately before config.py
is in place.
2014-04-23 19:32:04 -04:00
Hans-Christoph Steiner
d1cd817759 implement -q and -v for fdroid server
The --quiet and --verbose options that are standard with the fdroid tools
were not implemented yet with the `server` command.
2014-04-22 22:59:27 -04:00
Hans-Christoph Steiner
a7d1d9a54d overwrite password files if they exist
The .fdroid.*.txt password files are only meant to be a conduit for the
passwords, so blow them away everytime.  The canonical password is stored
in config.py.

It might makes sense to replace these files with env vars using
-storepass:env and -keypass:env.  I figured that the passwords are already
in a file, config.py, so adding more files in the same location with the
same perms would not increase the risk at all.
2014-04-22 22:59:27 -04:00
Daniel Martí
82e88fbcf6 Support custom maven/gradle resource paths 2014-04-22 11:39:29 +02:00
Daniel Martí
00fa44e916 Only do the latest five tags when using UCM:Tags on git 2014-04-17 21:05:18 +02:00
Daniel Martí
3736da3761 No longer use universal_newlines
It was added in an attempt to get git clone/fetch output, which did not
succeed.
2014-04-17 20:47:13 +02:00
Daniel Martí
f79ded4a26 Also ignore .bzr when scanning 2014-04-16 21:06:24 +02:00
Daniel Martí
559ad9ef5b Also glob the 'rm' field 2014-04-15 23:58:12 +02:00
Daniel Martí
d4f9f341ed Glob scanignore and scandelete
These fields can still be used without globbing, but globbing can be very
useful in some cases.
2014-04-15 23:53:44 +02:00
Daniel Martí
8f0f896d91 Rewrite much of the source scanner
* Group apk, jar and zip files in the same case
* Use regex to support more patterns and be more flexible
* Only check for usual suspects in jar files (saves time)
* Also catch unknown zip-like files as warnings
2014-04-15 23:33:54 +02:00
Daniel Martí
b92b722c6d Fix: some apks have a zip mimetype instead of a jar one 2014-04-15 17:50:08 +02:00
Daniel Martí
5f2c348b40 Support gradle variables without an equals sign 2014-04-12 01:00:59 +02:00
Daniel Martí
67054c7c6f Fix counting of scanner problems 2014-04-12 00:18:20 +02:00
Hans-Christoph Steiner
2bd62239f7 'smartcardoptions' config item for setting up HSMs with fdroid
These options are needed to configure Java's keytool and jarsigner to use
a Hardware Security Module aka HSM aka smartcard.  The defaults provided
are meant to make things work as easily as possible.
2014-04-07 16:00:18 -04:00
Hans-Christoph Steiner
40fdc2a943 improved error messages related to missing/non-functional SDK paths 2014-04-07 16:00:17 -04:00
Daniel Martí
fb933ebafd Make pylint happy about re-using the 'added' var 2014-04-03 16:05:15 +02:00
Daniel Martí
0c11f7bc49 scan_source: print problems, only return the total count 2014-04-03 16:04:06 +02:00
Daniel Martí
3905143252 Add default repotype() to make pylint happy 2014-04-02 23:37:29 +02:00
Daniel Martí
802d5e298c Merge commit 'refs/merge-requests/137' of gitorious.org:f-droid/fdroidserver 2014-04-01 23:47:11 +02:00
Daniel Martí
870ed87a36 Fix bankdroid build
All console stuff should be avoided already with just readLine
2014-04-01 19:29:37 +02:00
Daniel Martí
d8374b3efa Add keyaliases config default 2014-04-01 18:58:20 +02:00
Hans-Christoph Steiner
7bb490221a set the default keystore to the same as the default in fdroid init
This should keep things simple and consistent.
2014-03-31 21:42:46 -04:00
Hans-Christoph Steiner
525759b235 stop passing passphrases via args, instead use prepared files
Any process can read the process table, and can therefore see the entire
command line of any other process.  That means its a bad idea to ever put
passwords as part of a command line.  Python is executing keytool and
jarsigner command lines here, so now instead of putting the password on the
command line, a file is passed instead with suitable file permissions.
This should reduce the exposure a lot.  But still, sensitive passwords
should not be written to any text file.

This change requires OpenJDK-7 since the :file option to -storepass and
-keypass was only added in Java 7's keytool and jarsigner.
2014-03-31 21:02:42 -04:00
Daniel Martí
caa88ec388 Fix indexing issue with recursive srclibs 2014-03-31 19:23:48 +02:00
Daniel Martí
25a8dd5af4 Start rewriting git@github submodues to use https 2014-03-27 18:38:12 +01:00
Daniel Martí
7cf368df70 Better gradle signing keys regexes 2014-03-21 19:11:52 +01:00
Daniel Martí
22142138a6 Include possible src/AndroidManifest.xml gradle manifest path 2014-03-21 19:11:38 +01:00
Daniel Martí
167d9df3a0 Support auto names on gradle projects 2014-03-18 15:44:39 +01:00
Daniel Martí
d570422f6d Make SilentPopen use FDroidPopen, switch a few from silent to regular 2014-03-18 12:47:35 +01:00
Daniel Martí
f8805d88ae Make "reading config.py" a debug print 2014-03-18 12:20:51 +01:00
Daniel Martí
945d8b126f Properly use logging.warn in some places 2014-03-18 08:22:36 +01:00
Daniel Martí
5d6baedbc9 Try to fix <pre> issues on large lastbuilds 2014-03-17 14:52:01 +01:00
Daniel Martí
9014206b76 Properly identify jar files 2014-03-16 23:38:00 +01:00
Ciaran Gultnieks
93987eac17 Correction to 6b309aff 2014-03-16 22:34:13 +00:00
Ciaran Gultnieks
6b309aff41 Don't use an autoname if it's not found 2014-03-16 22:12:37 +00:00
Ciaran Gultnieks
f2a1a83455 Don't look for strings in unrelated projects 2014-03-16 08:43:54 +00:00
Ciaran Gultnieks
e642561676 Extra debug logging for autoname gathering 2014-03-16 08:43:24 +00:00
Daniel Martí
9962074cf3 Also strip project.properties of ant keysigning options 2014-03-13 10:31:22 +01:00
Daniel Martí
524404db61 Bump default build-tools version 2014-03-09 23:11:10 +01:00
Daniel Martí
19c99feb16 Don't reset a repo if its .fdroidvcs file ends with a newline 2014-03-05 13:22:58 +01:00
Daniel Martí
67d75e550b Don't add an extra space to git svn clone 2014-03-02 13:39:48 +01:00
Daniel Martí
d7ca28bbbe Fix gradle patching in a more generic way 2014-02-28 11:27:10 +01:00
Ciaran Gultnieks
a6c1b33a8c Remove unused import 2014-02-25 12:46:22 +00:00
Daniel Martí
a4ab105234 Look for strings in all xml dirs properly 2014-02-23 20:09:42 +01:00
Daniel Martí
858f89e3ac Update build-tools to 19.0.2 2014-02-23 12:21:28 +01:00
Daniel Martí
45bd80634c Fix srclib 'Srclibs:' regression 2014-02-23 11:57:03 +01:00
Daniel Martí
6cd34a1d21 Better gradle signingConfig patching
This fixes the building of impeller 0.8.7
2014-02-23 11:54:58 +01:00
Daniel Martí
0c2104039b Iterate over srclib Srclibs with indexes properly 2014-02-19 10:27:46 +01:00
Daniel Martí
a1d85e32f1 Some JARs have zip mimetype 2014-02-18 16:16:46 +01:00
Daniel Martí
3f485e509f git-svn fix: run fetch to actually get new tags and branches 2014-02-18 10:34:49 +01:00
Daniel Martí
b9728b2980 Warn about zip files like with jar files 2014-02-18 08:32:35 +01:00
Daniel Martí
d185e04d9e Also catch compiled java classes in the scanner 2014-02-18 08:32:16 +01:00
Daniel Martí
e1581d0d38 Catch all jar files 2014-02-18 08:25:30 +01:00
Daniel Martí
15f2eada8e Move config.py keystore checks to after vars have been expanded 2014-02-17 20:04:39 +01:00
moparisthebest
8e40b59c00 Support both debian's and pypi's python-magic libraries, which are different... 2014-02-16 22:42:16 -05:00
Daniel Martí
9064942d06 Remove leftover debug prints 2014-02-17 15:42:21 +01:00
Daniel Martí
a051ea9b93 Don't send a string as cmds to SilentPopen
Also, rm= checks for the validity of the paths. That's not useful, since one
could easily do "init=rm -rf ." without that same error popping up.
2014-02-17 14:59:55 +01:00
Daniel Martí
8533b8c44e Continue using FDroidPopen and SilentPopen more, support shell= 2014-02-17 13:30:11 +01:00
Daniel Martí
cc0943777e Start implementing SilentPopen 2014-02-17 13:12:25 +01:00
Daniel Martí
0ecd5172b1 Make the 'update' flag a list too 2014-02-17 13:09:44 +01:00
Daniel Martí
aa4fec9ca1 Remove stdin from FDroidPopen 2014-02-17 11:23:53 +01:00
Ciaran Gultnieks
cb3a08ff4b Improve build output situation since logging changes 2014-02-15 23:27:19 +00:00
Daniel Martí
d0cde659ca Let the no such package logs in first 2014-02-15 00:40:25 +01:00
Daniel Martí
0da4667bad Don't clean the main ant project twice 2014-02-13 09:19:26 +01:00
Daniel Martí
24c9232398 Have all multi-value build flags work similarly
Semicolons are still supported, but commas are now the better standard.
2014-02-12 11:15:19 +01:00
Daniel Martí
5125b52e39 Remove fixapos and fixtrans
These are legacy fixes for very old versions of the Android SDK tools. These
issues have been fixed in stable versions for years.
2014-02-12 10:23:02 +01:00
Daniel Martí
e5539303ff Get rid of all the debugging flags, not just the ones in the main project 2014-02-11 17:56:36 +01:00
Daniel Martí
25d22fdd3f Remove update=force
It is broken (doesn't support auto or multiple paths), generally useless and
builds using it can easily be fixed via init=rm -f build.xml
2014-02-11 16:46:54 +01:00
Daniel Martí
f7c77ac584 Move project updating to after prebuild (and before clean+build)
With this, the legacy echos of android.library.reference... work with
update=auto again.
2014-02-11 16:30:49 +01:00
Daniel Martí
2f1094b5cc Deprecate "Update Project" in favour of update=auto 2014-02-11 16:30:44 +01:00
Daniel Martí
ff8fa2305e Update ant projects more elegantly 2014-02-11 16:26:06 +01:00
Daniel Martí
0cef32a407 Small automatic ant updating rewrite
* Support two levels of subprojects
* Do lower level libraries first, doing '.' last
* Run 'ant clean' AFTER android update, since a missing build.xml results in ant clean doing nothing
2014-02-10 23:03:02 +01:00
Daniel Martí
e5915072c0 Don't crash if cwd==None 2014-02-10 20:17:48 +01:00
Daniel Martí
6e89e68f76 Fix local.properties sdk-location inserting 2014-02-10 18:26:33 +01:00
Daniel Martí
ff87af1933 Always run normpath on cwd in FDroidPopen 2014-02-10 17:44:31 +01:00
Daniel Martí
409188a4e5 Simplify 'Tags <pattern>' by using regex on top of vcs.gettags()
This automagically enables support for pattern-based tags for all vcs types
that support Tags
2014-02-10 12:20:22 +01:00
Daniel Martí
08607a3cd4 Support UCM:Tags <pattern> using git tag -l <pattern> 2014-02-10 11:29:12 +01:00
Daniel Martí
3f0dbe232c Don't add package ids to commit messages
The package id is already in the name of the file changed, plus it makes most
commit messages too long. Also of little interest to most people.
2014-02-10 10:55:29 +01:00
Daniel Martí
083eab579f Check for subdir after doing submodules 2014-02-09 19:11:15 +01:00
Daniel Martí
1f3653af15 Strip Auto Name: name to avoid extra spacing errors 2014-02-07 21:08:04 +01:00
Daniel Martí
2efce6cc69 Revert "Switch to python-magic from PIL"
This reverts commit 8541cdf893.
2014-02-03 23:04:33 +01:00
Daniel Martí
8541cdf893 Switch to python-magic from PIL 2014-02-03 14:14:42 +01:00
Daniel Martí
18ef1b53bc Don't output when checking repo 2014-01-31 11:40:03 +01:00
Daniel Martí
5525c5cd5f Don't print cmd info if output is false 2014-01-31 09:22:30 +01:00
Daniel Martí
430cd42f80 Merge branch 'master' into logging
Conflicts:
	fdroidserver/common.py
2014-01-30 23:58:23 +01:00
Daniel Martí
8a5b2e41f1 Forgot to remove verbose print 2014-01-30 00:17:26 +01:00
Daniel Martí
1b0fb05337 Handle dirs to be ignored in scan_source more gracefully 2014-01-30 00:16:03 +01:00
Daniel Martí
72fa1891bf Merge branch 'master' into logging
Conflicts:
	fdroidserver/build.py
2014-01-29 13:57:57 +01:00
Daniel Martí
63a0e859ff Run submodule reset and clean before update. Also do --recursive for these. 2014-01-29 12:38:21 +01:00
Daniel Martí
c06fafdb6f Do submodules recursively, do init and update at the same time 2014-01-28 23:49:36 +01:00
Daniel Martí
2f93ba9bd6 Merge branch 'master' into logging
Conflicts:
	fdroidserver/common.py
2014-01-28 14:14:59 +01:00
Daniel Martí
d5859fab32 Fix a couple gradle python mistakes 2014-01-28 14:14:18 +01:00
Daniel Martí
3687147997 Update my own copyright notices 2014-01-28 14:07:19 +01:00
Daniel Martí
3e789bd6b5 Merge compilesdk= into target=, better documentation about target= 2014-01-28 14:01:32 +01:00
Daniel Martí
dfd0ecc740 When using placed srclibs, don't fail if proj.prop doesn't exist 2014-01-27 22:34:34 +01:00
Daniel Martí
dbb6db5bb5 Add logging to init.py, remove silly options.verbose code 2014-01-27 22:22:30 +01:00
Daniel Martí
2d2d21fc38 Don't always print output in FDroidPopen when -v is given 2014-01-27 21:49:01 +01:00
Daniel Martí
62c3663df3 Lots more FDroidPopen replacements 2014-01-27 21:48:22 +01:00
Daniel Martí
9bc8dc95ff More switching from Popen to FDroidPopen 2014-01-27 21:48:22 +01:00
Daniel Martí
caa3d4eace Start doing logging properly 2014-01-27 21:48:22 +01:00
Daniel Martí
fc2c1bb1a8 More config changes
* Add the remaining defaults
* Don't always check that dirs exist
* Better sample config
2014-01-26 21:40:31 +01:00
Daniel Martí
d8fde9e855 Don't check for mvn and gradle binaries 2014-01-26 21:30:54 +01:00
Daniel Martí
c4d14ce86a Don't always require ndk_path 2014-01-26 21:28:09 +01:00
Daniel Martí
bc94f21463 Update defaults, mvn3 to mvn 2014-01-26 21:25:52 +01:00
Daniel Martí
0de1efeba4 Revert "Fix possible git-svn bug"
This reverts commit 61a61824d4.
2014-01-26 20:35:58 +01:00
Daniel Martí
61a61824d4 Fix possible git-svn bug 2014-01-24 18:25:06 +01:00
Daniel Martí
325cca0e37 Indent properly, space the code a bit 2014-01-24 10:10:40 +01:00
أحمد المحمودي (Ahmed El-Mahmoudy)
15c0a2779a git-svn: Support <branch>/<rev> in commit field
commit=<rev> is still supported
2014-01-24 10:49:20 +02:00
Daniel Martí
b3ef0970dc Make UCMs work for every android xml "namespace" 2014-01-23 10:52:09 +01:00
Daniel Martí
20aa416a4b Small logic fix in Update Project: 2014-01-23 10:40:23 +01:00
Daniel Martí
1e216f7f46 Don't update srclibs on their own if using them already 2014-01-23 10:34:42 +01:00
Daniel Martí
48afe5399a Dopatch and srclibs right after init 2014-01-23 10:29:04 +01:00
Daniel Martí
da2bb11580 When fetching tags in git, get rid of removed ones 2014-01-22 10:38:34 +01:00
Daniel Martí
41c522319b Revert "Run android update after applying srclibs"
This reverts commit 84fc2d9831.
2014-01-21 10:14:37 +01:00
Daniel Martí
84fc2d9831 Run android update after applying srclibs 2014-01-21 00:25:23 +01:00
Daniel Martí
b4b8b0d6a3 Typo in hg handling 2014-01-20 16:14:29 +01:00
Daniel Martí
482ae77854 Don't always raise an exception when using hg purge 2014-01-20 10:01:49 +01:00
Daniel Martí
228ed8eac9 Simplify hg purge workarounds 2014-01-20 00:33:31 +01:00
Ciaran Gultnieks
66e540772f Merge branch 'master' of gitorious.org:f-droid/fdroidserver 2014-01-16 10:18:10 +00:00
Ciaran Gultnieks
874565fb73 Don't split stdout/stderr
For the most part, doing this just makes build output incomprehensible,
with errors appearing out of context.
2014-01-16 10:17:22 +00:00
Daniel Martí
1f01250618 Use proper regex to remove signing from build.gradle files
This fixes apps like ifixit
2014-01-15 18:36:43 +01:00
Daniel Martí
0a34765461 Fix weird indentation in the hg purge changes 2014-01-15 16:40:27 +01:00
Daniel Martí
c09382fa82 Merge commit 'refs/merge-requests/93' of gitorious.org:f-droid/fdroidserver 2014-01-15 16:38:14 +01:00
أحمد المحمودي (Ahmed El-Mahmoudy)
65500b367e Check if purge extension is enabled before attempting to enable it in .hg/hgrc 2014-01-15 16:08:55 +02:00
Daniel Martí
7c461db596 Fix gradle checkupdates for some more cases
* If there are no equal signs
* If the vercode is not quoted
2014-01-11 13:33:17 +01:00
Daniel Martí
0bd7711eeb Make matching of build types easier 2014-01-10 20:43:38 +01:00
Daniel Martí
75916b8fe4 Raise summary char limit default to 50, fix config.sample.py 2014-01-08 13:19:57 +01:00
Daniel Martí
7f6761c436 Improve checkupdates regex, support quotes better for build.gradle 2014-01-07 10:04:11 +01:00
Daniel Martí
125a36b4de Run ant clean in update= dirs instead of removing dirs 2014-01-06 12:44:48 +01:00
Daniel Martí
c06b817449 Don't forcefully remove libs/<arch>, we now see binaries 2014-01-06 12:08:57 +01:00
Daniel Martí
a40533a521 New 'lint' subcommand in testing phase 2014-01-02 19:34:25 +01:00
Daniel Martí
0765f14c9d Remove trailing spaces and tabs 2013-12-30 17:05:25 +01:00
Daniel Martí
b07e857562 Make sure to match filename extensions without being case sensitive 2013-12-30 11:38:24 +01:00
Daniel Martí
5a583a87e6 Warn about prebuilt jar files when scanning 2013-12-30 11:38:24 +01:00
Daniel Martí
22f5affabb Match anything as package name 2013-12-22 12:27:26 +01:00
Daniel Martí
ed482bf242 Package names can contain numbers too 2013-12-22 12:24:53 +01:00
Daniel Martí
efc8317272 Replace finds with pythonic terms 2013-12-20 09:34:03 +01:00
Daniel Martí
7184ba0f9d Add common.py function headers, styling 2013-12-19 22:28:38 +01:00
Daniel Martí
5ac855af69 Don't except if already installed on fdroid install 2013-12-19 18:01:58 +01:00
Daniel Martí
84bf3d758f Better parsing of args, install now works as it should 2013-12-19 17:51:16 +01:00
Daniel Martí
3aec0aacd7 Adapt checkupdates 2013-12-19 17:05:40 +01:00
Daniel Martí
21db79eea2 Only install latest apk of each app, other fixes 2013-12-19 17:05:40 +01:00
Daniel Martí
93d8d23cee Add 'fdroid install', more rewriting 2013-12-19 17:05:40 +01:00
Daniel Martí
a4780c2107 Start rewrite: Remove --package and --install from 'build' 2013-12-19 17:05:40 +01:00
Kilian Holzinger
6435551e66 hg deletes now all changes, so we get a unchanged, blank repo. this is also the behaviour of git 2013-12-12 10:26:56 +01:00
Daniel Martí
31c9f0a644 Also allow for '~' and '~user' 2013-12-07 13:21:45 +01:00
Daniel Martí
c8b417bf4a Expand vars properly 2013-12-07 13:20:22 +01:00
Daniel Martí
86c91c8166 Do not output warnings for missing configs 2013-12-07 12:15:46 +01:00
Daniel Martí
ae0ca52557 Forgot a couple continues 2013-12-06 21:31:47 +01:00
Daniel Martí
f0b66cee92 Only warn about config.py perms if there's sensitive info 2013-12-06 17:20:03 +01:00
Daniel Martí
3825e5aebe Fixes to config parsers 2013-12-06 16:38:46 +01:00
Daniel Martí
9a2a0efa41 Reading config now also checks its assigned bins and dirs 2013-12-06 12:55:56 +01:00
Daniel Martí
9ecf6fcf74 Take "$VALUE" settings from environment variables
Set sdk_path and ndk_path defaults to $ANDROID_HOME and $ANDROID_NDK
2013-12-06 12:37:53 +01:00
Daniel Martí
8d91a1e915 target= affects updating srclibs again, small fixes 2013-12-06 12:15:13 +01:00
Daniel Martí
b53dd5708a Nongreedy matches for retrieve_string 2013-12-04 20:17:49 +01:00
Daniel Martí
996f141da8 Make app and version name formats a standard 2013-12-02 15:35:25 +01:00
Daniel Martí
bf61dcf708 Support application names in the form of '&app_name;' 2013-12-02 15:09:59 +01:00
Ciaran Gultnieks
41d7068604 Add ouya-sdk to usual suspects 2013-12-01 16:47:17 +00:00
Ciaran Gultnieks
7cc21fe89a Allow definition of index max age in repo config 2013-11-26 22:07:47 +00:00
Ciaran Gultnieks
62e03f84f7 Some more kivy wip 2013-11-26 22:04:40 +00:00
Ciaran Gultnieks
53781f913b Some more kivy wip 2013-11-26 22:02:33 +00:00
Ciaran Gultnieks
1390704c91 Kivy build support, wip 2013-11-24 22:11:41 +00:00
Ciaran Gultnieks
da0af33bf4 Some more symlink-related improvements 2013-11-24 10:29:28 +00:00
Ciaran Gultnieks
95495b2818 Make rm work propery with symlinks 2013-11-24 09:47:11 +00:00
Ciaran Gultnieks
03c092998e Merge branch 'master' of gitorious.org:f-droid/fdroidserver 2013-11-24 09:42:50 +00:00
Ciaran Gultnieks
1198c0299c Remove signing keys later in build
Specifically, after rm, otherwise it can attempt to modify files (or
symlinks!) that are going to be removed.
2013-11-24 09:42:16 +00:00
Daniel Martí
ca3c954d3d Prepare srclibs after patches 2013-11-23 12:21:17 +01:00
Ciaran Gultnieks
0231409224 Permission check correct file 2013-11-23 10:56:58 +00:00
Daniel Martí
3372a5fb25 Small fix to keysigning cleaning output 2013-11-20 19:08:59 +01:00
Daniel Martí
c4a5ced10a Fixes to srclibs with paths 2013-11-20 19:00:22 +01:00
Daniel Martí
fb38eb6b8c First metadata checks rewrite; New metadata.py module 2013-11-19 15:35:16 +01:00
Daniel Martí
b6f5c15a7c Try to fix srclibs for the BS 2013-11-18 22:31:52 +01:00
Daniel Martí
93b2dca3a3 Small fix to ant srclib numbers 2013-11-18 08:41:29 +01:00
Daniel Martí
b335759816 Add srclib proj.prop lines if not already there 2013-11-17 23:23:25 +01:00
Daniel Martí
60f07b49b1 Also avoid readLines from build.gradle 2013-11-17 22:04:27 +01:00
Daniel Martí
83658bc0da Add crashlytics to usual suspects 2013-11-17 22:04:27 +01:00
Daniel Martí
d32722a4aa gradle and maven keys should be among the first 2013-11-16 22:51:03 +01:00
Daniel Martí
4543588941 Fix keysigning patching (again) 2013-11-16 12:54:35 +01:00
Daniel Martí
64a7a5149e Fix srclib subdir paths 2013-11-16 12:54:23 +01:00
Daniel Martí
b6eefb2d5d Fix keysigning patches 2013-11-15 21:24:54 +01:00
Daniel Martí
860baa883c New feature: Srclibs much easier to use for ant, recursive srclibs
Will write its documentation once it's stable and polished
2013-11-15 20:42:17 +01:00
Daniel Martí
d7906fe07b Only notify of those gradle/ant files that were stripped of signing keys 2013-11-15 12:42:39 +01:00
Ciaran Gultnieks
887e754170 Merge branch 'master' of gitorious.org:f-droid/fdroidserver 2013-11-15 09:47:32 +00:00
Ciaran Gultnieks
7e57ee768a Correctly detect subproject update failure 2013-11-15 09:47:12 +00:00
Ciaran Gultnieks
b48239084d Improve error reporting for rm problems 2013-11-15 09:46:04 +00:00
Daniel Martí
038a55ae0c Remove keysigning configs more consistently:
* Do it for srclibs as well as apps
* Find all ant *.properties files like we do with gradle ones
* Remove extra gradle problems (e.g. changing apk names)
2013-11-14 14:09:37 +01:00
Ciaran Gultnieks
c75aa26115 Improve error output for missing extlibs 2013-11-12 20:14:16 +00:00
Ciaran Gultnieks
652674f4eb Only say 'reading config file' in verbose mode 2013-11-12 20:00:15 +00:00
Daniel Martí
355dc1bfd9 Fix crashes when writing boolean metadata fields 2013-11-10 17:27:47 +01:00
Daniel Martí
47f31b72c0 Revert "Revert "Don't allow values other than 'yes' or 'no' on boolean fields, integrity fixes""
Yo dawg
2013-11-10 17:27:47 +01:00
Ciaran Gultnieks
a7c077634b Revert "Don't allow values other than 'yes' or 'no' on boolean fields, integrity fixes"
This reverts commit 04f7485949. Breaks too
many things.
2013-11-09 06:52:11 +00:00
Daniel Martí
04f7485949 Don't allow values other than 'yes' or 'no' on boolean fields, integrity fixes 2013-11-08 21:53:34 +01:00
Daniel Martí
6e0ad365d0 Don't pass config variables as arguments - much simpler code 2013-11-08 20:44:27 +01:00
Daniel Martí
4f6fb4df82 Merge commit 'refs/merge-requests/129' of gitorious.org:f-droid/fdroidserver 2013-11-05 23:58:32 +01:00
Hans-Christoph Steiner
5f06fba591 init set config.py perms to 0600, otherwise warn user if config.py is not
Since config.py contains passwords in it, it should be protected as much as
possible.  At the very least, the file permissions should be 0600 to
restrict access to user that actually edits and runs 'fdroid' commands.
2013-11-05 17:27:08 -05:00
Daniel Martí
40488a9486 Replace some 'if len(s) == 0' by 'if not s', remove unnecessary code 2013-11-05 19:42:29 +01:00
Ciaran Gultnieks
356f12ab2f Write maintainer notes to wiki 2013-11-05 16:40:23 +00:00
Ciaran Gultnieks
ceee4c0e95 Handle 'Maintainer Notes' field in metadata 2013-11-05 16:40:23 +00:00
Daniel Martí
2b0badd4c4 Fix init with common, don't require cwd in FDroidPopen 2013-11-05 09:26:56 +01:00
Daniel Martí
3638edd252 Make FDroidPopen a lot simpler, pythonize a few things 2013-11-04 20:19:31 +01:00
Daniel Martí
429221f282 Don't check for dirs and files in the main script 2013-11-04 18:41:20 +01:00
Daniel Martí
a8810b809a Don't use proj.prop if not present (fixes tiltmazes) 2013-11-04 17:03:43 +01:00
Daniel Martí
1ef3e2408a Implement forceversion and forcevercode for gradle projects 2013-11-04 16:09:23 +01:00
Daniel Martí
22a02a02c4 Fix sed typo that broke forceversion and forcevercode 2013-11-04 15:42:01 +01:00
Daniel Martí
45e68b45d4 Revert "Fix git-svn find-rev, also search for svn revisions after HEAD"
This reverts commit e35a1093cd.
2013-11-04 10:43:28 +01:00
Daniel Martí
fc804e68d2 Fixes to makebuildserver and verify 2013-11-04 10:22:22 +01:00
Daniel Martí
65e708908e Merge branch 'master' into verbose-rewrite
Conflicts:
	fdroidserver/common.py
2013-11-03 14:00:09 +01:00
Daniel Martí
962b603a6a variable typo 2013-11-03 13:54:55 +01:00
Daniel Martí
ccf0c0664f Default to update=auto, find subprojects automatically 2013-11-03 13:45:22 +01:00
Daniel Martí
070feb3d21 Fix all the possibe local.properties files, add sdk dir if oldsdk is not set 2013-11-03 11:49:11 +01:00
Daniel Martí
7a4ec5c083 AM.xml is not the only file that designates an android app source dir 2013-11-02 22:52:52 +01:00
Daniel Martí
5b613292c3 Merge branch 'master' into verbose-rewrite 2013-11-02 22:36:55 +01:00