[Fedora-directory-commits] esc/src/app/xpcom Makefile, 1.2, 1.2.2.1 Makefile.moz, 1.4, 1.4.2.1

[Jack Magne (jmagne)]

Author: jmagne

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

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/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:33:53 -0000	1.2.2.1
@@ -26,6 +26,18 @@
 MOZ_SRCDIR=$(SOURCE_XP_DIR)/src/mozilla
 MOZ_OBJDIR=$(DIST)/xulrunner_build
 
+DARWIN_LIB_NAME=librhCoolKey.dylib
+
+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
+
+
+
 ifeq ($(OS_ARCH),Linux)
 endif
 
@@ -39,6 +51,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::
 	echo "***** Dropping into the Mozilla build environment ***** $(MOZ_OBJDIR)"
@@ -49,12 +71,30 @@
 		MOZ_SRCDIR=$(MOZ_SRCDIR) \
 		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_OBJDIR=$(MOZ_OBJDIR) \
-
-
+		MOZ_OBJDIR=$(MOZ_OBJDIR)


Index: Makefile.moz
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/Makefile.moz,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Makefile.moz	25 Oct 2006 03:58:16 -0000	1.4
+++ Makefile.moz	26 Jan 2007 01:33:53 -0000	1.4.2.1
@@ -1,4 +1,4 @@
-
+#
 # This Program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
 # Foundation; version 2 of the License.
@@ -16,7 +16,7 @@
 # ***** END COPYRIGHT BLOCK *****
 
 CORE_DEPTH	= ../../..
-MOZ_OBJDIR	= $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
+#MOZ_OBJDIR	= $(CORE_DEPTH)/dist/$(OBJDIR)/xulrunner_build
 MOZ_SRCDIR	= $(CORE_DEPTH)/dist/src/mozilla
 DEPTH           = $(MOZ_OBJDIR)
 topsrcdir       = $(MOZ_SRCDIR)
@@ -42,13 +42,14 @@
 XULRUNNER_BIN_PATH	= $(MOZ_OBJDIR)/dist/xulrunner
 XULRUNNER_EXEC		= xulrunner
 ifeq ($(OS_ARCH), Darwin)
-XULRUNNER_BIN_PATH      = /Library/Frameworks/XUL.framework
+XULRUNNER_BIN_PATH      = $(MOZ_OBJDIR)/dist/universal/xulrunner/XUL.framework
 XULRUNNER_EXEC          = xulrunner-bin
 XULRUNNER_FRAME_DEST    = ESC.app/Contents/Frameworks/XUL.framework
 XULRUNNER_FRAME_BASE	= ESC.app/Contents/Frameworks
 endif
 
-DEPLOY_OFFSET=/esc
+#DEPLOY_OFFSET=/esc
+DEPLOY_OFFSET=/src
 
 ifeq ($(OS_ARCH),Linux)
 DEPLOY_OFFSET=/src
@@ -66,12 +67,23 @@
 XPIDL_MODULE	= rhCoolKey
 LIBRARY_NAME	= rhCoolKey
 
+
+CKY_LIB_LDD=
+ifdef CKY_LIB   
+CKY_LIB_LDD	= -L$(CKY_LIB)
+endif
+
+
 ifeq ($(OS_ARCH),WINNT)
-COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CORE_DIST)/lib/ckyapplet.lib
+COOLKEY_LIBS	= $(CORE_DIST)/lib/ckymanager.lib $(CORE_DIST)/lib/httpchunked.lib  $(CKY_LIB_LDD) $(CORE_DIST)/lib/ckyapplet.lib
 TESTCPPSRCS	= CoolKeyCSP.cpp
 MOZ_NO_DEBUG_RTL=1
 else
-COOLKEY_LIBS	= -L$(CORE_DIST)/lib -lckymanager -lhttpchunked -lckyapplet
+COOLKEY_LIBS	= -L$(CORE_DIST)/lib  -lhttpchunked -lckymanager  $(CKY_LIB_LDD) -lckyapplet
+endif
+
+ifeq ($(OS_ARCH),Darwin)
+COOLKEY_LIBS	+= -lsystemStubs
 endif
 
 IS_COMPONENT	= 1
@@ -129,6 +141,10 @@
 	rm -f Makefile.in
 	rm -rf $(DEPLOY_OBJDIR)
 	rm -rf $(CORE_DEPTH)$(DEPLOY_OFFSET)/app/xul/esc/esc
+ifeq ($(OS_ARCH),Darwin)
+	rm -rf ppc
+	rm -rf i386
+endif
 
 deploy: $(DEPLOY_OBJDIR)
 	echo "deploy! on $(OS_ARCH)"