From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JBI89-00011q-Kk for garchives@archives.gentoo.org; Sat, 05 Jan 2008 23:08:42 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.14.2/8.14.0) with SMTP id m05N6XwG028182; Sat, 5 Jan 2008 23:06:33 GMT Received: from smtp10.ihug.co.nz (smtp10.ihug.co.nz [203.109.136.110]) by robin.gentoo.org (8.14.2/8.14.0) with ESMTP id m05N6V4k028120 for ; Sat, 5 Jan 2008 23:06:32 GMT Received: from cust.filter1.content.ihug.net.nz (smtp.mailfilter1.ihug.co.nz) [10.80.50.1] by smtp10.ihug.co.nz with esmtp (Exim 4.60 #1 (Debian); Ihug conf #216) id 1JBI62-00020Z-6d; Sun, 06 Jan 2008 12:06:30 +1300 Ironport-Content-Filter: send-to-smtp Received: from 203-173-169-221.dsl.dyn.ihug.co.nz (HELO [10.1.1.3]) ([203.173.169.221]) by smtp.mailfilter1.ihug.co.nz with ESMTP; 06 Jan 2008 12:06:19 +1300 Message-ID: <47800D74.3070107@gentoo.org> Date: Sun, 06 Jan 2008 12:06:28 +1300 From: Alistair Bush User-Agent: Thunderbird 2.0.0.9 (X11/20071118) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-java@gentoo.org MIME-Version: 1.0 To: gentoo-java@lists.gentoo.org Subject: Re: [gentoo-java] javatoolkit: new project layout References: <477F7510.7020505@gentoo.org> <477F7AAB.5010105@gentoo.org> <477FFAA5.9020003@gentoo.org> In-Reply-To: <477FFAA5.9020003@gentoo.org> X-Enigmail-Version: 0.95.5 Content-Type: multipart/mixed; boundary="------------070308000500080600090606" X-Archives-Salt: c05011af-1d7f-469e-a631-dcc228f00b1c X-Archives-Hash: 1e97604d4e12be1b27541eb983ae068b This is a multi-part message in MIME format. --------------070308000500080600090606 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Please find attached a patch to java-ant-2.eclass to support the moving of xml-rewrite-3.py, obviously we will figure out exactly where we are moving it too before I apply this. --------------070308000500080600090606 Content-Type: text/plain; name="xml-rewriter-3-move.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xml-rewriter-3-move.patch" --- java-ant-2.eclass.orig 2008-01-03 16:31:16.000000000 +1300 +++ java-ant-2.eclass 2008-01-06 12:03:41.000000000 +1300 @@ -261,6 +261,10 @@ # for javadoc target and all in one pass, we need the new rewriter. local rewriter3="/usr/share/javatoolkit/xml-rewrite-3.py" if [[ ! -f ${rewriter3} ]]; then + rewriter3="/usr/bin/xml-rewrite-3.py" + fi + + if [[ ! -f ${rewriter3} ]]; then debug-print "Using second generation rewriter" eval echo "Rewriting source attributes" ${output} eval xml-rewrite-2.py ${files} \ --------------070308000500080600090606-- -- gentoo-java@gentoo.org mailing list