PERFORCE change 52219 for review

[Chris Vance]

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

Change 52219 by cvance at cvance_g5 on 2004/05/04 05:41:23

	Add the modified wslogin library and application to the build system

Affected files ...

.. //depot/projects/trustedbsd/sedarwin73/Makefile#5 edit
.. //depot/projects/trustedbsd/sedarwin73/release/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer#2 delete
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer.sedarwin#2 edit
.. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/install-windowserver.sh#1 add

Differences ...

==== //depot/projects/trustedbsd/sedarwin73/Makefile#5 (text+ko) ====

@@ -10,11 +10,11 @@
 	extattr_cmds \
 	mac_cmds \
 	sebsd_cmds \
+	sebsd_system \
 	policy \
 	apsl/file_cmds
 
 #	apsl/bootstrap_cmds
-#	sebsd_system
 
 dist:
 	cd release && $(MAKE) dist

==== //depot/projects/trustedbsd/sedarwin73/release/Makefile#3 (text+ko) ====

@@ -1,12 +1,15 @@
 include ../Makeconfig
 
 DIRS=	$(DESTDIR)/private/etc \
+	$(DESTDIR)/private/etc/sedarwin \
 	$(DESTDIR)/bin \
 	$(DESTDIR)/usr/bin \
 	$(DESTDIR)/usr/lib \
 	$(DESTDIR)/usr/share/man/man1 \
 	$(DESTDIR)/usr/share/man/man8 \
-	$(DESTDIR)/usr/include/sebsd
+	$(DESTDIR)/System/Library/CoreServices \
+	$(DESTDIR)/usr/include/sebsd \
+	$(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
 
 all:
 	mkdir -p $(DIRS)

==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/Makefile#2 (text+ko) ====

@@ -1,9 +1,6 @@
-all:
-	(cd wslogin ; make)
+include ../Makeconfig
 
-clean:
-	(cd wslogin ; make clean)
+SUBDIR= wslogin
 
-install:
-	(cd wslogin ; make install)
+.include <bsd.subdir.mk>
 

==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#3 (text+ko) ====

@@ -1,4 +1,3 @@
-
 include ../../Makeconfig
 
 OBJS = wslogin.o
@@ -12,22 +11,12 @@
 	xcodebuild
 
 install:
-	install -m 644 -o root -g wheel wslogin.dylib /usr/lib
+	$(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 \
+		wslogin.dylib $(DESTDIR)/usr/lib
 	(cd build ; tar -cf - wsloginui.app) | (cd \
-	    /System/Library/CoreServices ; tar -xf -)
-	chown -R root:wheel /System/Library/CoreServices/wsloginui.app
-
-#
-# Really be careful here!  I wonder if we can make Make fail if it's already
-# there...?
-#
-rotate-out-old-server:
-	sudo mv /System/Library/CoreServices/WindowServer \
-	    /System/Library/CoreServices/RealWindowServer
-
-install-window-server-wrapper:
-	install -m 755 -o root -g wheel WindowServer \
-	    /System/Library/CoreServices
+	    $(DESTDIR)/System/Library/CoreServices ; tar -xf -)
+	$(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 644 WindowServer.sedarwin $(DESTDIR)/System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/
+	$(INSTALL) -o $(BINOWN) -g $(BINGRP) -m 700 install-windowserver.sh $(DESTDIR)/private/etc/sedarwin/
 
 clean:
 	rm -f $(OBJS) wslogin.dylib

==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer.sedarwin#2 (text+ko) ====

@@ -1,3 +1,4 @@
 #!/bin/sh
 
-DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/wslogin.dylib /System/Library/CoreServices/RealWindowServer "$@"
+DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES=/usr/lib/wslogin.dylib \
+    /System/Library/Frameworks/ApplicationServices.framework/Frameworks/CoreGraphics.framework/Resources/WindowServer.apple
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message