From owner-freebsd-testing@FreeBSD.ORG Mon Nov 17 21:15:36 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 43BF2535; Mon, 17 Nov 2014 21:15:36 +0000 (UTC) Received: from wonkity.com (wonkity.com [67.158.26.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "wonkity.com", Issuer "wonkity.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id DD3CA7E9; Mon, 17 Nov 2014 21:15:35 +0000 (UTC) Received: from wonkity.com (localhost [127.0.0.1]) by wonkity.com (8.14.9/8.14.9) with ESMTP id sAHLFXig069948 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 17 Nov 2014 14:15:33 -0700 (MST) (envelope-from wblock@wonkity.com) Received: from localhost (wblock@localhost) by wonkity.com (8.14.9/8.14.9/Submit) with ESMTP id sAHLFX3V069945; Mon, 17 Nov 2014 14:15:33 -0700 (MST) (envelope-from wblock@wonkity.com) Date: Mon, 17 Nov 2014 14:15:33 -0700 (MST) From: Warren Block To: Li-Wen Hsu Subject: Re: Documentation testing and textproc/igor In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (BSF 23 2013-08-11) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="3512871622-1326637320-1416258933=:65992" X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (wonkity.com [127.0.0.1]); Mon, 17 Nov 2014 14:15:33 -0700 (MST) Cc: "freebsd-testing@freebsd.org" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2014 21:15:36 -0000 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --3512871622-1326637320-1416258933=:65992 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed On Tue, 18 Nov 2014, Li-Wen Hsu wrote: > The job is created: > > https://jenkins.freebsd.org/jenkins/view/FreeBSD_doc/job/FreeBSD_Doc-igor/ > > Please note that the current version of igor generates malformed xml. > The job currently is using igor with a quick fix: > > https://gist.github.com/lwhsu/7fddad9b4ce674a447d2 > > Maybe we should modify xmlize() to use a perl module that supports xml-output? I'd prefer to avoid dependencies for just that small routine. Also, it seems fairly obvious now that those should be ampersands rather than dollar signs. No idea what I was thinking back then. Anyway, patch attached and included inline: Index: igor =================================================================== --- igor (revision 510) +++ igor (working copy) @@ -387,8 +387,10 @@ sub xmlize { my $txt = shift; - $txt =~ s/'/\$apos;/g; - $txt =~ s/"/\$quot;/g; + $txt =~ s/'/'/g; + $txt =~ s/"/"/g; + $txt =~ s//>/g; return $txt; } --3512871622-1326637320-1416258933=:65992 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=igor-xmlize.diff Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=igor-xmlize.diff SW5kZXg6IGlnb3INCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBpZ29y CShyZXZpc2lvbiA1MTApDQorKysgaWdvcgkod29ya2luZyBjb3B5KQ0KQEAg LTM4Nyw4ICszODcsMTAgQEANCiANCiBzdWIgeG1saXplIHsNCiAJbXkgJHR4 dCA9IHNoaWZ0Ow0KLQkkdHh0ID1+IHMvJy9cJGFwb3M7L2c7DQotCSR0eHQg PX4gcy8iL1wkcXVvdDsvZzsNCisJJHR4dCA9fiBzLycvJmFwb3M7L2c7DQor CSR0eHQgPX4gcy8iLyZxdW90Oy9nOw0KKwkkdHh0ID1+IHMvPC8mbHQ7L2c7 DQorCSR0eHQgPX4gcy8+LyZndDsvZzsNCiAJcmV0dXJuICR0eHQ7DQogfQ0K IA0K --3512871622-1326637320-1416258933=:65992--