kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 13:20:10 +01:00
Code Activity
2,166 Commits 1 Branch 59 Tags 44 MiB
325cca0e37
Commit Graph

390 Commits

Author SHA1 Message Date
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
Daniel Martí
f16f8a4313 Read output queues a bit more often 2013-11-02 20:30:21 +01:00
Daniel Martí
67b8825560 Merge branch 'master' into verbose-rewrite 2013-11-02 19:56:31 +01:00
Daniel Martí
f1526faa47 Translate 'Category:categ1;categ2;...' into 'Categories:categ1,categ2,...' 2013-11-02 12:04:02 +01:00
Daniel Martí
ee759a3a0e Start doing multiple categories as comma separated lists 
Don't drop support for old clients (only one category) yet
 2013-11-02 01:14:01 +01:00
Daniel Martí
5644b17048 Various fixes: hg vcs updating, gradle vercode regex... 2013-11-01 19:12:22 +01:00
Daniel Martí
ff3faefd80 Merge branch 'verbose-rewrite' of gitorious.org:f-droid/fdroidserver into verbose-rewrite 
Conflicts:
	fdroidserver/common.py
 2013-11-01 13:57:10 +01:00
Daniel Martí
d525d987e2 Merge branch 'master' into verbose-rewrite 2013-11-01 13:55:42 +01:00
Daniel Martí
c3be06fb1d Start rewriting options and config as common.py globals 2013-11-01 13:55:38 +01:00
Daniel Martí
08b24b7ad2 Don't remove output dirs twice. --subprojects is useless. 2013-11-01 13:55:38 +01:00
Daniel Martí
aaba6ceec2 Better gradle signature config filter 2013-11-01 13:55:37 +01:00
Daniel Martí
42a41dc3a9 Minor fixes to git-svn 2013-11-01 13:55:37 +01:00
Daniel Martí
e07d35f913 New field: scandelete, like scanignore but deleting 
Also, many improvements:

* scanning algorithm is much clearer
* Now paths start by '/', which means the repo dir root.
  - If they don't, '/' is added
  - If they start by './', the dot is removed
  - If "." is in the paths, it is replaced by "/"
* Handling/removing of problems is much easier
* Removed last initfun/funambol bits
 2013-11-01 13:46:19 +01:00
Daniel Martí
d507b2e894 New metadata field: Vercode Operation 2013-11-01 13:25:50 +01:00
Daniel Martí
0c8283bc1a Also reset --hard and clean -dffx the git submodules 2013-11-01 13:19:29 +01:00
Daniel Martí
e53f006d08 Checkout with --force on git 2013-11-01 13:19:07 +01:00
Daniel Martí
66a431a14a Start using config and options as common.py globals 2013-10-31 23:27:03 +01:00
Daniel Martí
16baeece58 Don't remove output dirs twice. --subprojects is useless. 2013-10-31 17:56:37 +01:00
Daniel Martí
f07cb7e90f Better gradle signature config filter 2013-10-31 17:23:12 +01:00
Ciaran Gultnieks
41c643d301 Merge branch 'master' of gitorious.org:f-droid/fdroidserver 2013-10-31 15:51:06 +00:00
Ciaran Gultnieks
a762a0cb04 Tidied up some unused junk 2013-10-31 15:46:32 +00:00
Ciaran Gultnieks
08287a1fa8 Handle repo config in a more sensible way 2013-10-31 15:37:39 +00:00
Daniel Martí
ec58f6e313 Minor fixes to git-svn 2013-10-31 15:54:52 +01:00
Daniel Martí
8a05ae3be6 Support user:pass authentication on git-svn 2013-10-31 11:53:12 +01:00
Daniel Martí
4c5cd7a360 Add support for UCM:Tags in bzr 2013-10-30 21:54:09 +01:00
Daniel Martí
d8d3f00e6b Avoid newlines in git-svn RepoTrunk 2013-10-30 21:40:48 +01:00
Daniel Martí
efb161e622 Don't error when finding apk files, just delete them 2013-10-30 19:15:15 +01:00
Daniel Martí
a0e7409148 Away with all the funambol ugly tweaks 2013-10-30 18:24:03 +01:00
Daniel Martí
c234945f75 Automatically remove all android:debuggable flags 2013-10-30 17:17:44 +01:00
Daniel Martí
e35a1093cd Fix git-svn find-rev, also search for svn revisions after HEAD 2013-10-30 16:54:08 +01:00
Daniel Martí
9571c792db Print FDroidPopen params *before* executing 2013-10-29 20:39:49 +01:00
Daniel Martí
fd50903c50 Don't include '!' in disabled= when converting to new syntax 2013-10-29 13:36:06 +01:00
Daniel Martí
5455576b6b Some fixes to the scanner algorithm 2013-10-29 12:03:37 +01:00
Daniel Martí
8566250dd0 Find all build.gradle files in the entire source tree 2013-10-29 00:19:49 +01:00
Ciaran Gultnieks
8627357cd9 Don't require commit to be specified for a disabled build 2013-10-28 08:53:18 +00:00
Daniel Martí
a546013756 Clean gradle signing configs all at once 2013-10-27 23:43:38 +01:00
Daniel Martí
a5472d9b9a Revert "Allow for spaces before/after version and vercode" 
This reverts commit ec5e12221f.
 2013-10-27 22:43:24 +01:00
Daniel Martí
ec5e12221f Allow for spaces before/after version and vercode 
This allows for 'Build: foo, 1' as well as the old 'Build:foo,1'
 2013-10-27 22:32:59 +01:00
Daniel Martí
61a8466ed5 Support Build: indenting by tabs 2013-10-27 22:16:41 +01:00
Ciaran Gultnieks
dad4f496f0 Fix rm safety check 
I got it backwards due to my stupid parameter naming.
 2013-10-27 17:16:04 +00:00
Ciaran Gultnieks
921b407582 Allow rm to recursively remove directories 2013-10-27 17:05:53 +00:00
Ciaran Gultnieks
ccdea798fc Don't need legacy disabled build handling everywhere now 2013-10-27 14:40:02 +00:00
Ciaran Gultnieks
075551b715 Disabled should be first 2013-10-27 14:36:25 +00:00
Ciaran Gultnieks
945f99e4ca Translate disabled commit to proper disabled 2013-10-27 14:35:57 +00:00
Ciaran Gultnieks
327e472169 Read new or old recipe formats, write new format 
Slightly tested. See https://f-droid.org/wiki/page/Build_Recipe_Format
 2013-10-27 14:06:55 +00:00
Ciaran Gultnieks
67021f8760 Include bugsense in scanner 2013-10-26 19:30:17 +01:00
Ciaran Gultnieks
b7425d7253 Be more selective about removing bin directories 2013-10-25 11:59:55 +01:00
Daniel Martí
0ba888850a Regression - we won't do subvercodes 2013-10-25 10:37:53 +02:00
Ciaran Gultnieks
fe46cc8fdd Quick hack to fix FDroidPOpen 
That loop is using more CPU that the actual building of the app.
 2013-10-24 11:12:15 +01:00
Daniel Martí
83183a31ac Don't output stdout/stderr twice, print what is run and where 2013-10-23 19:54:05 +02:00
Ciaran Gultnieks
548c5f606c Removed bogus (hopefully) checkout 2013-10-23 15:57:02 +01:00
Daniel Martí
b4293fb9d6 Fix hg checkupdates 2013-10-21 17:00:42 +02:00
Daniel Martí
4233d0d15f Fix silly forcever(sion|code) errors 2013-10-20 22:27:34 +02:00
Daniel Martí
3e9b70f688 Loop over all AM.xml files for forcever(sion|code) 2013-10-20 13:43:15 +02:00
Daniel Martí
a9a947af86 Add functions to find apk and tarball paths 2013-10-19 12:21:47 +02:00
Daniel Martí
b75d8b7271 New Update Check Mode: RepoTrunk 2013-10-17 23:27:55 +02:00
Daniel Martí
c83e4f9729 Don't be verbose when preparing srclibs 2013-10-16 23:31:02 +02:00
Daniel Martí
db80644fa6 Finish large reworking of Popen calls 
Now we handle the output pipes via Queues, which means that long and verbose
builds (like navit) won't hang mercilessly during any of init=, prebuild=
build= or the build itself. This also removes redundancies.
 2013-10-16 23:19:11 +02:00
Daniel Martí
fb5a2209fc Use python-magic, filemagic's official python binding lib 2013-10-16 23:19:11 +02:00
Daniel Martí
bd59b2f77d Don't catch octet-stream, catch static libs and bin exes 2013-10-16 23:19:11 +02:00
Daniel Martí
7eb8dfedc6 Fixes to scanignore and relative paths in scans 2013-10-16 10:54:11 +02:00
Daniel Martí
0154a77854 Import magic only at build time 2013-10-16 09:31:26 +02:00
Daniel Martí
779476e6f4 Find blobs by magic numbers 2013-10-15 23:24:37 +02:00
Ciaran Gultnieks
99510de07a Fix error message error 2013-10-15 15:52:53 +01:00
Ciaran Gultnieks
25ae0e8d79 Allow archive policy override for indivudual apps 2013-10-14 16:16:34 +01:00
Daniel Martí
47cad8fca7 Add support for Litecoin in the server 2013-10-13 00:03:11 +02:00
Daniel Martí
603aa34114 vcs_svn reset back to shell=True 2013-10-11 17:08:07 +02:00
Daniel Martí
f9eda50276 Fix silly object name issue, also clean jni dirs 2013-10-10 16:30:32 +02:00
Daniel Martí
0bde32fd99 Be more consistent when doing cleans 
All update dirs, including ., will remove baddirs.
Right before build=, (ant|maven|gradle) clean will run
 2013-10-10 15:48:39 +02:00
Daniel Martí
0949395771 Be more consistent when running bash commands (fixes #365) 2013-10-09 23:37:53 +02:00
Ciaran Gultnieks
42497533a5 Revert "Don't stop if srclib paths are hard-coded" 
This reverts commit 33a95637c0.
 2013-10-09 10:11:34 +01:00
Ciaran Gultnieks
5ce730a3a0 Detect proprietary youtube api lib 2013-10-09 09:48:41 +01:00
Daniel Martí
33a95637c0 Don't stop if srclib paths are hard-coded 
If the raise takes place, UCMs with srclibs don't work.
 2013-10-08 00:38:24 +02:00
Daniel Martí
890a1adb6f Do not repeat stderr and stdout when -v/--verbose 2013-10-02 19:29:17 +02:00
Ciaran Gultnieks
8f8360fcf6 Don't try and parse username/password out of repo address except for svn 2013-10-02 10:25:26 +01:00
Ciaran Gultnieks
e9aff5f31d Add HTTP update check mode 2013-10-01 10:19:17 +01:00
Daniel Martí
89a4e17c3b Added myself to copyright notices 2013-09-28 21:06:33 +02:00
Daniel Martí
e3682bd5a8 Fix many cases of UCM for Gradle 2013-09-21 19:43:31 +02:00
Daniel Martí
4193caa0d4 Remove all bin dirs on update= dirs, be more verbose 2013-09-16 12:53:27 +02:00
Daniel Martí
c4237fe732 Fixes to gotorevision(None) 
Up until now, this would do nothing in most cases
 2013-09-15 23:20:42 +02:00
Daniel Martí
9257690f95 Allow for leading and trailing whitespaces in ';'-separated lists (e.g. update= abc ; def ; ...) 2013-09-11 13:45:02 +02:00
Daniel Martí
fba8fb839c Allow spaces before/after field key names 2013-09-11 01:07:51 +02:00
Daniel Martí
fed04a0429 Don't print all metadata reads; Only print when an exception is present 2013-09-06 22:38:36 +02:00
Daniel Martí
94b083063a Add UCM:Tags support to hg 2013-09-06 20:33:47 +02:00
Paul Sokolovsky
24af895915 Print progress messages as a build goes thru various stages. 
Without this, we get bunch of messages at the start of build, which
end with "Applying patch", and then all the things hangs for several
minutes (or more, in case of network problems, etc). So, consistently
keep user aware od what's happening. Note that --verbose switch affects
deatiledness and amount of output (in particular, if it's given, "build"
command output goes to console instead of log).
 2013-08-28 22:12:33 +03:00
Daniel Martí
76d3b56ff5 Remove a bunch of unused imports 2013-08-22 16:42:57 +02:00
Daniel Martí
f6554d846c Remove bin/ and gen/ in update= dirs too! 2013-08-21 16:20:27 +02:00
Daniel Martí
562f539e96 When parsing manifests, default version name to "Unknown" 2013-08-15 16:01:33 +02:00
Daniel Martí
990321d33d Fetch CV @string values at checkupdates 2013-08-15 12:15:44 +02:00
Daniel Martí
13a8b1fd0a Return none if no AM.xml paths exist 2013-08-14 15:07:26 +02:00
Daniel Martí
36f524e624 Do not duplicate verbose output when parsing metadata 2013-08-14 14:27:05 +02:00
Daniel Martí
2fdd274580 Merge branch 'gradle' (finally!) 
Conflicts:
	fdroidserver/checkupdates.py
 2013-08-14 12:03:19 +02:00
Daniel Martí
a23fb27155 Forgot to remove debugging prints 2013-08-13 16:00:51 +02:00
Daniel Martí
0ad09f6481 Improve checkupdates further, Auto Name works with gradle 2013-08-13 15:58:43 +02:00
Daniel Martí
1fcb56b946 Use last found package name if none found 2013-08-13 15:25:47 +02:00
Daniel Martí
cf47e151f7 Small fixes to checkupdates 2013-08-13 14:51:40 +02:00
Daniel Martí
578e030ee6 Try and adapt checkupdates to gradle better 2013-08-13 12:02:48 +02:00
Daniel Martí
1e7bfc9864 Don't run gradle during checkudpates. Use whatever can be found. 2013-08-09 17:15:27 +02:00
Daniel Martí
705a05f4c1 Market is broken, don't default to it 2013-08-08 16:47:26 +02:00
Daniel Martí
ece2ece071 Deprecate aapt_path in favour of sdk_path + build_tools 2013-08-08 13:00:02 +02:00
Daniel Martí
d86a68b858 Fix gradle checkupdates with tags and RM. new settings. 2013-08-08 12:55:48 +02:00
Daniel Martí
89a9447a8c Use src/ rather than source/ 2013-08-03 18:53:01 +02:00
Daniel Martí
8c8a20bcb1 Merge master into gradle 2013-08-03 18:37:29 +02:00
Daniel Martí
7ff2fafb1b Print which srclib are we updating 2013-08-03 18:18:10 +02:00
Daniel Martí
a5b8659632 New gradle=[flavour] field 2013-08-03 17:07:55 +02:00
Daniel Martí
59e212d7a3 Try and use new gradle AM.xml path 2013-08-03 16:44:14 +02:00
Daniel Martí
a49b405780 Remove deprecated parameter 2013-07-31 19:51:02 +02:00
Frans Gifford
e0e6e711c3 Use config.py to locate aapt 
This uses aapt_path in config.py to locate the aapt command. The latest
Android SDK moved aapt out of platform-tools/ causing builds which depend
on this path to fail.

Signed-off-by: Frans Gifford <frans.gifford@cs.ox.ac.uk>
 2013-07-31 19:51:02 +02:00
Daniel Martí
6adc661e0e Auto Names: handle escaped \' and nested strings 2013-07-10 12:02:19 +02:00
Daniel Martí
69619a5acf Use all xml files to figure out strings 2013-07-08 15:24:48 +02:00
Daniel Martí
fa552b12cb Add retrieve_string(); use it in parse_androidmanifest 2013-07-05 22:34:53 +02:00
Daniel Martí
bc6e9cd4b4 Try a better regex match for the versionName 2013-07-04 15:55:44 +02:00
Daniel Martí
c2c1792727 Better @string globbing, should fix some AutoNames 2013-06-27 21:39:00 +02:00
Ciaran Gultnieks
e86aab59b6 More srclib-related fixing 2013-06-25 19:13:36 +01:00
Daniel Martí
39c315953f labels can be on the same line as <application 2013-06-15 18:33:24 +02:00
Daniel Martí
304412dee5 Never use @string/* as Auto Name 2013-06-14 10:09:23 +02:00
Daniel Martí
d1ef217895 Only match label of the first application element 2013-06-14 10:06:22 +02:00
Daniel Martí
3f7b6b8734 Allow extra fields in real name string 2013-06-14 08:42:43 +02:00
Daniel Martí
182fd08cf4 Remove tabs from previous commit 2013-06-13 09:37:42 +02:00
David Black
00471847c5 add google-play-services and crittercism to scanner 2013-06-12 15:20:58 +01:00
Daniel Martí
ed64737678 real name can't be None 2013-06-12 12:05:55 +02:00
Daniel Martí
58f555737f Add "Auto Name" field, fill it in checkupdates 2013-06-11 00:30:30 +02:00
Daniel Martí
9c3b4a9daa Substitute variables in Prepare for srclibs too 2013-06-09 23:15:46 +02:00
Ciaran Gultnieks
68df47779d Fix more srclib-related stuff 2013-06-05 12:54:47 +01:00
Ciaran Gultnieks
cfa2646b8f Transfer srclibs properly 2013-06-04 22:42:18 +01:00
Ciaran Gultnieks
9ff536eae6 Use bash for init/prebuild, not sh 2013-06-04 22:38:44 +01:00
Daniel Martí
785e17428a Add support for spaces in git-svn tags, fixes 2013-06-03 11:20:49 +02:00
Daniel Martí
c11464bdd5 Fix git-svn tags and checkouts 2013-06-03 10:56:17 +02:00
Ciaran Gultnieks
94afbd8878 Merge branch 'master' of gitorious.org:f-droid/fdroidserver 2013-05-31 07:59:50 +01:00
Ciaran Gultnieks
7707e0902e Report missing srclib properly 2013-05-31 07:50:47 +01:00
Daniel Martí
5d36f41c3f Forgot to remove "trunk" in git-svn checkout 2013-05-28 16:36:52 +02:00
Daniel Martí
86cff4e49c Treat git-svn git checkouts correctly. Mute tags/* 2013-05-28 16:25:23 +02:00
Daniel Martí
d042a685ce branches= on git-svn + muliple arguments allowed 2013-05-27 15:03:42 +02:00
Daniel Martí
0861f870a3 More os.path.join() use cases 2013-05-24 23:43:49 +02:00
Daniel Martí
79ec50719d Add Tags and RM support for srclib, don't copy dir 2013-05-24 23:35:56 +02:00
Ciaran Gultnieks
8d85c7c2c3 Be less vague about svn errors 
There can be multiple svn repos in use (e.g. srclibs) so it's helpful
to report the source of a failure.
 2013-05-22 10:18:10 +01:00
Ciaran Gultnieks
d832bf8e9e Better build log formatting for wiki 2013-05-20 21:19:53 +01:00
Daniel Martí
77a7e640ad Forgot to remove a debugging print 2013-05-20 21:57:46 +02:00
Daniel Martí
6808d5d5ed Revert "fix vercodes." 
This (partially) reverts commit 05735e9fca.
 2013-05-20 15:48:55 +02:00
Daniel Martí
05735e9fca build-tools TODO is unnecessary. fix vercodes. 2013-05-20 14:06:18 +02:00
Daniel Martí
9efa52276d Use build/srclib instead of build/extlib 2013-05-20 13:34:03 +02:00
Daniel Martí
eb39d110d0 Externalize srclibs to fdroiddata 2013-05-20 13:16:06 +02:00
Daniel Martí
775e348853 TODO: use new build-tools path 2013-05-17 09:25:27 +02:00
Daniel Martí
d44d3863ee Add "No Source Since:[Version]" field. 
I'll document it once we make sure it works fine.
 2013-05-16 21:45:25 +02:00
David Black
6b749852b5 had forgotten to change error message in srclib when copy/pasting 2013-05-15 17:24:26 +01:00