Re: [Sugar-devel] sugar-build after osbuild change report
On 05/20/2013 07:43 PM, Simon Schampijer wrote: On 05/20/2013 05:52 PM, Daniel Narvaez wrote: On 20 May 2013 12:48, Daniel Narvaez dwnarv...@gmail.com wrote: Ok, great. Would be fantastic if '--help' would print the list of possible arguments. I'd like to avoid maintaining the docs in two places :) Though perhaps using docker we can figure out something to have both --help and the docs be generated from the same source. I have made it print out the list of commands only (no descriptions) for now, with a link to the docs. Thanks Daniel! [sugar-build sugar-build]$ ./osbuild --help Don't run osbuild inside a sugar-build shell, you can just run the commands directly. [sugar-build sugar-build]$ exit [erikos@t61 sugar-build]$ ./osbuild --help = Setup osbuild = * Create the python virtualenv * Install python packages = Available commands = shell run check-config docs clean check build bug-report check-system pull See also http://developer.sugarlabs.org/build.md.html [erikos@t61 sugar-build]$ Pulling today I got: [erikos@t61 sugar-build]$ ./osbuild pull = Updating build system = * Pulling sugar-build Already up-to-date. = Pulling = * Pulling automake * Pulling glib * Pulling gobject-introspection * Pulling pygobject * Pulling dbus-python * Pulling libsoup * Pulling webkitgtk Command failed, tail of /home/erikos/sugar-build/build/logs/pull-0.log Already up-to-date. From git://github.com/dnarvaez/webkitgtk 23a61f3..562e907 master - origin/master error: Your local changes to the following files would be overwritten by merge: GNUmakefile.in aclocal.m4 configure Please, commit your changes or stash them before you can merge. Aborting Updating 23a61f3..562e907 I did not have made any changes in webkitgtk, I did a git reset --hard origin in the webkitgtk directory and now things work. Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 21 May 2013 10:15, Simon Schampijer si...@schampijer.de wrote: Pulling today I got: [erikos@t61 sugar-build]$ ./osbuild pull = Updating build system = * Pulling sugar-build Already up-to-date. = Pulling = * Pulling automake * Pulling glib * Pulling gobject-introspection * Pulling pygobject * Pulling dbus-python * Pulling libsoup * Pulling webkitgtk Command failed, tail of /home/erikos/sugar-build/**build/logs/pull-0.log Already up-to-date. From git://github.com/dnarvaez/**webkitgtkhttp://github.com/dnarvaez/webkitgtk 23a61f3..562e907 master - origin/master error: Your local changes to the following files would be overwritten by merge: GNUmakefile.in aclocal.m4 configure Please, commit your changes or stash them before you can merge. Aborting Updating 23a61f3..562e907 I did not have made any changes in webkitgtk, I did a git reset --hard origin in the webkitgtk directory and now things work. Yeah, that one is hard to fix... I tried to stash changes but that triggers other issues. The easiest approach is probably to fix webkigtk to not regenerate those files, but I haven't yet figured out how/when they are written. I couldn't even reproduce it anymore here after I added a .gitignore. So, I'll try to fix this up but until then people should git reset --hard origin (hopefully I'm not going to update webkitgtk again before I solve it, so it should only be needed one time). ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 20 May 2013 10:12, Simon Schampijer si...@schampijer.de wrote: Hi, I had a sugar-build repo before the osbuild change. I did a git pull in my sugar-build directory and then run ./osbuild help. I got the following: [erikos@t61 sugar-build]$ ./osbuild --help Installing virtualenv... Done. /home/erikos/sugar-build/**build/out/sandbox/install/bin/**python: can't open file '/home/erikos/sugar-build/**build/commands/--help': [Errno 2] No such file or directory [erikos@t61 sugar-build]$ Looks like a bug, will fix. [sugar-build sugar-build]$ ./osbuild pull Note that you are inside a shell here. You should just pull. (I wonder if the docs are wrong now). That *might* actually break things so we should probably check and refuse to run osbuild inside a shell. Now, the sources are directly pulled into the sugar-build directory, is that intentional? Yes, I think the flatter directory structure makes it a little bit easier to hack on stuff. Reading the docs [1] it says to run a ./osbuild build, let's do then: [sugar-build sugar-build]$ ./osbuild build = Clean = * Emptying install directory * Cleaning automake * Cleaning glib * Cleaning gobject-introspection * Cleaning pygobject * Cleaning dbus-python * Cleaning libsoup * Cleaning webkitgtk * Cleaning gwebsockets * Cleaning node * Cleaning grunt-cli * Cleaning volo * Cleaning karma * Cleaning jshint * Cleaning docker * Cleaning json-format * Cleaning flake8 * Cleaning sugar-docs * Cleaning sugar-toolkit-gtk3 * Cleaning sugar * Cleaning sugar-artwork * Cleaning sugar-datastore * Cleaning gst-plugins-espeak * Cleaning sugar-runner * Cleaning sugar-html-datastore * Cleaning sugar-html-template * Cleaning sugar-html-bus * Cleaning sugar-html-activity * Cleaning sugar-html-graphics * Cleaning browse * Cleaning chat * Cleaning read * Cleaning log * Cleaning terminal * Cleaning pippy * Cleaning imageviewer * Cleaning jukebox * Deleting state = Pulling = * Pulling libsoup * Pulling webkitgtk * Pulling gwebsockets * Pulling node * Pulling grunt-cli * Pulling volo * Pulling karma * Pulling jshint * Pulling docker * Pulling json-format * Pulling flake8 * Pulling sugar-docs * Pulling sugar-toolkit-gtk3 * Pulling sugar Oh, no it cleans my copy of webkitgtk...? :/ If you pulled latest sugar-build you will have to rebuild webkitgtk anyway I'm afraid, because of the various changes I made. I've seen it doing a clean before a build. I need to find a way to reproduce. I have the impression it only happens if the build is actually clean already though (which might have been your case because the build directory has been moved in recent sugar-build), so at least it shouldn't hurt for real. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 20 May 2013 10:48, Daniel Narvaez dwnarv...@gmail.com wrote: On 20 May 2013 10:12, Simon Schampijer si...@schampijer.de wrote: Hi, I had a sugar-build repo before the osbuild change. I did a git pull in my sugar-build directory and then run ./osbuild help. I got the following: [erikos@t61 sugar-build]$ ./osbuild --help Installing virtualenv... Done. /home/erikos/sugar-build/**build/out/sandbox/install/bin/**python: can't open file '/home/erikos/sugar-build/**build/commands/--help': [Errno 2] No such file or directory [erikos@t61 sugar-build]$ Looks like a bug, will fix. I made it print a link to the docs (still temporary until developer.sugarlabs.org is up) whenever you pass something which is not a command. I'd rather not maintain two lists of available commands. [sugar-build sugar-build]$ ./osbuild pull Note that you are inside a shell here. You should just pull. (I wonder if the docs are wrong now). That *might* actually break things so we should probably check and refuse to run osbuild inside a shell. I made it complain. Also the docs looks fine in this respect to me but if you find any place where it suggest to run osbuild inside a shell let me know. [sugar-build sugar-build]$ ./osbuild build = Clean = * Emptying install directory * Cleaning automake * Cleaning glib * Cleaning gobject-introspection * Cleaning pygobject * Cleaning dbus-python * Cleaning libsoup * Cleaning webkitgtk * Cleaning gwebsockets * Cleaning node * Cleaning grunt-cli * Cleaning volo * Cleaning karma * Cleaning jshint * Cleaning docker * Cleaning json-format * Cleaning flake8 * Cleaning sugar-docs * Cleaning sugar-toolkit-gtk3 * Cleaning sugar * Cleaning sugar-artwork * Cleaning sugar-datastore * Cleaning gst-plugins-espeak * Cleaning sugar-runner * Cleaning sugar-html-datastore * Cleaning sugar-html-template * Cleaning sugar-html-bus * Cleaning sugar-html-activity * Cleaning sugar-html-graphics * Cleaning browse * Cleaning chat * Cleaning read * Cleaning log * Cleaning terminal * Cleaning pippy * Cleaning imageviewer * Cleaning jukebox * Deleting state = Pulling = * Pulling libsoup * Pulling webkitgtk * Pulling gwebsockets * Pulling node * Pulling grunt-cli * Pulling volo * Pulling karma * Pulling jshint * Pulling docker * Pulling json-format * Pulling flake8 * Pulling sugar-docs * Pulling sugar-toolkit-gtk3 * Pulling sugar Oh, no it cleans my copy of webkitgtk...? :/ If you pulled latest sugar-build you will have to rebuild webkitgtk anyway I'm afraid, because of the various changes I made. I've seen it doing a clean before a build. I need to find a way to reproduce. I have the impression it only happens if the build is actually clean already though (which might have been your case because the build directory has been moved in recent sugar-build), so at least it shouldn't hurt for real. So, we have a mechanism to trigger a full build, by cleaning everything before, when there has been changes that made it necessary. In your case I'd say that mechanism has been triggered correctly, even if not quite intentionally! Though this mechanism was also incorrectly triggered by a clean; build. In that case we would clean two times, it wouldn't really change anything but it would be confusing. So I fixed that case now. Thanks for the great bug report! ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 05/20/2013 10:48 AM, Daniel Narvaez wrote: On 20 May 2013 10:12, Simon Schampijer si...@schampijer.de wrote: Hi, I had a sugar-build repo before the osbuild change. I did a git pull in my sugar-build directory and then run ./osbuild help. I got the following: [erikos@t61 sugar-build]$ ./osbuild --help Installing virtualenv... Done. How about we print here something like: You are in a shell now, run commands like 'build' or 'run' here directly. /home/erikos/sugar-build/**build/out/sandbox/install/bin/**python: can't open file '/home/erikos/sugar-build/**build/commands/--help': [Errno 2] No such file or directory [erikos@t61 sugar-build]$ Looks like a bug, will fix. Ok, great. Would be fantastic if '--help' would print the list of possible arguments. [sugar-build sugar-build]$ ./osbuild pull Note that you are inside a shell here. You should just pull. (I wonder if the docs are wrong now). That *might* actually break things so we should probably check and refuse to run osbuild inside a shell. Now, the sources are directly pulled into the sugar-build directory, is that intentional? Yes, I think the flatter directory structure makes it a little bit easier to hack on stuff. Hmm, I liked the layout with the sources directory. Now the sources are mixed with the 'build' directory. Do you build now in the source directories? Reading the docs [1] it says to run a ./osbuild build, let's do then: [sugar-build sugar-build]$ ./osbuild build = Clean = * Emptying install directory * Cleaning automake * Cleaning glib * Cleaning gobject-introspection * Cleaning pygobject * Cleaning dbus-python * Cleaning libsoup * Cleaning webkitgtk * Cleaning gwebsockets * Cleaning node * Cleaning grunt-cli * Cleaning volo * Cleaning karma * Cleaning jshint * Cleaning docker * Cleaning json-format * Cleaning flake8 * Cleaning sugar-docs * Cleaning sugar-toolkit-gtk3 * Cleaning sugar * Cleaning sugar-artwork * Cleaning sugar-datastore * Cleaning gst-plugins-espeak * Cleaning sugar-runner * Cleaning sugar-html-datastore * Cleaning sugar-html-template * Cleaning sugar-html-bus * Cleaning sugar-html-activity * Cleaning sugar-html-graphics * Cleaning browse * Cleaning chat * Cleaning read * Cleaning log * Cleaning terminal * Cleaning pippy * Cleaning imageviewer * Cleaning jukebox * Deleting state = Pulling = * Pulling libsoup * Pulling webkitgtk * Pulling gwebsockets * Pulling node * Pulling grunt-cli * Pulling volo * Pulling karma * Pulling jshint * Pulling docker * Pulling json-format * Pulling flake8 * Pulling sugar-docs * Pulling sugar-toolkit-gtk3 * Pulling sugar Oh, no it cleans my copy of webkitgtk...? :/ If you pulled latest sugar-build you will have to rebuild webkitgtk anyway I'm afraid, because of the various changes I made. I've seen it doing a clean before a build. I need to find a way to reproduce. I have the impression it only happens if the build is actually clean already though (which might have been your case because the build directory has been moved in recent sugar-build), so at least it shouldn't hurt for real. Ok, rebuilding from scratch now. Simon ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 20 May 2013 12:17, Simon Schampijer si...@schampijer.de wrote: How about we print here something like: You are in a shell now, run commands like 'build' or 'run' here directly. Yeah, that's more or less what I've done. /home/erikos/sugar-build/build/out/sandbox/install/bin/python: can't open file '/home/erikos/sugar-build/build/commands/--help': [Errno 2] No such file or directory [erikos@t61 sugar-build]$ Looks like a bug, will fix. Ok, great. Would be fantastic if '--help' would print the list of possible arguments. I'd like to avoid maintaining the docs in two places :) Though perhaps using docker we can figure out something to have both --help and the docs be generated from the same source. Hmm, I liked the layout with the sources directory. Now the sources are mixed with the 'build' directory. Why does that bother you? :) I mean there is just a single build directory there and everything else is source. Which is the opposite of before, with a source dir and everything else being build script. I'd argue the main focus should be on the source so it make sense to have that at the toplevel :) Do you build now in the source directories? Yes. And I git stash the changes after having git add --all, so we don't lose the changes on git clean -fdx. Should probably document the stashing because if people don't know about it, they will assume the changes are lost. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
2013/5/20 Daniel Narvaez dwnarv...@gmail.com: On 20 May 2013 12:17, Simon Schampijer si...@schampijer.de wrote: How about we print here something like: You are in a shell now, run commands like 'build' or 'run' here directly. Yeah, that's more or less what I've done. /home/erikos/sugar-build/**build/out/sandbox/install/bin/**python: can't open file '/home/erikos/sugar-build/**build/commands/--help': [Errno 2] No such file or directory [erikos@t61 sugar-build]$ Looks like a bug, will fix. Ok, great. Would be fantastic if '--help' would print the list of possible arguments. I'd like to avoid maintaining the docs in two places :) Though perhaps using docker we can figure out something to have both --help and the docs be generated from the same source. Hmm, I liked the layout with the sources directory. Now the sources are mixed with the 'build' directory. Why does that bother you? :) I mean there is just a single build directory there and everything else is source. Which is the opposite of before, with a source dir and everything else being build script. I'd argue the main focus should be on the source so it make sense to have that at the toplevel :) Ah, that confused me too because I pulled sugar-build instead of doing a new clone, and now my directories are mixed. So looks like I can now remove source/ logs/ and install/ Do you build now in the source directories? Yes. And I git stash the changes after having git add --all, so we don't lose the changes on git clean -fdx. Should probably document the stashing because if people don't know about it, they will assume the changes are lost. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel -- .. manuq .. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 20 May 2013 13:55, Manuel Quiñones ma...@laptop.org wrote: Why does that bother you? :) I mean there is just a single build directory there and everything else is source. Which is the opposite of before, with a source dir and everything else being build script. I'd argue the main focus should be on the source so it make sense to have that at the toplevel :) Ah, that confused me too because I pulled sugar-build instead of doing a new clone, and now my directories are mixed. So looks like I can now remove source/ logs/ and install/ Yeah, I'm sure it gets messy on a non-clean clone. I'm interested in everyone opinion of the new directory structure on a clean clone though. If people prefers a source/ dir we can easily change that. It's just that it's going to require a full pull/build for everyone again... so I will try to be a more bit careful this time :) ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 20 May 2013 12:48, Daniel Narvaez dwnarv...@gmail.com wrote: Ok, great. Would be fantastic if '--help' would print the list of possible arguments. I'd like to avoid maintaining the docs in two places :) Though perhaps using docker we can figure out something to have both --help and the docs be generated from the same source. I have made it print out the list of commands only (no descriptions) for now, with a link to the docs. ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] sugar-build after osbuild change report
On 05/20/2013 05:52 PM, Daniel Narvaez wrote: On 20 May 2013 12:48, Daniel Narvaez dwnarv...@gmail.com wrote: Ok, great. Would be fantastic if '--help' would print the list of possible arguments. I'd like to avoid maintaining the docs in two places :) Though perhaps using docker we can figure out something to have both --help and the docs be generated from the same source. I have made it print out the list of commands only (no descriptions) for now, with a link to the docs. Thanks Daniel! [sugar-build sugar-build]$ ./osbuild --help Don't run osbuild inside a sugar-build shell, you can just run the commands directly. [sugar-build sugar-build]$ exit [erikos@t61 sugar-build]$ ./osbuild --help = Setup osbuild = * Create the python virtualenv * Install python packages = Available commands = shell run check-config docs clean check build bug-report check-system pull See also http://developer.sugarlabs.org/build.md.html [erikos@t61 sugar-build]$ ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
