[Fedora-directory-commits] esc/src/app/xpcom/tray Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.3, 1.3.2.1

[Doctor Conrad]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7479

Modified Files:
      Tag: ESC_CS_72_BRANCH
	Makefile Makefile.moz 
Log Message:
Mac Universal binary.


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Makefile	13 Sep 2006 17:50:07 -0000	1.2
+++ Makefile	26 Jan 2007 01:34:44 -0000	1.2.2.1
@@ -21,17 +21,23 @@
 include $(CORE_DEPTH)/coreconf/config.mk
 include $(CORE_DEPTH)/coreconf/rules.mk
 
+DARWIN_LIB_NAME=librhTray.dylib
+
+
 CORE_INC=$(SOURCE_XP_DIR)/public
 MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla
 MOZ_OBJDIR=$(DIST)/xulrunner_build
 
-ifeq ($(OS_ARCH), Darwin)
-#MOZ_OBJDIR=$(MOZ_SRCDIR)
-endif
 
-ifeq ($(OS_ARCH),Linux)
+UNIVERSAL_OFFSET_PPC=ppc
+UNIVERSAL_OFFSET_386=i386
+MOZ_OBJDIR_PPC=
+ifeq ($(OS_ARCH),Darwin)
+MOZ_OBJDIR=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_386)
+MOZ_OBJDIR_PPC=$(DIST)/xulrunner_build/$(UNIVERSAL_OFFSET_PPC)
 endif
 
+
 all export install clean deploy args::  
 	echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)
$@"
 	echo $(DIST)
@@ -42,6 +48,16 @@
 		MOZ_SRCDIR=$(MOZ_SRCDIR) \
 		MOZ_OBJDIR=$(MOZ_OBJDIR) \
 
+ifeq ($(OS_ARCH),Darwin)
+		echo "Darwin all"
+		$(MAKE) -f Makefile.moz $@ \
+			OBJDIR=$(OBJDIR) \
+			CORE_DIST=$(DIST) \
+			CORE_INC=$(CORE_INC) \
+			MOZ_SRCDIR=$(MOZ_SRCDIR) \
+			MOZ_OBJDIR=$(MOZ_OBJDIR_PPC) 
+endif
+
 libs::
 
 	$(MAKE) -f Makefile.moz libs \
@@ -49,13 +65,31 @@
 		CORE_DIST=$(DIST) \
 		CORE_INC=$(CORE_INC) \
 		MOZ_SRCDIR=$(MOZ_SRCDIR) \
-		MOZ_OBJ_DIR=$(MOZ_OBJDIR) \
+		MOZ_OBJDIR=$(MOZ_OBJDIR) \
+
+ifeq ($(OS_ARCH),Darwin)
+		echo "Darwin libs"
+		mkdir -p $(UNIVERSAL_OFFSET_386)
+		mkdir -p $(UNIVERSAL_OFFSET_PPC)
+		mv -n $(DARWIN_LIB_NAME) i386
+		rm Makefile.in
+		rm *.o
+		$(MAKE) -f Makefile.moz libs \
+			OBJDIR=$(OBJDIR) \
+			CORE_DIST=$(DIST) \
+			CORE_INC=$(CORE_INC) \
+			MOZ_SRCDIR=$(MOZ_SRCDIR) \
+			MOZ_OBJDIR=$(MOZ_OBJDIR_PPC)
+		mv $(DARWIN_LIB_NAME) $(UNIVERSAL_OFFSET_PPC) 
 
+endif
+ifeq ($(OS_ARCH),Darwin)
+	echo "Darwin Creating UNI binary."
+	lipo -create $(UNIVERSAL_OFFSET_PPC)/$(DARWIN_LIB_NAME)
$(UNIVERSAL_OFFSET_386)/$(DARWIN_LIB_NAME) -output $(DARWIN_LIB_NAME)
+endif
 	$(MAKE) -f Makefile.moz deploy \
 		OBJDIR=$(OBJDIR) \
 		CORE_DIST=$(DIST) \
 		CORE_INC=$(CORE_INC) \
 		MOZ_SRCDIR=$(MOZ_SRCDIR) \
-		MOZ_OBJ_DIR=$(MOZ_OBJDIR)
-
-
+		MOZ_OBJDIR=$(MOZ_OBJDIR)


Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.moz,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Makefile.moz	25 Oct 2006 03:59:03 -0000	1.3
+++ Makefile.moz	26 Jan 2007 01:34:44 -0000	1.3.2.1
@@ -16,7 +16,9 @@
 # ***** END COPYRIGHT BLOCK *****
 
 CORE_DEPTH	= ../../../..
-MOZ_OBJDIR	= $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR	= $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR=$(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build/i386
+
 MOZ_SRCDIR	= $(CORE_DEPTH)/dist/src/mozilla
 DEPTH           = $(MOZ_OBJDIR)
 topsrcdir       = $(MOZ_SRCDIR)
@@ -32,14 +34,17 @@
 NOTIFY_CXX_FLAGS	= -I$(NOTIFY_DEPTH) $(shell pkg-config --cflags glib-2.0)
 NOTIFY_LDFLAGS	= $(shell pkg-config --libs libnotify)
 
+
 NO_DIST_INSTALL	= 1
 ifeq ($(OS_ARCH),Linux)
 
 endif
 
+
 -include $(MOZ_OBJDIR)/config/autoconf.mk
 
-DEPLOY_OFFSET=/esc
+#DEPLOY_OFFSET=/esc
+DEPLOY_OFFSET=/src
 ifeq ($(OS_ARCH),Linux)
 DEPLOY_OFFSET=/src
 endif
@@ -96,7 +101,7 @@
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-
+#OS_CXXFLAGS	+= -arch i386 -arch ppc
 CPPSRCS         =                  \
                 rhMacTray.cpp         \
                 $(NULL) 
@@ -135,6 +140,10 @@
 
 clean::
 	rm -f Makefile.in
+ifeq ($(OS_ARCH),Darwin)
+	rm -rf i386
+	rm -rf ppc
+endif
 
 deploy::
 	echo "Deploying"