From fc8b07d0a196b67c5b6a8a5f3e5929dac0e4791a Mon Sep 17 00:00:00 2001 From: "bryner%uiuc.edu" Date: Fri, 18 Aug 2000 21:30:42 +0000 Subject: [PATCH] Removing obsolete files from the tree. r=law. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@76653 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/apprunner/makefile.win | 26 -- mozilla/xpfe/apprunner/public/makefile.win | 32 -- mozilla/xpfe/apprunner/public/nsIAppRunner.h | 45 -- mozilla/xpfe/apprunner/src/makefile.win | 62 --- .../xpfe/apprunner/src/nsAppRunnerImpl.cpp | 397 ------------------ mozilla/xpfe/apprunner/src/nsAppRunnerImpl.h | 98 ----- 6 files changed, 660 deletions(-) delete mode 100644 mozilla/xpfe/apprunner/makefile.win delete mode 100644 mozilla/xpfe/apprunner/public/makefile.win delete mode 100644 mozilla/xpfe/apprunner/public/nsIAppRunner.h delete mode 100644 mozilla/xpfe/apprunner/src/makefile.win delete mode 100644 mozilla/xpfe/apprunner/src/nsAppRunnerImpl.cpp delete mode 100644 mozilla/xpfe/apprunner/src/nsAppRunnerImpl.h diff --git a/mozilla/xpfe/apprunner/makefile.win b/mozilla/xpfe/apprunner/makefile.win deleted file mode 100644 index 78197b8426c..00000000000 --- a/mozilla/xpfe/apprunner/makefile.win +++ /dev/null @@ -1,26 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=..\.. - -DIRS=public src - -include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpfe/apprunner/public/makefile.win b/mozilla/xpfe/apprunner/public/makefile.win deleted file mode 100644 index ae2eb978add..00000000000 --- a/mozilla/xpfe/apprunner/public/makefile.win +++ /dev/null @@ -1,32 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=..\..\.. - - - -MODULE=raptor - -EXPORTS = nsIAppRunner.h \ - $(NULL) - -include <$(DEPTH)\config\rules.mak> - diff --git a/mozilla/xpfe/apprunner/public/nsIAppRunner.h b/mozilla/xpfe/apprunner/public/nsIAppRunner.h deleted file mode 100644 index f08051759f1..00000000000 --- a/mozilla/xpfe/apprunner/public/nsIAppRunner.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ -#ifndef nsIAppRunner_h__ -#define nsIAppRunner_h__ - -#include "nsISupports.h" - -// {5A298F60-939B-11d2-805C-00600811A9C3} -#define NS_IAPPRUNNER_IID \ - { 0x5a298f60, 0x939b, 0x11d2, \ - { 0x80, 0x5c, 0x0, 0x60, 0x8, 0x11, 0xa9, 0xc3 } }; - -// {5A298F60-939B-11d2-805C-00600811A9C3} -#define NS_APPRUNNER_CID \ - { 0x5a298f60, 0x939b, 0x11d2, \ - { 0x80, 0x5c, 0x0, 0x60, 0x8, 0x11, 0xa9, 0xc3 } }; - -class nsIAppRunner : public nsISupports { -public: - NS_DEFINE_STATIC_IID_ACCESSOR(NS_IAPPRUNNER_IID) - - NS_IMETHOD main( int argc, char *argv[] ) = 0; - -}; // nsIAppRunner - -#endif diff --git a/mozilla/xpfe/apprunner/src/makefile.win b/mozilla/xpfe/apprunner/src/makefile.win deleted file mode 100644 index 50bd502dc9e..00000000000 --- a/mozilla/xpfe/apprunner/src/makefile.win +++ /dev/null @@ -1,62 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Netscape 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/NPL/ -# -# 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.org code. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): - -DEPTH=..\..\.. - - -DEFINES=-D_IMPL_NS_APPRUNNER -DWIN32_LEAN_AND_MEAN -MODULE=raptor - -CPPSRCS= \ - nsAppRunnerImpl.cpp \ - $(NULL) - -CPP_OBJS= \ - .\$(OBJDIR)\nsAppRunnerImpl.obj \ - $(NULL) - -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\base \ - $(NULL) - -MAKE_OBJ_TYPE = DLL -DLLNAME = nsapprunner -DLL=.\$(OBJDIR)\$(DLLNAME).dll - -LCFLAGS = \ - $(LCFLAGS) \ - $(DEFINES) \ - $(NULL) - -LLIBS= \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) \ - $(NULL) - -include <$(DEPTH)\config\rules.mak> - -install:: $(DLL) - $(MAKE_INSTALL) $(DLL) $(DIST)\bin - -clobber:: - rm -f $(DIST)\bin\$(DLLNAME).dll diff --git a/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.cpp b/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.cpp deleted file mode 100644 index c8db0cc114b..00000000000 --- a/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.cpp +++ /dev/null @@ -1,397 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ - -#include -#include - -#include "nsAppRunnerImpl.h" -#include "nsIAppShellService.h" -#include "nsIComponentManager.h" -#include "nsIServiceManager.h" -#include "xp_core.h" -#include "xp_mcom.h" -#include "xp_str.h" - -// Define Class IDs. -static NS_DEFINE_IID(kAppRunnerCID, NS_APPRUNNER_CID); - -// Define Interface IDs. -static NS_DEFINE_IID(kIAppRunnerIID, NS_IAPPRUNNER_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); - -// Generate implementation of nsISupports stuff. -NS_IMPL_ISUPPORTS(nsAppRunner, kIAppRunnerIID); - -// ctor -nsAppRunner::nsAppRunner() - : mArgc( 0 ), mArg( 0 ) { - NS_INIT_REFCNT(); -} - -// dtor -nsAppRunner::~nsAppRunner() { - delete [] mArg; -} - -/*---------------------------- nsAppRunner::main ------------------------------- -| Initialize, then load and run the app shell. All work is farmed out to | -| virtual functions to enable customization. | | -------------------------------------------------------------------------------*/ -NS_IMETHODIMP -nsAppRunner::main( int argc, char *argv[] ) { -#if 0 - fprintf( stdout, "nsAppRunner::main entered\n" ); - - for ( int i = 0; i < argc; i++ ) { - fprintf( stdout, "\targv[%d] = %s\n", i, argv[i] ); - } - - return NS_OK; -#else - nsresult rv = Initialize(); - - if ( rv == NS_OK ) { - // Load app shell. - rv = LoadAppShell(); - - if ( rv == NS_OK ) { - // Execute the shell. - rv = AppShell()->Initialize(); - - if ( rv == NS_OK ) { - // Run the shell. - rv = AppShell()->Run(); - - // Shut it down. - AppShell()->Shutdown(); - - if ( rv != NS_OK ) { - DisplayMsg( "nsAppRunner error", "app shell failed to run, rv=0x%lX", rv ); - } - } else { - DisplayMsg( "nsAppRunner error", "app shell initialization failed, rv=0x%lX", rv ); - } - } else { - char *cid = AppShellCID().ToString(); - DisplayMsg( "nsAppRunner error", "Unable to load app shell (CID=%s), rv=0x%lX", cid, rv ); - delete [] cid; - } - } else { - DisplayMsg( "nsAppRunner error", "Initialize failed, rv=0x%lX", rv ); - } - - return rv; -#endif -} - - -/*---------------------- NSAppRunner::ParseCommandLine ------------------------- -| Store the command line arguments in data members with minor twiddling to | -| simplify lookup. | -------------------------------------------------------------------------------*/ -PRBool nsAppRunner::ParseCommandLine( int argc, char *argv[] ) { - mArgc = argc; - - // Allocate array of arg info structures. - mArg = new Arg[ mArgc ]; - - // Fill in structures. - for( int i = 0; i < mArgc; i++ ) { - char *p = argv[i]; - - // "Key" is always the beginning - mArg[i].key = p; - - // Bump pointer till we get to null or double quote. - while ( *p && *p != '"' ) { - p++; - } - - // If not null, get value. - if ( *p ) { - *p++ = 0; // Terminate key and advance pointer. - - // Value starts here. - mArg[i].value = p; - - // Strip trailing '"'. - if ( p[ XP_STRLEN(p) ] == '"' ) { - p[ XP_STRLEN(p) ] = 0; - } - } else { - // Have value point to this null string. - mArg[i].value = p; - } - - } - - return PR_TRUE; -} - - -/*------------------------- nsAppRunner::IndexOfArg ---------------------------- -| Return index of specified argument "key." -1 if not found. | -------------------------------------------------------------------------------*/ -int nsAppRunner::IndexOfArg( const char *key, PRBool ignoreCase ) { - int result = -1; - for( int i = 0; result == -1 && i < mArgc; i++ ) { - if ( ( ignoreCase && XP_STRCASECMP( key, mArg[i].key ) == 0 ) - || - ( !ignoreCase && XP_STRCMP( key, mArg[i].key ) == 0 ) ) { - result = i; - } - } - return result; -} - - -/*---------------------- nsAppRunner::IsOptionSpecified ------------------------ -| Search for key via IndexOfArg and return true iff it is found. | -------------------------------------------------------------------------------*/ -PRBool nsAppRunner::IsOptionSpecified( const char *key, PRBool ignoreCase ) { - int index = this->IndexOfArg( key, ignoreCase ); - return index != -1; -} - -/*----------------------- nsAppRunner::*ValueForOption ------------------------- -| Search for key via IndexOfArg and return corresponding value if it is found, | -| 0 otherwise. | -------------------------------------------------------------------------------*/ -const char *nsAppRunner::ValueForOption( const char *key, PRBool ignoreCase ) { - const char *result = 0; - int index = this->IndexOfArg( key, ignoreCase ); - if ( index != -1 ) { - result = mArg[ index ].value; - } - return result; -} - - -/*------------------------- nsAppRunner::Initialize ---------------------------- -| Default simply returns NS_OK. | -------------------------------------------------------------------------------*/ -nsresult nsAppRunner::Initialize() { - return NS_OK; -} - - -/*--------------------------- nsAppRunner::OnExit ------------------------------ -| Default simply returns the input application return value unmodified. | -------------------------------------------------------------------------------*/ -nsresult nsAppRunner::OnExit( nsresult rvIn ) { - return rvIn; -} - - -/*------------------------- nsAppRunner::AppShellCID --------------------------- -| Return the CID for nsAppShell. Long term, get this ID dynamically? | -------------------------------------------------------------------------------*/ -nsCID nsAppRunner::AppShellCID() const { - nsCID appShellCID = NS_APPSHELL_SERVICE_CID; - return appShellCID; -} - - -/*------------------------ nsAppRunner::LoadAppShell --------------------------- -| Create an instance of the app shell (object of class represented by | -| the CID returned by AppShellCID). | -------------------------------------------------------------------------------*/ -nsresult nsAppRunner::LoadAppShell() { - nsIAppShellService *appShell = 0; - nsIID kIAppShellServiceIID = NS_IAPPSHELL_SERVICE_IID; - nsresult rv = nsServiceManager::GetService( this->AppShellCID(), - kIAppShellServiceIID, - (nsISupports**)&appShell ); - if ( rv == NS_OK ) { - this->SetAppShell( appShell ); - NS_IF_RELEASE( appShell ); - } - - return rv; -} - - -/*-------------------------- nsAppRunner::RunShell ----------------------------- -| Run the app shell. | -------------------------------------------------------------------------------*/ -nsresult nsAppRunner::RunShell() { - nsresult result = this->mAppShell->Run(); - return result; -} - - -/*-------------------------- nsAppRunner::*AppShell ---------------------------- -| Return the app shell associated with this app runner. | -------------------------------------------------------------------------------*/ -nsIAppShellService *nsAppRunner::AppShell() const { - return mAppShell; -} - - -/*------------------------- nsAppRunner::DisplayMsg ---------------------------- -| Write out the title and text to stderr. | -------------------------------------------------------------------------------*/ -void nsAppRunner::DisplayMsg( const char *title, const char *text ) { - fprintf( stderr, "%s\n", title ); - fprintf( stderr, "%s\n", text ); - return; -} - - -/*------------------------- nsAppRunner::DisplayMsg ---------------------------- -| Use svprintf to expand the text+args then display the complete text using | -| the overloaded version of nsAppRunner::DisplayMsg(). | -------------------------------------------------------------------------------*/ -static void displayMsg( nsAppRunner &obj, const char *title, const char *text, va_list args ) { - // Fix this later. - obj.DisplayMsg( title, text ); - return; -} - - -/*------------------------- nsAppRunner::DisplayMsg ---------------------------- -| Convert the extra arguments to a vargs list and invoke the static function | -| that takes one of those. | -------------------------------------------------------------------------------*/ -void nsAppRunner::DisplayMsg( const char *title, const char *text, ... ) { - va_list args; - va_start( text, args ); - this->DisplayMsg( title, text, args ); - va_end( args ); - return; -} - - -/*------------------------ nsAppRunner::&SetAppShell --------------------------- -| Simply do as directed, return *this. | -------------------------------------------------------------------------------*/ -nsAppRunner &nsAppRunner::SetAppShell( nsIAppShellService *newAppShell ) { - // Bump refcount for new shell. - newAppShell->AddRef(); - - // Release current app shell. - NS_IF_RELEASE(this->mAppShell); - - // Attach new one. - this->mAppShell = newAppShell; - - return *this; -} - - -#if 0 -// nsAppRunnerFactory -// -// Means by which instances are created via nsComponentManager. -// This code is somewhat temporary as the CreateInstance should really -// go in platform-specific code in order to create an instance specific -// to the platform on which we're running. -class nsAppRunnerFactory : public nsIFactory { -public: - NS_DECL_ISUPPORTS - - nsAppRunnerFactory(); - - // nsIFactory methods - NS_IMETHOD CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult); - - NS_IMETHOD LockFactory(PRBool aLock); - -protected: - virtual ~nsAppRunnerFactory(); -}; - - -nsAppRunnerFactory::nsAppRunnerFactory() { - NS_INIT_REFCNT(); -} - -nsAppRunnerFactory::~nsAppRunnerFactory() { -} - -NS_IMPL_ISUPPORTS(nsAppRunnerFactory, kIFactoryIID); - -NS_IMETHODIMP -nsAppRunnerFactory::CreateInstance(nsISupports *aOuter, - const nsIID &aIID, - void **aResult) { - nsresult rv = NS_OK; - nsAppRunner* newAppRunner; - - if (aResult == NULL) { - return NS_ERROR_NULL_POINTER; - } else { - *aResult = NULL; - } - - if (0 != aOuter) { - return NS_ERROR_NO_AGGREGATION; - } - - NS_NEWXPCOM(newAppRunner, nsAppRunner); - - if (newAppRunner == NULL) { - return NS_ERROR_OUT_OF_MEMORY; - } - - NS_ADDREF(newAppRunner); - rv = newAppRunner->QueryInterface(aIID, aResult); - NS_RELEASE(newAppRunner); - - return rv; -} - -nsresult -nsAppRunnerFactory::LockFactory(PRBool aLock) -{ - // Not implemented in simplest case. - return NS_OK; -} - -extern "C" NS_EXPORT nsresult -NSGetFactory(nsISupports* serviceMgr, - const nsCID &aClass, - const char *aClassName, - const char *aProgID, - nsIFactory **aFactory) -{ - nsresult rv = NS_OK; - - if ( aFactory == 0 ) { - return NS_ERROR_NULL_POINTER; - } else { - *aFactory = 0; - } - - nsIFactory* inst = new nsAppRunnerFactory(); - if (0 == inst) { - rv = NS_ERROR_OUT_OF_MEMORY; - } else { - NS_ADDREF(inst); - *aFactory = inst; - } - - return rv; -} -#endif diff --git a/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.h b/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.h deleted file mode 100644 index b549690152a..00000000000 --- a/mozilla/xpfe/apprunner/src/nsAppRunnerImpl.h +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Netscape 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/NPL/ - * - * 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 Communicator client code. - * - * The Initial Developer of the Original Code is Netscape Communications - * Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - */ -#ifndef nsAppRunner_h__ -#define nsAppRunner_h__ - -#include "nsIAppRunner.h" -#include "nsIFactory.h" - -class string; -class nsIAppShellService; - -// nsAppRunner -// -// Implements nsIAppRunner interface. -// -class nsAppRunner : public nsIAppRunner -{ -public: -// nsISupports interface implementation. - NS_DECL_ISUPPORTS - -// nsIAppRunner interface implementation. - NS_IMETHOD main( int argc, char *argv[] ); - -// Implementation - // ctor - nsAppRunner(); - - // Access command line options: - // ParseCommandLineOptions - Parses command line options. - // IsOptionSpecified - Returns PR_TRUE if switch was present in command line args. - // ValueForOption - Returns option value; e.g., -P"mozilla" -> string("mozilla") - virtual PRBool ParseCommandLine( int argc, char *argv[] ); - virtual PRBool IsOptionSpecified( const char *key, PRBool ignoreCase = PR_TRUE ); - virtual const char *ValueForOption( const char *key, PRBool ignoreCase = PR_TRUE ); - - // Process management: - // Initialize - Initialization; default does nothing. - // OnExit - Called just prior to exit; default returns - // input argument. - virtual nsresult Initialize(); - virtual nsresult OnExit( nsresult rvIn ); - - // AppShell loading: - // AppShellCID - Returns CID for app shell to be loaded/started. - // LoadAppShell - Default creates appShell from ServiceManager using - // AppShellCID(). - // RunShell - Initialize/Run/Shutdown the app shell - // AppShell - Returns pointer to app shell - virtual nsCID AppShellCID() const; - virtual nsresult LoadAppShell(); - virtual nsresult RunShell(); - virtual nsIAppShellService *AppShell() const; - - // Utilities: - // DisplayMsg - Displays error/status message. Default is to outpout to - // stderr. Override to put up message box, etc. - virtual void DisplayMsg( const char *title, const char *text ); - void DisplayMsg( const char *title, const char *text, ... ); - -protected: - virtual ~nsAppRunner(); - - // Utilities (for derived classes): - // SetAppShell - Sets the mAppShell member (to whom things like RunShell() are - // delegated). - virtual nsAppRunner &SetAppShell( nsIAppShellService *newAppShellService ); - -private: - int mArgc; - struct Arg { - const char *key; - const char *value; - } *mArg; - nsIAppShellService *mAppShell; - int IndexOfArg( const char *key, PRBool ignoreCase ); -}; // nsAppRunner - -#endif