From patchwork Fri Mar 6 13:47:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184286 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7442552ile; Fri, 6 Mar 2020 05:49:00 -0800 (PST) X-Google-Smtp-Source: ADFU+vs4fIbOWdYEDiUsUgNBNsYUi0FRAse3JnccDtUBqih8YM3yckJyfskuS/rgA6o8W0aHfZ+j X-Received: by 2002:ac8:7499:: with SMTP id v25mr3068031qtq.237.1583502540000; Fri, 06 Mar 2020 05:49:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583502539; cv=none; d=google.com; s=arc-20160816; b=sax1y9PbnpA98ivUrRzBS1uKSVSc5yyG4GKGTt24FpHrVK4OMT5pgtK8F6UCokTYYE eu63CuBxOnd3UFvbUvczmCGIRMiAvoyRJLACeDgBn915g4Cvx98TM7YbKKt1PYltuWxD f2vcBzzy69z8QLshwI+JwHSJeQYBxd4CsTLVR7up32LBb/TNFvTpTwxaq9VLCOwc5232 y4VOJk0LQzb0Wv7srgMvPy7mX6TM6svqSjJlo2Kn8PD8+BmYPqoY7My2iV29ceA9Q4KS o27GXRXKfyB0CjcGIRqdEpNqaqAjiEoUQRQCJlsZ270Ue/X/biEBQBUqFleWoud7wmiM CvJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature; bh=9APHutZwb9zVRiISdPohQJLOrLAAYOlxX+PkYB+fNls=; b=hGZmz1W3/l5rAyQk0y8A3d7WYjS5Ja1L1J1e90sxKkZKfQQ0Y4Nqv8DOQXHlaJmEcI InrsSDDehwLn5cS9rh2JgfrMULZJoa+CH/z4HSf2P2lT5VlMcGEY4gq4E+vb9Lgmn395 ecle+4reqhtXaMWHTTTRQMeCY+YomM6cajJMp8zaaEpJw1kmcKsLhRkdzdstGfJjBImT 5/AZBa5y+NQOCFj0fZsMBHJqugHNrn5YYa5+zPIyZA3Co8YEFH+Eed7d1VK6OTu5gELF 5VtmSujM0f/SUnk0t78uGouf8n8cSytOEiOKxfVoRQWrFhe73fk/8FOaql1tGdlEx7Hk Roiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F0l6SAcW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o24si1321029qki.330.2020.03.06.05.48.59 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 05:48:59 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F0l6SAcW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jADLX-00038F-J7 for patch@linaro.org; Fri, 06 Mar 2020 08:48:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51874) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jADKY-0002GX-RJ for qemu-devel@nongnu.org; Fri, 06 Mar 2020 08:47:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jADKX-0002Fk-3u for qemu-devel@nongnu.org; Fri, 06 Mar 2020 08:47:58 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:34873) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jADKW-000295-Pg for qemu-devel@nongnu.org; Fri, 06 Mar 2020 08:47:57 -0500 Received: by mail-wm1-x336.google.com with SMTP id m3so2454200wmi.0 for ; Fri, 06 Mar 2020 05:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9APHutZwb9zVRiISdPohQJLOrLAAYOlxX+PkYB+fNls=; b=F0l6SAcWk/LOrgxm8iCf7IjgnrAXYq4QnFuNXnb7HDdLlDZGnjGUklj+w0jKk4SGkZ RXMDSZVKBZAElVp8oDoBLDAfKrf/bCD/J+jqU0WK1wb4qXcuv5bXx/fcEnQbIFanyxsV OU7x5xJBeuBNJexh+/EdKG1O6qU1CDT49AUDvoVbBoKV0JfYo5bF0eyJjsgQLrkjn4Ut eSr6QxM8uIDV1BBcZUFz8ipnFPL8xxi7GiII/js26YWIwDWxB6WTv2ZQ9e4VNXMqNELB agjkxm4p+mi/R4372L/GL+MDk/sqDcBYEpRYcRXykNcnR/z64woWiaUyPe9NHhGcaE0i +uFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9APHutZwb9zVRiISdPohQJLOrLAAYOlxX+PkYB+fNls=; b=um39n5z1UU/G41AK+En/QFFebVL3ysNMFmVEpRREQEUE5DEb4lX7WpoGXTFxZA2Wbf OuwZ5K6dDYrDEycVaCfWofFDtuUmUfZGr+nzqmWxnju0bBIvmeebZXtU4YOmyuS9sOd/ 0X4+q+qQI0G6n13axJAVHyr6WIfo6YVJeTOdeTSmdZHJ1Dhc9Xg7ChFBNk8XSOWlarda 07gM4DItf0jWrqsHYHMDOOMHo7DrkXjG66xilexUwafEQWbD0vFTJ2f60vhR3ZNaeDYR amU01y9gyplGpCfwV4CatGEhYRDzrtVZY4hQi6khOx6m9iBQHhlnP+XtqrwSlaZQ2S/b C73Q== X-Gm-Message-State: ANhLgQ00IuMq+caQs7h/0d/ZWvOohBpU2eJejYdJ1hrHzZSEHp3YFi1E pkIPnS1HsIDSlbQlljvbmurTcW1nw1EogQ== X-Received: by 2002:a1c:68c2:: with SMTP id d185mr4183816wmc.150.1583502473916; Fri, 06 Mar 2020 05:47:53 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q12sm51886021wrg.71.2020.03.06.05.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 05:47:53 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH] qemu.nsi: Install Sphinx documentation Date: Fri, 6 Mar 2020 13:47:51 +0000 Message-Id: <20200306134751.2572-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The old qemu-doc.html is no longer built, so update the Windows installer to install the new Sphinx manual sets. We install all five of the manuals, even though some of them (notably the user-mode manual) will not be very useful to Windows users, because skipping some of them would mean broken links in the top level 'index.html' page. Signed-off-by: Peter Maydell --- I've tested this (building it via the fedora docker image and installing into a Windows VM) but I don't know anything much about the installer so there might be neater ways to do it... NB: I didn't realize that patchew included a test of building the Windows installer, so until we get this (or some variant) into master I'm afraid patchew will be emailing failure reports to every submitted patchseries. Sorry about that :-( --- qemu.nsi | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/qemu.nsi b/qemu.nsi index 0c29ba359cd..1a0112265b0 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -177,9 +177,20 @@ SectionEnd !ifdef CONFIG_DOCUMENTATION Section "Documentation" SectionDoc SetOutPath "$INSTDIR" - File "${BINDIR}\qemu-doc.html" + File "${BINDIR}\index.html" + SetOutPath "$INSTDIR\interop" + FILE /r "${BINDIR}\interop\*.*" + SetOutPath "$INSTDIR\specs" + FILE /r "${BINDIR}\specs\*.*" + SetOutPath "$INSTDIR\system" + FILE /r "${BINDIR}\system\*.*" + SetOutPath "$INSTDIR\tools" + FILE /r "${BINDIR}\tools\*.*" + SetOutPath "$INSTDIR\user" + FILE /r "${BINDIR}\user\*.*" + SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\${PRODUCT}" - CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\qemu-doc.html" "" "$INSTDIR\qemu-doc.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0 SectionEnd !endif @@ -227,7 +238,12 @@ Section "Uninstall" Delete "$INSTDIR\qemu-io.exe" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" - Delete "$INSTDIR\qemu-doc.html" + Delete "$INSTDIR\index.html" + RMDir /r "$INSTDIR\interop" + RMDir /r "$INSTDIR\specs" + RMDir /r "$INSTDIR\system" + RMDir /r "$INSTDIR\tools" + RMDir /r "$INSTDIR\user" RMDir /r "$INSTDIR\keymaps" RMDir /r "$INSTDIR\share" ; Remove generated files