From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05090C433DB for ; Sat, 23 Jan 2021 14:39:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 630D82065E for ; Sat, 23 Jan 2021 14:39:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 630D82065E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3K4o-0007Pa-HA for qemu-devel@archiver.kernel.org; Sat, 23 Jan 2021 09:39:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3JxD-0003WH-P6 for qemu-devel@nongnu.org; Sat, 23 Jan 2021 09:31:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35071) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l3Jx7-0005pl-3A for qemu-devel@nongnu.org; Sat, 23 Jan 2021 09:31:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611412307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Nwqo/nYznHttAiuDRgtWEU6qBSBMkdrfePaH0rvxN5E=; b=HFsH8SsP4Bqjv9qsV28ZALdRxptDZENGjY4FdF+yy0eDWJOpTM6uh3DMz4cYff6ee5Z/P2 c9M4CfbuiVMXbMlO+xb7CNrKDk/6i6ie+z9eOaqQaPCX6b0vmrgwRN26bDTjosIqaYV34A gkE1Mf/aOTG2xYOy6Ynp3qHdSE1OXu4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-383-P8DXPYf0O-mbz1h63cIj3w-1; Sat, 23 Jan 2021 09:31:45 -0500 X-MC-Unique: P8DXPYf0O-mbz1h63cIj3w-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81C25806662 for ; Sat, 23 Jan 2021 14:31:44 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BF9719C44 for ; Sat, 23 Jan 2021 14:31:44 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/31] nsis: adjust for new MinGW paths Date: Sat, 23 Jan 2021 09:31:10 -0500 Message-Id: <20210123143128.1167797-14-pbonzini@redhat.com> In-Reply-To: <20210123143128.1167797-1-pbonzini@redhat.com> References: <20210123143128.1167797-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.165, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini --- qemu.nsi | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/qemu.nsi b/qemu.nsi index 1a0112265b..c3df8c9d3b 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -35,11 +35,6 @@ !define OUTFILE "qemu-setup.exe" !endif -; Optionally install documentation. -!ifndef CONFIG_DOCUMENTATION -!define CONFIG_DOCUMENTATION -!endif - ; Use maximum compression. SetCompressor /SOLID lzma @@ -116,26 +111,13 @@ Section "${PRODUCT} (required)" ; Set output path to the installation directory. SetOutPath "$INSTDIR" - File "${SRCDIR}\Changelog" File "${SRCDIR}\COPYING" File "${SRCDIR}\COPYING.LIB" File "${SRCDIR}\README.rst" File "${SRCDIR}\VERSION" - File "${BINDIR}\*.bmp" - File "${BINDIR}\*.bin" - File "${BINDIR}\*.dtb" - File "${BINDIR}\*.fd" - File "${BINDIR}\*.img" - File "${BINDIR}\*.lid" - File "${BINDIR}\*.ndrv" - File "${BINDIR}\*.rom" - File "${BINDIR}\openbios-*" - File /r "${BINDIR}\keymaps" -!ifdef CONFIG_GTK File /r "${BINDIR}\share" -!endif !ifdef W64 SetRegView 64 @@ -176,21 +158,11 @@ SectionEnd !ifdef CONFIG_DOCUMENTATION Section "Documentation" SectionDoc - SetOutPath "$INSTDIR" - 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\doc" + File /r "${BINDIR}\doc" SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\${PRODUCT}" - CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\index.html" "" "$INSTDIR\index.html" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT}\User Documentation.lnk" "$INSTDIR\doc\index.html" "" "$INSTDIR\doc\index.html" 0 SectionEnd !endif @@ -238,13 +210,7 @@ Section "Uninstall" Delete "$INSTDIR\qemu-io.exe" Delete "$INSTDIR\qemu.exe" Delete "$INSTDIR\qemu-system-*.exe" - 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\doc" RMDir /r "$INSTDIR\share" ; Remove generated files Delete "$INSTDIR\stderr.txt" -- 2.26.2