From owner-freebsd-mono@freebsd.org Tue Jul 5 19:59:45 2016 Return-Path: Delivered-To: freebsd-mono@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB4AAB711C6 for ; Tue, 5 Jul 2016 19:59:45 +0000 (UTC) (envelope-from russ.haley@gmail.com) Received: from mail-vk0-x235.google.com (mail-vk0-x235.google.com [IPv6:2607:f8b0:400c:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 749571EC6 for ; Tue, 5 Jul 2016 19:59:45 +0000 (UTC) (envelope-from russ.haley@gmail.com) Received: by mail-vk0-x235.google.com with SMTP id v6so9040774vkb.2 for ; Tue, 05 Jul 2016 12:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=gH1I8SZHa4WhwIJWIfR+1LmivtoMwROHgrHjWc64upY=; b=LvIJ6q8DpjxpeYQHU3NK0EWTxhaA5yRqd607gKgFFJBlltDg1UiS/IUrbxL1URqja0 zF7peQ4tr0gXgbELMAc7yE067HJ+gMBpGBQcWk0y/MV0SMKF0P2/udfLL2Kc9Kyy0xfK jSPaRK3zbq3TAC+qmUAGQSb88eEzFY2qkCMMJ5cbjubiHeDd1O3J1YNbR9ftrH7SDc// Va4Vy1/k/PHKyEXiSsW34bQwd4gneP/NEb7uELsNK/2z+KCnqLvoZkDqhUqfj+HTCxM7 uejDE8hLVOihaZDUux/jy7CCVxOKFO+kbNoW9SmYL/xgT+YePVTe4XbLrU1lrPZKPxoz kGFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=gH1I8SZHa4WhwIJWIfR+1LmivtoMwROHgrHjWc64upY=; b=eAPP9Wp2sSkS2uPQahqIHejksJ/IFj4yEAXcdKmaO3QSPgj3uMJjRnbSRMGmvXTPAf Bl6b05urTUwWUkPUvZLFNXE8yH6O7Pr3XZZttnhQp64TS9JW9VMIBfpPDX0gxXWn2sdh 1y9kAo4ppzmihmoboh/fw9Byz9aRu1KWDloEDUEvX7IOtHcUHRIh5OZf0ecORjdGTHUq MYFk/krM35z+XUbt+AW69GqyXbl/1at9xBn8cA7N9Mvvad1wyhpLPZ0/4iDvC4UKqM+K G6u5V+T937+vQ1ZIWCBa6Y7repdyN6oHXF9JILDWtG0NK9dU1YTHA5KULa+c4PYiGZQ3 3JGA== X-Gm-Message-State: ALyK8tI7bIjwTMSF4o6UvGcH1aUX3ZgHBlmJnwmeLeKFlKj5ASm6y81ykCm2yCzGczAsMRX07PfoZpPlGq6UWQ== X-Received: by 10.31.13.82 with SMTP id 79mr8486111vkn.96.1467748784421; Tue, 05 Jul 2016 12:59:44 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.54.196 with HTTP; Tue, 5 Jul 2016 12:59:43 -0700 (PDT) In-Reply-To: <577BF87C.5030907@innolan.dk> References: <20160628094307.bepxy46dp5igizeh@ivaldir.etoilebsd.net> <1526452.AT2qT6pE07@dragon.local> <20160629195854.4698194.67297.7966@gmail.com> <577BCCE9.10504@gmail.com> <577BF87C.5030907@innolan.dk> From: Russell Haley Date: Tue, 5 Jul 2016 12:59:43 -0700 Message-ID: Subject: Re: Maintaining mono/.net To: Carsten Larsen Cc: Ivan Radovanovic , Freebsd-mono , Mathieu Prevot , =?UTF-8?Q?Romain_Tarti=C3=A8re?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: freebsd-mono@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mono and C# applications on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2016 19:59:45 -0000 On Tue, Jul 5, 2016 at 11:12 AM, Carsten Larsen wrote: > ON 05-07-2016 kl. 17:06 Ivan Radovanovic wrote: >> >> >> I had some spare time during weekend so I was playing little bit with >> mono - I cloned mono repository, then branched "freebsd" from their 4.4 >> branch (which is maybe also nice coincidence (freebsd and bsd4.4)), then >> I merged all our changes in that branch - I added Romain's patches to >> eglib, I added my implementation of FS watcher to System.dll, I also >> added test for FS watcher to test cases (so hopefully it will be easier >> to spot errors), I also fixed just couple of warning in C code they have >> in main mono source (there are many warnings there, some look serious to >> me - my plan is to keep reducing their number). >> > > It sounds like a good start. 4.4.0 could be our head (read: master). > >> Instead of changing their Kevent watcher implementation I added this one >> as completely new FS watcher (FreeBSD watcher), and I modified >> mono/metadata/filewatcher.c to always use this watcher when compiled on >> FreeBSD (I don't know about kevent implementation on other BSDs - maybe >> FreeBSD implementation should be used there as well). >> >> All mono tests pass (running gmake check), but those related to profiler >> (they segfault in native code - I am planning to investigate that >> further). >> >> Btw, I am configuring mono with: >> >> ./configure --disable-dtrace --with-checked-build=3Dyes >> >> since if I leave dtrace enabled I get billion linking errors later (I >> will investigate that at certain point as well). >> >> Now, the question is how I push these changes to repository Russ created >> (is that repository we want to use for this project)? I am also not >> familiar enough with git to know if this setup now will work (we were >> talking to have our local repositories to talk to main mono repository >> for reading, and our (fbsd) repository for writing (to keep patches), >> now actual setup is that repository Russ created is forked from mono (I >> don't know if that changes anything)). Maybe somebody can clarify this? >> >> Kind regards, >> Ivan > > > The fork in github.com/FreeBSD-DotNet/mono made by Russ is forked directl= y > from master. Its not really a candidate for merging. > > If you would like to push those changes to github.com/FreeBSD-DotNet/mono > you would first need to make your own user of github. With this user you = can > fork mono again and then clone you own mono repository to you local PC. > Transfer your changes this this local repository and commit at usual. > > Or Russ could make a new fork on github equivalent to: > git clone -b mono-4.4.0-branch https://github.com/mono/mono.git Ivan has just answered alot of this and is now on the freebsd-dotnet team. Here were my thoughts: I think all Ivan needs to do is: git remote set-url origin https://github.com/freebsd-dotnet/mono.git then to verify: git remote -v and then git-commit and git-push Instructions are here: https://help.github.com/articles/changing-a-remote-s-url/#platform-linux However I think that will break things because we are 60 commits behind head and 4 behind the 4.4 branch. I will update the repository tonight. OR Ivan can do a git-diff on the current repository, clone the FreeBSD-dotnet repository and then apply the patch using git-apply https://git-scm.com/docs/git-diff https://git-scm.com/docs/git-apply (old news: I've sent an freebsd-dotnet invitation to the Ivan Radovanovic user just in case.) > Then he could invite you (read: your github user) as a collaborate of thi= s > new repository. You would then be able to push your changes directly to > github.com/FreeBSD-DotNet/mono-dev (or whatever name is chosen). > > It could be a nice experiment but as Romain Tarti=C3=A8re mentioned earli= er in > the thread we are not suppose to break any existing mono ports. I don=E2= =80=99t know > how to validate all the existing ports against a new release (candidate) = but > I assume it would be done using poudriere. A list can be seen at http://www.freshports.org/search.php?stype=3Ddepends_run&method=3Dmatch&que= ry=3Dmono&num=3D10&orderby=3Dcategory&orderbyupdown=3Dasc&search=3DSearch and we can work on the plan to get that going. I suggest we document these ideas in https://github.com/FreeBSD-DotNet/Developer-Wiki/wiki Cheers, Russ