Camino only - Bug 383469: Switch to an xcodeproj project file. r=mento sr=pink

camino/Makefile.in

@@ -90,9 +90,10 @@ ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
 export::
 	mkdir -p ./wallet/tables && ln -sf $(ABS_topsrcdir)/extensions/wallet/src/*.tbl ./wallet/tables
 ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-	rsync -a --exclude .DS_Store --exclude "CVS/" --exclude "*.mode1" --exclude "*.pbxuser" $(srcdir)/Camino.xcode .
+	rsync -a --exclude .DS_Store --exclude "CVS/" --exclude "*.mode1" --exclude "*.pbxuser" $(srcdir)/Camino.xcodeproj .
 	ln -fs $(srcdir)/src
 	ln -fs $(srcdir)/resources
+	ln -fs $(srcdir)/config
 	ln -fs $(srcdir)/PreferencePanes
 	ln -fs $(srcdir)/Info-*.plist .
 endif
@@ -133,7 +134,7 @@ generated/CmXULAppData.h: $(srcdir)/src/embedding/CmXULAppData.h.in $(PLATFORM_B
 libs:: generated/all-camino.js generated/CmXULAppData.h $(PLATFORM_INI_FILE)
 	rsync -aC --delete $(srcdir)/embed-replacements/ embed-replacements.tmp
 	cd embed-replacements.tmp && $(ZIP) -r0DX ../../dist/Embed/chrome/embed.jar *
-	$(PBBUILD) -project Camino.xcode -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_SETTINGS)
+	$(PBBUILD) -project Camino.xcodeproj -target $(TARGET) -configuration $(BUILDSTYLE) $(PBBUILD_SETTINGS)
 
 libs::
 	rsync -a --copy-unsafe-links $(XCODE_PRODUCT_DIR)/Camino.app/ $(DIST)/$(APP_NAME).app

camino/config/Camino.xcconfig

@@ -0,0 +1,24 @@
+// Shared configuration settings for Camino and CaminoStatic
+
+PRODUCT_NAME = Camino
+WRAPPER_EXTENSION = app
+INSTALL_PATH = $(HOME)/Applications
+INFOPLIST_FILE = Info-Camino.plist
+
+GCC_PREFIX_HEADER = src/includes/ChimeraPrefix.h
+GCC_ENABLE_CPP_EXCEPTIONS = NO
+GCC_ENABLE_CPP_RTTI = NO
+OTHER_CFLAGS = -fshort-wchar
+GCC_ENABLE_PASCAL_STRINGS = YES
+GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
+OTHER_LDFLAGS = -lpthread -lm
+LIBRARY_SEARCH_PATHS = ../dist/bin ../dist/lib
+HEADER_SEARCH_PATHS = ../dist/include/ ../dist/include/appcomps ../dist/include/caps ../dist/include/chardet ../dist/include/chrome ../dist/include/commandhandler ../dist/include/composer ../dist/include/content ../dist/include/cookie ../dist/include/docshell ../dist/include/dom ../dist/include/editor ../dist/include/embed_base ../dist/include/exthandler ../dist/include/find ../dist/include/gfx ../dist/include/helperAppDlg ../dist/include/history ../dist/include/htmlparser ../dist/include/intl ../dist/include/js ../dist/include/layout ../dist/include/locale ../dist/include/mimetype ../dist/include/mork ../dist/include/necko ../dist/include/nkcache ../dist/include/nspr ../dist/include/pipboot ../dist/include/pipnss ../dist/include/pref ../dist/include/profdirserviceprovider ../dist/include/shistory ../dist/include/spellchecker ../dist/include/string ../dist/include/txtsvc ../dist/include/uconv ../dist/include/unicharutil ../dist/include/uriloader ../dist/include/view ../dist/include/webbrowserpersist ../dist/include/webbrwsr ../dist/include/webshell ../dist/include/widget ../dist/include/windowwatcher ../dist/include/xmlextras ../dist/include/xpcom ../dist/include/xpcom_obsolete ../dist/include/xpconnect ../dist/include/xultmpl ../dist/public/nss $(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon $(LOCAL_LIBRARY_DIR)/Frameworks/SharedMenusCocoa.framework/Headers
+
+// Warning settings
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = NO
+GCC_WARN_MISSING_PARENTHESES = NO
+GCC_WARN_UNUSED_LABEL = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+GCC_WARN_UNKNOWN_PRAGMAS = YES
+GCC_WARN_SIGN_COMPARE = YES

camino/config/Debug.xcconfig

@@ -0,0 +1,8 @@
+GCC_OPTIMIZATION_LEVEL = 0
+
+GCC_GENERATE_DEBUGGING_SYMBOLS = YES
+COPY_PHASE_STRIP = NO
+
+GCC_DYNAMIC_NO_PIC = NO
+
+GCC_ENABLE_FIX_AND_CONTINUE = YES

camino/config/PrefPane.xcconfig

@@ -0,0 +1,23 @@
+WRAPPER_EXTENSION = prefPane
+INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles"
+
+GCC_PREFIX_HEADER = src/includes/ChimeraPrefix.h
+
+// Most/all of this will be removed when pref panes switch to bundle linking
+// rather than actually compiling any core code.
+GCC_PREPROCESSOR_DEFINITIONS = OSTYPE=Darwin1.4 OSARCH=Darwin MOZILLA_INTERNAL_API=1
+OTHER_LDFLAGS = -lpthread -lm
+OTHER_CFLAGS = -fshort-wchar
+LIBRARY_STYLE = BUNDLE
+GCC_ENABLE_PASCAL_STRINGS = YES
+GCC_ENABLE_CPP_EXCEPTIONS = NO
+GCC_ENABLE_CPP_RTTI = NO
+
+// Thes warning settings should be revisited once pref panes aren't tied to core
+// GCC_WARN_NON_VIRTUAL_DESTRUCTOR = NO
+GCC_WARN_MISSING_PARENTHESES = NO
+GCC_WARN_UNUSED_LABEL = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+GCC_WARN_UNKNOWN_PRAGMAS = YES
+GCC_WARN_SIGN_COMPARE = YES
+WARNING_CFLAGS = -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -Wno-non-virtual-dtor

camino/config/Release.xcconfig

@@ -0,0 +1,10 @@
+GCC_OPTIMIZATION_LEVEL = 2
+
+DEAD_CODE_STRIPPING = YES
+
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO
+COPY_PHASE_STRIP = YES
+
+// This has to be set here, rather than by target, because it only works
+// with optimization enabled
+GCC_WARN_UNINITIALIZED_AUTOS = YES

camino/docs/ReleaseChecklist.txt

@@ -6,7 +6,7 @@ Checklist of things to do before releasing a new Camino version:
 - Update version number in Credits.rtf
 - Update version number in InfoPlist.strings
 - Update version number in WebsiteDefaults.strings
-- Update version number in Info-Camino.plist, Info-CaminoStatic.plist
+- Update version number in Info-Camino.plist
 - Flip switch on Talkback server to enable wizard UI
 - Check in new release notes
 - Update mozilla/camino/installer/Makefile.in to pick up new release notes