From patchwork Tue Jul 23 10:36:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169512 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8708570ilk; Tue, 23 Jul 2019 03:43:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2t3+YY+HSvrsKG9XObIAV190flkmoQdr2yUKchyFBy5bP2cD/5lSP5CkFbf0uFeHfBlRh X-Received: by 2002:a37:a854:: with SMTP id r81mr50440384qke.378.1563878584252; Tue, 23 Jul 2019 03:43:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878584; cv=none; d=google.com; s=arc-20160816; b=zzDWfYQdjErQxqQln70PANv+e0ucuYc67XIhj5T7DqYtfLoQCwMg2m0g9Mnag6TAK+ zy8XNt6tp26JjcPf4rveCxCSFlOmTiBzkN9NBTS91GGZLZGMnkpUe88fuix+zwaNoQh8 iCZMB3ERTgoO/ZLRLb+UmAN/WIA0JYGw0sTtDudlhkKcoqrem35YQv7G6GzRfp6KJQ/s 4vclkNKsR7eKSY3ZfEuXRDvdvllGSEATu0GRpyGxHiIlb+VRCDvfZ0CrnstOIkHfZuG8 T1aFEvJrSMdpECGHMBdUToR9OoqTiWH+B5d5qcOxQ0YTIT8QWjg5A2imxFGG3bbic6jt uxlQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=TGTAPIKntkOo+MAXfGmQvb/M1xUcZcebTUaffv8oiFHFDK/hjhXJQYBdeb26gwzeYc wGsuswhGy4rzbChYu/XOXvbs382e5eBwTsjQwVCTfHMl6hcoL0UEQo0X++V0clqZukyZ 4fVaNWxaar1D/SCFfoRqrwt/DhQWJfkdLrPxy6kFyDHm4/ysvHqaSSURQ9YnoA/UDTK5 NQ87kbwl3Et46W0ZAkV3Mcn9r2XxSA++UUjDd38dkip1iE+rYNt2AtWhEG5gl143nmtN RpzJHpvIW90GhING9do2i0WtsMOAC/oTxDNOBVJ8oHEIm+8wuErbX3jHjVmVdw9F2xbV armQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="vQQcc/RH"; 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=fail (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 w24si29790550qtk.394.2019.07.23.03.43.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:43:04 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b="vQQcc/RH"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsG6-0005or-UW for patch@linaro.org; Tue, 23 Jul 2019 06:43:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39708) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsF6-0002YO-7j for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF4-0004Eg-1i for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:59 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:44023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF2-0004Bf-Tz for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:41:57 -0400 Received: by mail-wr1-x432.google.com with SMTP id p13so42587674wru.10 for ; Tue, 23 Jul 2019 03:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=vQQcc/RH9uoNJcNUwJC/l2/wO450WSwrjbpzrwGju6XSPLaxKU0Jg2niKIzhBJ1j+i k9kl9qhv2tYOd9aoQ2z7PbtXL4lSrH5UgwxUAGyYJw/QJ2b6whbLKS7gC0sokML7QIN8 LQxIS3VAdIUw71CJRZGaDUzcoAUrItg909WuDWeu6A4qibXuLLivDfMTeW7m54bwyALp FCveFbx5IKDrkc32g8UEIJPMR+Kp+Ksnv/dmCLjxf7y48uZEbVzsKLrOiY0QpxKjM5Al e/qf1TpA+L+nf1oHDCPqFH0/UdqYxri7KKoYhx0f3+hYLnxAcXECsB1U4B2CyJ0fonqO /giw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VX71v+EX2x4zItmkCNQGjdxkkRKOaBoiHBHmU5C8mmY=; b=i3htd9NMsn7KLo1tJuWL4+4gUGVp+8BiZLQS4JFDJjGfWDwwC3DZUy2oAMqw6b3kX/ BhoxVXFKEUop7NmyLuudkhBXmsgkXvDm2jGDE0KwR3sG388XdLPTJixu3ntwbPFAaZQB u71jHEnlNj0glsxqNU8q1Fb5/17vHlG9rSr0clOGDkqcUhEz/1vH5Kf4FdLG+vEFobYX +nwAl/tpKoCwT2mvfyusFIs2kcZNGpL6tjChfnc4P+tZxcJMzOAbsKcTwO3WCoGtyfyP tMReETiOS2iILaMymRsNo5q9YVZ40R0hUkl+qvZ5EUAgw8ZC/Ik9tRaHJiZjn2uTBehH YkHA== X-Gm-Message-State: APjAAAXeQL0XnxTUTdRObpvTBNiBoe/73AEgnOOLFvcqBpvm+Ex5CB4s omoGHXEGpxst8SxIDhZvQz0MkA== X-Received: by 2002:a5d:4206:: with SMTP id n6mr13766419wrq.110.1563878514687; Tue, 23 Jul 2019 03:41:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x11sm30365330wmi.26.2019.07.23.03.41.50 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8419C1FF9D; Tue, 23 Jul 2019 11:36:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:02 +0100 Message-Id: <20190723103612.5600-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> 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::432 Subject: [Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the documentation installed 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: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This fixes: $ make installer [...] (cd /tmp/qemu-nsis; \ for i in qemu-system-*.exe; do \ arch=${i%.exe}; \ arch=${arch#qemu-system-}; \ echo Section \"$arch\" Section_$arch; \ echo SetOutPath \"\$INSTDIR\"; \ echo File \"\${BINDIR}\\$i\"; \ echo SectionEnd; \ done \ ) >/tmp/qemu-nsis/system-emulations.nsh makensis -V2 -NOCD \ \ -DCONFIG_GTK="y" \ -DBINDIR="/tmp/qemu-nsis" \ \ -DSRCDIR="/source/qemu" \ -DOUTFILE="qemu-setup-4.0.90.exe" \ -DDISPLAYVERSION="4.0.90" \ /source/qemu/qemu.nsi File: "/tmp/qemu-nsis\qemu-doc.html" -> no files found. Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] | /oname=outfile one_file_only) Error in script "/source/qemu/qemu.nsi" on line 173 -- aborting creation process make: *** [Makefile:1080: qemu-setup-4.0.90.exe] Error 1 Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190715174817.18981-7-philmd@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/Makefile b/Makefile index ecb788b2ce3..b3357691cad 100644 --- a/Makefile +++ b/Makefile @@ -1077,7 +1077,7 @@ installer: $(INSTALLER) INSTDIR=/tmp/qemu-nsis -$(INSTALLER): $(SRC_PATH)/qemu.nsi +$(INSTALLER): install-doc $(SRC_PATH)/qemu.nsi $(MAKE) install prefix=${INSTDIR} ifdef SIGNCODE (cd ${INSTDIR}; \