From owner-trustedbsd-cvs@FreeBSD.ORG Tue Nov 14 19:21:24 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F0D8516A585 for ; Tue, 14 Nov 2006 19:21:23 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE72743D55 for ; Tue, 14 Nov 2006 19:20:59 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id BA18446BBF for ; Tue, 14 Nov 2006 14:20:47 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 2A2FF55C54; Tue, 14 Nov 2006 19:13:19 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2244816A47B; Tue, 14 Nov 2006 19:13:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF5C316A416 for ; Tue, 14 Nov 2006 19:13:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 748C843D73 for ; Tue, 14 Nov 2006 19:13:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAEJDFiK018455 for ; Tue, 14 Nov 2006 19:13:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEJDF8C018452 for perforce@freebsd.org; Tue, 14 Nov 2006 19:13:15 GMT (envelope-from millert@freebsd.org) Date: Tue, 14 Nov 2006 19:13:15 GMT Message-Id: <200611141913.kAEJDF8C018452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 109975 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Nov 2006 19:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=109975 Change 109975 by millert@millert_g5tower on 2006/11/14 19:12:41 Project file for newer xcode Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcodeproj/project.pbxproj#1 add .. //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/MAC.loginPlugin.xcode/project.pbxproj#2 (text+ko) ==== @@ -347,7 +347,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /System/Library/LoginPlugins; - OTHER_CFLAGS = "-I../../$(XNU)/BUILD/obj/EXPORT_HDRS/bsd -I../../$(XNU)/BUILD/obj/EXPORT_HDRS/security"; + OTHER_CFLAGS = "-I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security"; PRODUCT_NAME = MAC; WRAPPER_EXTENSION = loginPlugin; }; @@ -661,8 +661,8 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; INFOPLIST_FILE = plugins/MLS/Info.plist; - OTHER_CFLAGS = "-I../../$(XNU)/BUILD/obj/EXPORT_HDRS/bsd -I../../$(XNU)/BUILD/obj/EXPORT_HDRS/security"; - OTHER_LDFLAGS = "-framework Foundation -framework AppKit -L../../libmac -lmac"; + OTHER_CFLAGS = "-I$(EXPORT_HDRS)/bsd -I$(EXPORT_HDRS)/security"; + OTHER_LDFLAGS = "-framework Foundation -framework AppKit -L$(DARWIN_ROOT)/libmac -lmac"; OTHER_REZFLAGS = ""; PRODUCT_NAME = MLS; SECTORDER_FLAGS = ""; ==== //depot/projects/trustedbsd/sedarwin8/darwin/osx_cmds/MAC.loginPlugin/Makefile#2 (text+ko) ==== @@ -5,11 +5,20 @@ include ../../../Makeconfig all: - @xcodebuild XNU=$(XNU) -alltargets -buildstyle Deployment + @xcodebuild \ + SOURCE_ROOT=$(SOURCE_ROOT) \ + EXPORT_HDRS=$(EXPORT_HDRS) \ + DARWIN_ROOT=$(DARWIN_ROOT) \ + -alltargets -configuration Deployment install: - @xcodebuild XNU=$(XNU) DSTROOT="$(EXPORT_ROOT)" \ - -target MAC -buildstyle Deployment install + @xcodebuild \ + SOURCE_ROOT=$(SOURCE_ROOT) \ + EXPORT_HDRS=$(EXPORT_HDRS) \ + DARWIN_ROOT=$(DARWIN_ROOT) \ + DSTROOT="$(EXPORT_ROOT)" \ + -target MAC \ + -configuration Deployment install @chmod -R u+w $(EXPORT_ROOT)/System/Library/LoginPlugins/MAC.loginPlugin @install -m 444 MAClogin.conf.sample $(EXPORT_ROOT)/private/etc/ @install -m 555 maclogin.sh $(EXPORT_ROOT)/usr/bin/maclogin