Commit Graph

55 Commits

Author SHA1 Message Date
Simon Schampijer
37568a0a7e bundlebuilder: refactor get_files_git to Packager to avoid code duplication
Follow up patch for b582736375

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Daniel Drake <dsd@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
2011-09-28 11:52:38 +02:00
Simon Schampijer
29a700b34a bundlebuilder: add back build_locale functionality to XOPackager SL #3116
Due to the removal of the manifest support we lost as well
the part of the code that does build the locale. This patch
adds that functionality back.

Signed-off-by: Simon Schampijer <simon@laptop.org>
2011-09-28 11:40:52 +02:00
Simon Schampijer
b582736375 XO_Packager: package files that are in git and the locale folder, OLPC #11217
There had been reports about Activities that had unexpected files in
the xo bundle (e.g. patches). There have been a recent change that the support
for the MANIFEST has been removed from the bundle builder. The MANIFEST
'controlled' which files were bundled. The code did include all the
files present in the folder (which includes patches etc).

The patch does use git-ls to get a list of files to include (like the
tarball packager). Furthermore the locale folder is included which has been
generated. Due to the API freeze we made '_get_files_in_git' a private method
which adds a bit of duplication to the 'get_files' method in the tarball
packager. A patch for master which will implement Builder.get_files_git(),
that can be used by XOPackager and SourcePackager.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-By: Daniel Drake <dsd@laptop.org>
2011-09-19 18:49:54 +02:00
Bernie Innocenti
e7430faac9 Remove incomplete MANIFEST support
This incomplete feature contributes to confuse new activity authors and
slightly complicates our bundle installation logic.

The day someone finds something useful to do with the MANIFEST
specification, we can revert this patch in no time.

Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
Tested-by: Bernie Innocenti <bernie@codewiz.org>
Tested-by: James Cameron <quozl@laptop.org>
Tested-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Sascha Silbe <silbe@activitycentral.com>
[rebased on git master, minor style fix]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
2011-07-24 16:21:38 +00:00
Simon Schampijer
b30bc0151c bundlebuilder: genpot: don't use absolute paths in filenames (SL#2508)
[tweaked description; minor style fix]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Tested-By: Sascha Silbe <silbe@activitycentral.com>
Reviewed-By: Sascha Silbe <silbe@activitycentral.com>
2011-02-12 19:12:43 +00:00
Simon Schampijer
aadfeed305 bundlebuilder: install mimetypes.xml and associated icon #2262
As we do create the ActivityBundle in the config of the bundlebuilder
we can use the code from the activitybundle as well to install
the mime type.

Reviewed-By: Sascha Silbe <sascha-pgp@silbe.org>
2010-11-24 21:39:09 +01:00
Sascha Silbe
1adc165a8c bundlebuilder: ignore incorrect pylint warning
pylint isn't smart enough to figure out the return type of Popen.communicate(),
so squelch the warning.

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:37 +01:00
Sascha Silbe
7acfbd070f style cleanup: prefer ' for strings
Tomeu prefers ' for strings, so let's use it wherever we don't have a good
reason to use ".

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:34 +01:00
Sascha Silbe
5f13fcfc84 style cleanup: use """ everywhere
Most of the code uses """, so adjust the few deviations.

Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:34 +01:00
Sascha Silbe
73de340d27 PEP8 cleanup: fix spaces around keyword parameters
Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:33 +01:00
Sascha Silbe
60707443ea PEP8 cleanup: fix whitespace around operator
Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
CC: Aleksey Lim <alsroot@member.fsf.org>
2010-11-23 17:14:33 +01:00
Simon Schampijer
c7a80a1e56 Add new numbering scheme #2425
- add class NormalizedVersion to parse and compare the new activity versions
- change the bundlebuilder and activitybundle to use the new scheme, instead
of an int version we expect a string that matches the format defined in
NormalizedVersion
2010-11-09 10:53:05 +01:00
Simon Schampijer
3aa0995096 Bundelbuilder should not use localized activity name #1968 (Walter Bender)
The localized activity name is only used for
user-facing strings. The .xo and .tar files are
left in the original name.
2010-06-03 08:56:42 +02:00
Sascha Silbe
c9e63eb8ea PEP8 white space and long line fixes 2009-08-25 21:12:40 +02:00
Sascha Silbe
ecdaf6b795 trim EOL (end-of-line) spaces on source files 2009-08-25 19:55:48 +02:00
Simon Schampijer
1d15b7f874 Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline 2009-03-30 09:51:21 +02:00
Simon Schampijer
a7daf73fae Bundlebuilder list_files: Better error handling #635
Don't fail on trailing slash of the directory name
2009-03-30 09:49:59 +02:00
Sayamindu Dasgupta
366b07e73a Use git ls-files instead of git-ls-files, to work with newer Git. d.sl.o #647 2009-03-26 23:45:39 +05:30
Simon Schampijer
720401606d Bundlebuilder: Don't include whole directory in src tarball
regression introduced by #397
2009-03-24 17:11:56 +01:00
Tomeu Vizoso
c4dce659a4 Use Popen.communicate() to avoid hang (Sascha Silbe) #397 2009-03-12 15:43:04 +01:00
Simon Schampijer
6f210f0e33 Process .py files in subdirectories './setup genplot' #391 (alsroot) 2009-02-27 12:46:45 +01:00
Marco Pesenti Gritti
b58182a970 Mark modules as STABLE/UNSTABLE/DEPRECATED. 2008-10-28 14:19:01 +01:00
Marco Pesenti Gritti
9c74f4eec7 Drop broken release command. A more generic release tools
is being developed in sugar-tools now.
2008-10-26 01:15:20 +02:00
Simon Schampijer
1af96495d2 bundlebuilder: remove an existing locale dir before building 2008-09-13 12:02:22 +02:00
Simon Schampijer
199a91ff87 don't build the locale for the pseudo.po 2008-09-12 13:15:49 +02:00
Simon Schampijer
e721f74f63 Ignore pseudo.po for the manifest 2008-09-11 10:49:54 +02:00
Simon Schampijer
1d29440bfd bundlebuilder: fix the release command 2008-09-09 17:41:42 +02:00
Simon Schampijer
9041e4db0e Fix pylint for bundlebuilder 2008-08-31 21:35:37 +02:00
Simon Schampijer
e7a10be1d4 Do a more "standard" system installation for bundlebuilder
- setup.py install takes a --prefix option and no arguments.
- mo files are installed in /usr/share/locale.
- po files are not installed
- 8136 (marco)
2008-08-31 21:33:39 +02:00
Simon Schampijer
f29b67b032 Add update functionality to Config in bundlebuilder #7270 (marco)
This is needed by the release command to update the
bundle number
2008-08-22 15:16:30 +02:00
Marco Pesenti Gritti
f55e531f42 Warn about files missing from the MANIFEST. 2008-08-22 15:04:36 +02:00
Simon Schampijer
e1bd64439c Add git tagging to the 'setup.py release' command
added as well better error handling
2008-08-01 11:36:51 +02:00
chema
756b9309e8 7205: bundlebuilder accepts old "dist" cmd, checks for po dir 2008-07-19 15:54:54 +02:00
Eben Eliason
3e86ce8b89 Fix undefined bundle_top_dir reference 2008-06-13 16:29:51 -04:00
Marco Pesenti Gritti
3f4a809b80 Generate the MANIFEST automatically if it doesn't exit. I'm
not sure if we want to keep doing that, but it's necessary at
the moment to keep stuff working.
2008-06-13 17:41:16 +02:00
Marco Pesenti Gritti
cfdc17d6c9 Patch by Jameson Chema Quinn.
Readability cleanups and little fixes by me.

use MANIFEST. Deprecate bundle_name. fix_manifest().
bundlebuilder.config() cleanup.
2008-06-13 12:37:45 +02:00
Marco Pesenti Gritti
285509c8c9 Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit 2008-06-05 13:39:04 +02:00
Marco Pesenti Gritti
7302690aa1 Actually compress the source tarball. 2008-06-05 13:38:38 +02:00
Simon Schampijer
cc7ce17eb7 Fix the setup.py dev 2008-06-04 22:26:40 +02:00
Marco Pesenti Gritti
73dc65b259 Style nitpicks. 2008-05-27 21:09:16 +02:00
Marco Pesenti Gritti
c4bb55c84d Several bugfixes and cleanups 2008-05-26 01:25:28 +02:00
Marco Pesenti Gritti
bedb64a982 Change the logic for file inclusion. We include everything
by default except generated dirs (and well known files like
.gitignore). I'm planning to add support for generated dirs
using make, which will hopefully take care of the rest.
2008-05-26 00:24:31 +02:00
Marco Pesenti Gritti
3b1e1aa4ed Some fixes. Do not use get_files_list to generate the .pot, just enumerate python files. 2008-05-25 23:02:22 +02:00
Marco Pesenti Gritti
96c0b34514 Abstract Packager class which takes care of listing the files. 2008-05-25 22:53:46 +02:00
Marco Pesenti Gritti
95b7098120 Split the packaging code out to XOPackager 2008-05-25 22:47:34 +02:00
Marco Pesenti Gritti
d06bf05287 Split the build out from the command to a Builder object. 2008-05-25 22:36:56 +02:00
Marco Pesenti Gritti
ea18782bea Separate helpers from the commands. 2008-05-25 21:52:31 +02:00
Marco Pesenti Gritti
211c5ae1c4 Move genl10n inside the build step. 2008-05-25 21:51:14 +02:00
Marco Pesenti Gritti
3313d78429 Simplify install a bit, remove uninstall. 2008-05-25 21:47:32 +02:00
Marco Pesenti Gritti
9eaa51edbb Drop the useless clean command. 2008-05-25 21:33:52 +02:00