PERFORCE change 109975 for review

Todd Miller millert at FreeBSD.org
Tue Nov 14 19:21:24 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=109975

Change 109975 by millert at 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


More information about the trustedbsd-cvs mailing list