From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ma1-aaemail-dr-lapp03.apple.com (ma1-aaemail-dr-lapp03.apple.com [17.171.2.72]) by mx.groups.io with SMTP id smtpd.web10.21314.1590355277504779529 for ; Sun, 24 May 2020 14:21:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@apple.com header.s=20180706 header.b=AXr0pvzp; spf=pass (domain: apple.com, ip: 17.171.2.72, mailfrom: afish@apple.com) Received: from pps.filterd (ma1-aaemail-dr-lapp03.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp03.apple.com (8.16.0.42/8.16.0.42) with SMTP id 04OLBSVm008435; Sun, 24 May 2020 14:21:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=20180706; bh=qTYBrjXOC+cEuXmF5B54E2HLs5WhN1Ea0SeaPKx1JuM=; b=AXr0pvzpNeK0f8WNVNcUstUjes/EMEiRTKZ+Pyaet4htoVmYg3dVlXKRg0m2xfFdk/zJ yStYThtAzn8mET9d5y9XGkFvIO3h7NeztzKnfwXWZu7jy7ny5dBIl1t6YEde6Sbz/HhV JWEz3UcAuOHnAOO4FKIWdZvth984G86w/lS6OilL8n/vsLBywoYYg8pljLMEw6bjsbWV 6IfYDJLt9Uo8qrb0QqNB7POr2qFPPCozUmJ+pJ9ZjclCpHu7CktVQr17Imn0KEdXO4eY EqkxnBKtOSFLBMs+ivy9bpIzRkgDuO+Hn6DQ6EVIu7fNQG1P0+cdMyBYaptlQYW9B+uc Dw== Received: from rn-mailsvcp-mta-lapp04.rno.apple.com (rn-mailsvcp-mta-lapp04.rno.apple.com [10.225.203.152]) by ma1-aaemail-dr-lapp03.apple.com with ESMTP id 3172tubtks-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 24 May 2020 14:21:16 -0700 Received: from rn-mailsvcp-relay-lapp04.rno.apple.com (rn-mailsvcp-relay-lapp04.rno.apple.com [17.179.253.13]) by rn-mailsvcp-mta-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTPS id <0QAU00J0WTZF6340@rn-mailsvcp-mta-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:15 -0700 (PDT) Received: from process_milters-daemon.rn-mailsvcp-relay-lapp04.rno.apple.com by rn-mailsvcp-relay-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) id <0QAU00E00TR7MK00@rn-mailsvcp-relay-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:15 -0700 (PDT) X-Va-A: X-Va-T-CD: 678bf7de5df0d9ff994f556fd1b44182 X-Va-E-CD: 44287a5d50130550c9eccc1389f66aaf X-Va-R-CD: 341f8b92c5c1086d18357726cbc3ce00 X-Va-CD: 0 X-Va-ID: c61b629a-828d-4dbb-ab09-4f8f45c14bee X-V-A: X-V-T-CD: 678bf7de5df0d9ff994f556fd1b44182 X-V-E-CD: 44287a5d50130550c9eccc1389f66aaf X-V-R-CD: 341f8b92c5c1086d18357726cbc3ce00 X-V-CD: 0 X-V-ID: ef4ff659-d9a8-4b92-ac32-07a7507a58b4 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676 definitions=2020-05-24_07:2020-05-22,2020-05-24 signatures=0 Received: from rn-mailsvcp-relay-lapp02.rno.apple.com (unknown [17.235.51.71]) by rn-mailsvcp-relay-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTP id <0QAU00NJ9TYDAE00@rn-mailsvcp-relay-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:15 -0700 (PDT) From: "Andrew Fish" To: devel@edk2.groups.io Cc: Andrew Fish , Bob Feng , Liming Gao Subject: [PATCH 2/3] BaseTools: Add PE/COFF resource sections support for XCODE Date: Sun, 24 May 2020 14:20:10 -0700 Message-id: X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-reply-to: References: MIME-version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676 definitions=2020-05-24_07:2020-05-22,2020-05-24 signatures=0 Content-transfer-encoding: quoted-printable BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D557 Build a nul lib in [Hii-Binary-Package.UEFI_HII] so the makefile dependencies are satisfied. Add --rc to Genfw in [Dynamic-Library-File] to inject the *hii.rc data if it exists. Signed-off-by: Andrew Fish Cc: Bob Feng Cc: Liming Gao Signed-off-by: Andrew Fish --- BaseTools/Conf/build_rule.template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule= .template index 0822b681fcd9..00f729a40003 100755 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -393,7 +393,7 @@ "$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBU= G_DIR)(+)$(MODULE_NAME).pecoff=0D # create symbol file for GDB debug=0D -$(DSYMUTIL) ${src}=0D - "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAM= E).pecoff $(GENFW_FLAGS)=0D + "$(GENFW)" -e $(MODULE_TYPE) --rc $(OUTPUT_DIR)(+)$(MODULE_NAME)hi= i.rc -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)=0D $(CP) ${dst} $(DEBUG_DIR)=0D $(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi=0D -$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)=0D @@ -645,10 +645,10 @@ =0D *.hpk=0D =0D - =0D + =0D $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.lib=0D =0D - =0D + =0D $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc=0D =0D =0D @@ -659,5 +659,12 @@ "$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUI= D) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)=0D "$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}=0D =0D - =0D + =0D GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --= hiibinpackage $(HII_BINARY_PACKAGES)=0D +=0D + =0D + GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --= hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)=0D + # Fake a lib that is empty for a make dependency like toolchains w= ith a real RC tool.=0D + echo "int aksdlfjlksdfjlksslkdfj;" > $(OUTPUT_DIR)(+)$(MODULE_NAME= )hii.hhi.c;=0D + "$(CC)" $(DEPS_FLAGS) $(CC_FLAGS) -o $(OUTPUT_DIR)(+)$(MODULE_NAME= )hii.hii.o $(INC) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.hhi.c=0D + "$(SLINK)" $(SLINK_FLAGS) ${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hi= i.hii.o=0D --=20 2.24.1 (Apple Git-126)