From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32500 invoked by alias); 25 Feb 2015 15:48:00 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 32490 invoked by uid 89); 25 Feb 2015 15:47:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: smtp.eu.adacore.com Received: from mel.act-europe.fr (HELO smtp.eu.adacore.com) (194.98.77.210) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 25 Feb 2015 15:47:58 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 418512CE6A2F; Wed, 25 Feb 2015 16:47:54 +0100 (CET) Received: from smtp.eu.adacore.com ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CP3Y1NgRXApr; Wed, 25 Feb 2015 16:47:54 +0100 (CET) Received: from chelles.act-europe.fr (chelles.act-europe.fr [10.10.0.160]) by smtp.eu.adacore.com (Postfix) with ESMTP id 303FA2CE6962; Wed, 25 Feb 2015 16:47:54 +0100 (CET) Received: by chelles.act-europe.fr (Postfix, from userid 525) id 0480E1EA55AA; Wed, 25 Feb 2015 16:47:54 +0100 (CET) Date: Wed, 25 Feb 2015 15:50:00 -0000 From: Arnaud Charlet To: Joseph Myers Cc: Tom de Vries , gcc-patches@gcc.gnu.org Subject: Re: [Ada] convert GNAT doc to sphinx Message-ID: <20150225154753.GA26463@adacore.com> References: <20150220091720.GA16093@adacore.com> <54E9F787.4010704@mentor.com> <20150222180433.GB3798@adacore.com> <20150225111348.GB20964@adacore.com> <20150225112747.GC20964@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2015-02/txt/msg01508.txt.bz2 > > I've added a -I gcc/gcc/ada/doc/gnat_ugn there, that's as far as my > > knowledge goes for this script so I hope this is enough. > > Well, since by default the find command deletes all files except those > known to be documentation sources, you need at least to change it not to > delete those particular files (and the actual RST sources of these > manuals). OK, I've applied the patch below, hopefully it should do the job. > > I can help in transitioning the script to sphinx though, that would seem > > more interesting/productive at this stage. > > See the existing code to handle Sphinx documentation for the JIT. That's a good reference. We'll need a more recent version of sphinx than 1.0 though (at least 1.2.2, or even better, 1.3b2 which is the version we use at AdaCore). Arno -- --- update_web_docs_svn (revision 220961) +++ update_web_docs_svn (working copy) @@ -107,10 +107,8 @@ svn -q export $SVNROOT/tags/$RELEASE gcc fi -# Remove all unwanted files. This is needed (a) to build the Ada -# generator programs with the installed library, not the new one and -# (b) to avoid packaging all the sources instead of only documentation -# sources. +# Remove all unwanted files. This is needed to avoid packaging all the +# sources instead of only documentation sources. # Note that we have to preserve gcc/jit/docs since the jit docs are # not .texi files (Makefile, .rst and .png), and the jit docs use # include directives to pull in content from jit/jit-common.h and @@ -120,6 +118,7 @@ -o -path gcc/gcc/doc/include/texinfo.tex \ -o -path gcc/gcc/BASE-VER \ -o -path gcc/gcc/DEV-PHASE \ + -o -path "gcc/gcc/ada/doc/gnat_ugn/*.png" \ -o -path "gcc/gcc/jit/docs/*" \ -o -path "gcc/gcc/jit/jit-common.h" \ -o -path "gcc/gcc/jit/notes.txt" \