From patchwork Sun May 10 19:58:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 48187 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D3B62121F for ; Sun, 10 May 2015 19:59:19 +0000 (UTC) Received: by wgin8 with SMTP id n8sf34479897wgi.0 for ; Sun, 10 May 2015 12:59:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :from:date:message-id:to:content-type:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=hIG4FSmMH0DndFjRufIAE7Khj7/zoSEtvAQBat2IvdQ=; b=XE4r3fOfWvpSIa2c7boFa2utuUbr4jvIOHRJZVVgz0udpZQ70vimJj1YsmG7Gwnt1b v67HA0YKi2vCwDwFyXVJijPW1BICbojuPKWKm+YjrNPgo9qqoHDHronrtx0dDcVf9KuL MOFZoMD0Bb9TWg228/pMFQp4sSzj23BcVBsODJnRyzGePPXMbuLpSUWz8abJaLBFqQi8 t2FgOpUeqHs8uNLLhqhxyc9J0HcaTznHP7a7l2MnqQHN7wfHoQR49IPobe4YVR1iT1dw a7CwkgfmlxbA7mVGgKFXA+sN/iP/TcBWp5GRepgrK/EulSfI9FLQXne895YhMKywzr5G 0Gng== X-Gm-Message-State: ALoCoQkLCqjzv9/mRYTgbReLBoC8/7wTcykwXNcLfJt0p3PieYpR2boE+u4sUjMJQgbjAK9YPjEu X-Received: by 10.152.184.73 with SMTP id es9mr5417601lac.4.1431287958609; Sun, 10 May 2015 12:59:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.9 with SMTP id ky9ls457484lab.98.gmail; Sun, 10 May 2015 12:59:18 -0700 (PDT) X-Received: by 10.112.161.197 with SMTP id xu5mr5545226lbb.69.1431287958462; Sun, 10 May 2015 12:59:18 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id ko5si7122687lbb.43.2015.05.10.12.59.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 May 2015 12:59:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbuc2 with SMTP id uc2so81485792lbb.2 for ; Sun, 10 May 2015 12:59:18 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr5515011lak.117.1431287958373; Sun, 10 May 2015 12:59:18 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1162029lbb; Sun, 10 May 2015 12:59:17 -0700 (PDT) X-Received: by 10.55.20.30 with SMTP id e30mr15986153qkh.45.1431287956891; Sun, 10 May 2015 12:59:16 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b138si11084781qka.116.2015.05.10.12.59.16 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 10 May 2015 12:59:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:34392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrXNc-0003sE-4L for patch@linaro.org; Sun, 10 May 2015 15:59:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrXNB-0003b1-9e for qemu-devel@nongnu.org; Sun, 10 May 2015 15:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YrXN6-0001hE-9L for qemu-devel@nongnu.org; Sun, 10 May 2015 15:58:49 -0400 Received: from mail-ie0-f178.google.com ([209.85.223.178]:33989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YrXN6-0001gr-4j for qemu-devel@nongnu.org; Sun, 10 May 2015 15:58:44 -0400 Received: by iedfl3 with SMTP id fl3so106816764ied.1 for ; Sun, 10 May 2015 12:58:43 -0700 (PDT) X-Received: by 10.42.164.7 with SMTP id e7mr7663362icy.70.1431287923419; Sun, 10 May 2015 12:58:43 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.136.220 with HTTP; Sun, 10 May 2015 12:58:23 -0700 (PDT) In-Reply-To: References: From: Peter Maydell Date: Sun, 10 May 2015 20:58:23 +0100 Message-ID: To: Programmingkid X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.223.178 Cc: Paolo Bonzini , qemu-devel qemu-devel Subject: Re: [Qemu-devel] [PATCH v4] Makefile.target: set icon for binary file on Mac OS X X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 On 21 February 2015 at 16:14, Programmingkid wrote: > Implements setting the icon for the binary file in Mac OS X. > > Signed-off-by: John Arbuckle > > --- > Added $(SRC_PATH) to the path of the rsrc file. > > Makefile.target | 4 + > pc-bios/qemu.rsrc | 1504 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 1508 insertions(+), 0 deletions(-) > create mode 100644 pc-bios/qemu.rsrc > > diff --git a/Makefile.target b/Makefile.target > index e9ff1ee..9661c87 100644 > --- a/Makefile.target > +++ b/Makefile.target > @@ -178,6 +178,10 @@ all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) > # build either PROG or PROGW > $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a > $(call LINK,$^) > +ifdef CONFIG_DARWIN > + Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $(QEMU_PROG) > + SetFile -a C $(QEMU_PROG) > +endif When I came to look at this patch this hunk didn't quite apply cleanly any more. It also is missing the quiet-command use that makes the output look nice, and it would be cleaner to use $@ rather than $(QEMU_PROG). The tweaked Makefile.target hunk I came up with is: $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES )," GEN $(TARGET_DIR)$@") ===endit=== Unless anybody objects or Paolo particularly wants to take this through his tree I'll add this modified version to my cocoa tree. thanks -- PMM ===begin=== diff --git a/Makefile.target b/Makefile.target index 1083377..be01dd3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -180,6 +180,10 @@ $(QEMU_PROG_BUILD): config-devices.mak # build either PROG or PROGW $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a $(call LINK, $(filter-out %.mak, $^)) +ifdef CONFIG_DARWIN + $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@," REZ $(TARGET_DIR)$@") + $(call quiet-command,SetFile -a C $@," SETFILE $(TARGET_DIR)$@") +endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL)