landing modifications from XULRUNNER_20040804_BRANCH

xulrunner/app/Makefile.in

@@ -60,7 +60,7 @@ REQUIRES = \
         xulapp \
 	$(NULL)
 
-CPPSRCS = nsXulRunnerApp.cpp
+CPPSRCS = nsXULRunnerApp.cpp
 
 ifdef BUILD_STATIC_LIBS
 STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components

xulrunner/app/nsXULRunnerApp.cpp

@@ -0,0 +1,67 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla.
+ *
+ * The Initial Developer of the Original Code is IBM Corporation.
+ * Portions created by IBM Corporation are Copyright (C) 2003
+ * IBM Corporation. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Darin Fisher <darin@meer.net>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsXULAppAPI.h"
+#ifdef XP_WIN
+#include <windows.h>
+#include <stdlib.h>
+#endif
+
+static const nsXREAppData kAppData = {
+  "Mozilla",
+  "XULRunner",
+  APP_VERSION,
+  BUILD_ID,
+  "Copyright (c) 2004 mozilla.org",
+  PR_FALSE,
+  PR_FALSE,
+  PR_FALSE
+};
+
+int main(int argc, char* argv[])
+{
+  return xre_main(argc, argv, &kAppData);
+}
+                                                                                                                                                
+#if defined( XP_WIN ) && defined( WIN32 ) && !defined(__GNUC__)
+// We need WinMain in order to not be a console app.  This function is
+// unused if we are a console application.
+int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
+{
+    // Do the real work.
+    return main( __argc, __argv );
+}
+#endif

xulrunner/app/nsXulRunnerApp.cpp

@@ -1,27 +0,0 @@
-#include "nsXULAppAPI.h"
-#include "nsBuildID.h"
-
-static const nsXREAppData kAppData =
-{
-  "Mozilla",
-  "Xulrunner",
-  APP_VERSION,
-  BUILD_ID,
-  "Copyright (c) 2004 mozilla.org",
-  PR_FALSE
-};
-
-int main(int argc, char* argv[])
-{
-  return xre_main(argc, argv, &kAppData);
-}
-                                                                                                                                                
-#if defined( XP_WIN ) && defined( WIN32 ) && !defined(__GNUC__)
-// We need WinMain in order to not be a console app.  This function is
-// unused if we are a console application.
-int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
-{
-    // Do the real work.
-    return main( __argc, __argv );
-}
-#endif

xulrunner/config/mozconfig

@@ -8,7 +8,7 @@ mk_add_options MOZ_XULRUNNER=1
 
 ac_add_options --disable-ldap
 ac_add_options --disable-mailnews
-ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,typeaheadfind,webservices,inspector,gnomevfs,negotiateauth
+ac_add_options --enable-extensions=xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,gnomevfs,negotiateauth
 ac_add_options --enable-crypto
 ac_add_options --disable-composer
 ac_add_options --enable-single-profile