From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?QmrDtnJuIEjDtmZsaW5n?= Subject: guix-video repository, final 2 weeks of Outreachy intern Date: Tue, 19 Feb 2019 09:58:21 +0100 Message-ID: <20190219095821.40927213@alma-ubu> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/+FMwVfQYd9kRFPrlJE9NvRp"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:57325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gw1EQ-0007j6-GO for guix-devel@gnu.org; Tue, 19 Feb 2019 03:58:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gw1EO-0002mu-PH for guix-devel@gnu.org; Tue, 19 Feb 2019 03:58:26 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel , Laura Lazzati --Sig_/+FMwVfQYd9kRFPrlJE9NvRp Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Laura, I'm pulling this again on guix-devel. We have only two weeks left in this Outreachy round and G=C3=A1bor and I decided to focus on two things: 1) Get the videos-repository filled up with the general tools and Makefiles from your private repository. 2) Get as much as possible video-templates in, even if they are only 80% polished. [3) Get the blog-post online.] How does that sound to you? For everybody: The guix-video repository is now created: git clone https://git.savannah.gnu.org/git/guix/videos.git Though it is yet empty :-) Concerning the repository: 0) I would prefer to have a linar history on master that is more or less clean. What you could do is add the general scripts to the 'master', then create for each video a branch as G=C3=A1bor suggested. I would NOT MERGE them, but REBASE: If something on master changes, you would rebase the video-branch on master (and force-push to the repository). If that branch is more-or-less settled, you can finally do an interactive rebase: 'git rebase -i master' if any commits can be melted or cleaned up. Finally you can rebase master to that video-branch and have a nice linear history. Rebase the other video-branches to your new master. As the development of the "general" part and the "video-specific" part are in separate directories, there shouldn't be any merge conflicts. 1) In the end, in this guix-video repository there should be both the general framework things (i.e. the Makefile, the script tool, the general README, and maybe some other things). These should be generally usable, nothing video-specific should be there. Then there should be for each video a sub-directory, something like this: /videos/01-installation-from-script /videos/02-daily-use-part1 /videos/02-daily-use-part2 ... 2) Currently, I see that you adapt the Makefile for each video (taking the wip-dailyUse branch as an example). There you define the variables for the video in the Makefile: ########################## VARIABLES ### LOCALE_LANG=3Den_US NUMBER=3D TARGET=3DvideoNoCli SESSION=3D SOUNDNAME=3D SLIDES=3D As Ricardo pointed out around FOSDEM, it really would be better to have the Makefile generic and then in each video's directory a script that would set the variables and execute it. For example: videos/02-dailyuse-part1/make-en.sh make -f ../Makefile LOCALE_LANG=3Den_US Target=3DvideoNonCli ... Would that make sense? Is this possible with little effort and few time lef= t? What help do you need, for example with the scripts/Makefiles? Bj=C3=B6rn --Sig_/+FMwVfQYd9kRFPrlJE9NvRp Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXGvFLQAKCRC/KGy2WT5f /cLxAJ42AExZo0yIkTOl/8XLKw++QmYzRQCeMBvayx+BiFwm96By0Dt7ND7LB70= =0mIy -----END PGP SIGNATURE----- --Sig_/+FMwVfQYd9kRFPrlJE9NvRp--