Clean up after movement of tools to soltools and rsc

2 files changed, 14 insertions, 397 deletions

diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
index 9dab5e927475..74914ba985e6 100644
--- a/tools/bootstrp/makefile.mk
+++ b/tools/bootstrp/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: nf $ $Date: 2001-04-18 10:45:55 $
+#   last change: $Author: nf $ $Date: 2001-04-30 14:40:17 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,15 +89,13 @@ OBJFILES=                       \
     $(OBJ)$/cppdep.obj      \
     $(OBJ)$/command.obj     \
     $(OBJ)$/prj.obj         \
-    $(OBJ)$/dlvclass.obj    \
     $(OBJ)$/errdumm.obj     \
     $(OBJ)$/errhdl.obj      \
-    $(OBJ)$/hedabu.obj      \
     $(OBJ)$/inimgr.obj      \
     $(OBJ)$/revision.obj    \
     $(OBJ)$/shellprp.obj 	\
-    $(OBJ)$/minormk.obj 	\
-    $(OBJ)$/fattr.obj
+    $(OBJ)$/fattr.obj 		\
+    $(OBJ)$/minormk.obj 	
 
 SLOFILES=                   \
     $(SLO)$/sstring.obj     \
@@ -105,15 +103,13 @@ SLOFILES=                   \
     $(SLO)$/cppdep.obj      \
     $(SLO)$/command.obj     \
     $(SLO)$/prj.obj         \
-    $(SLO)$/dlvclass.obj    \
     $(SLO)$/errdumm.obj     \
     $(SLO)$/errhdl.obj      \
-    $(SLO)$/hedabu.obj      \
     $(SLO)$/inimgr.obj      \
     $(SLO)$/revision.obj    \
     $(SLO)$/shellprp.obj 	\
-    $(SLO)$/minormk.obj 	\
-    $(SLO)$/fattr.obj
+    $(SLO)$/fattr.obj 		\
+    $(SLO)$/minormk.obj 	
 
 LIB1TARGET= $(LB)$/btstrp.lib
 LIB1ARCHIV= $(LB)$/libbtstrp.a
@@ -141,28 +137,22 @@ APP2STDLIBS=$(STATIC_LIBS)
 APP2LIBS=       $(LB)$/bootstrp.lib
 APP2DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
 
-APP3TARGET=rscdep
-APP3OBJS=   $(OBJ)$/rscdep.obj
+APP3TARGET=mkcreate
+APP3OBJS=   $(OBJ)$/mkcrexe.obj $(OBJ)$/mkcreate.obj
 APP3STDLIBS=$(STATIC_LIBS)
 APP3LIBS=       $(LB)$/bootstrp.lib
 APP3DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
 
-APP4TARGET=mkcreate
-APP4OBJS=   $(OBJ)$/mkcrexe.obj $(OBJ)$/mkcreate.obj
+APP4TARGET=     setsolar
+APP4OBJS=   $(OBJ)$/setsolar.obj $(OBJ)$/envset.obj $(OBJ)$/vermap.obj
 APP4STDLIBS=$(STATIC_LIBS)
 APP4LIBS=       $(LB)$/bootstrp.lib
 APP4DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
 
-APP5TARGET=     setsolar
-APP5OBJS=   $(OBJ)$/setsolar.obj $(OBJ)$/envset.obj $(OBJ)$/vermap.obj
-APP5STDLIBS=$(STATIC_LIBS)
-APP5LIBS=       $(LB)$/bootstrp.lib
-APP5DEPN=   $(LB)$/atools.lib $(LB)$/bootstrp.lib
-
-APP6TARGET= zipdep
-APP6OBJS=	$(OBJ)$/zipdep.obj
-APP6LIBS=	$(LB)$/bootstrp.lib
-APP6STDLIBS=$(STATIC_LIBS) 
+APP5TARGET= zipdep
+APP5OBJS=	$(OBJ)$/zipdep.obj
+APP5LIBS=	$(LB)$/bootstrp.lib
+APP5STDLIBS=$(STATIC_LIBS) 
 
 
 DEPOBJFILES		=	$(APP1OBJS) $(APP2OBJS) $(APP3OBJS) $(APP4OBJS) $(APP5OBJS) $(APP6OBJS) 
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
deleted file mode 100644
index b6375aefa84e..000000000000
--- a/tools/bootstrp/rscdep.cxx
+++ /dev/null
@@ -1,373 +0,0 @@
-/*************************************************************************
- *
- *  $RCSfile: rscdep.cxx,v $
- *
- *  $Revision: 1.4 $
- *
- *  last change: $Author: jmarmion $ $Date: 2000-10-20 15:04:32 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source 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.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************/
-/***************************************************************
-*
-*   rscdep.cxx
-*
-*   (c) Martin Hollmichel 1998
-*
-***************************************************************/
-
-#ifdef WNT
-#define __STDC__ 1
-#ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
-#else
-#include <glibc/getopt.h>
-#endif
-#endif
-#ifdef UNX
-#ifdef BOOTSTRAPPER
-#ifndef SOLARIS
-#include <glibc/posix/getopt.h>
-#endif
-#ifdef MACOSX
-#include <glibc/posix/getopt.h>
-#endif
-#else
-#include <glibc/config.h>
-#ifndef SOLARIS
-#include <glibc/getopt.h>
-#endif
-#endif
-#endif
-
-#if defined(SOLARIS)
-extern "C" {
-struct option
-{
-    char* name;
-    int has_arg;
-    int* flagl;
-    int val;
-};
-extern int getopt_long( int, char* const*, const char *, const struct option*, int *);
-}
-#endif
-
-#ifdef UNX
-#include <unistd.h>
-#endif
-
-#include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "prj.hxx"
-
-#if SUPD < 356
-#include <tools.hxx>
-#else
-#include <string.hxx>
-#include <list.hxx>
-#include <fsys.hxx>
-#include <stream.hxx>
-#endif
-
-#include "cppdep.hxx"
-
-class RscHrcDep : public CppDep
-{
-public:
-                    RscHrcDep();
-    virtual         ~RscHrcDep();
-
-    virtual void    Execute();
-};
-
-RscHrcDep::RscHrcDep()  :
-    CppDep()
-{
-}
-
-RscHrcDep::~RscHrcDep()
-{
-}
-
-void RscHrcDep::Execute()
-{
-    CppDep::Execute();
-}
-
-static String aDelim = DirEntry::GetAccessDelimiter();
-
-int
-#ifdef WNT
-_cdecl
-#endif
-main( int argc, char **argv )
-{
-    int c;
-    int digit_optind = 0;
-    char aBuf[255];
-    char pOutputFileName[255];
-    String aSrsBaseName;
-    BOOL bSource = FALSE;
-    ByteString aRespArg;
-
-    RscHrcDep *pDep = new RscHrcDep;
-
-    for ( int i=1; i<argc; i++)
-    {
-        strcpy( aBuf, (const char *)argv[i] );
-        if ( aBuf[0] == '-' && aBuf[1] == 'f' && aBuf[2] == 'o' )
-        {
-            strcpy(pOutputFileName, &aBuf[3]);
-            //break;
-        }
-        if ( aBuf[0] == '-' && aBuf[1] == 'f' && aBuf[2] == 'p' )
-        {
-            strcpy(pOutputFileName, &aBuf[3]);
-            String aName( pOutputFileName, gsl_getSystemTextEncoding());
-            USHORT nPos = 0;
-            DirEntry aDest( aName );
-            aSrsBaseName = aDest.GetBase();
-            //break;
-        }
-        if (aBuf[0] == '-' &&  aBuf[1] == 'i' )
-        {
-            //printf("Include : %s\n", &aBuf[2] );
-            pDep->AddSearchPath( &aBuf[2] );
-        }
-        if (aBuf[0] == '-' &&  aBuf[1] == 'I' )
-        {
-            //printf("Include : %s\n", &aBuf[2] );
-            pDep->AddSearchPath( &aBuf[2] );
-        }
-        if (aBuf[0] == '@' )
-        {
-            ByteString aToken;
-            String aRespName( &aBuf[1], gsl_getSystemTextEncoding());
-            SimpleConfig aConfig( aRespName );
-            while ( (aToken = aConfig.GetNext()) != "")
-            {
-                char aBuf2[255];
-                (void) strcpy( aBuf2, aToken.GetBuffer());
-                if ( aBuf2[0] == '-' && aBuf2[1] == 'f' && aBuf2[2] == 'o' )
-                {
-                    strcpy(pOutputFileName, &aBuf2[3]);
-                    //break;
-                }
-                if ( aBuf2[0] == '-' && aBuf2[1] == 'f' && aBuf2[2] == 'p' )
-                {
-                    strcpy(pOutputFileName, &aBuf2[3]);
-                    String aName( pOutputFileName, gsl_getSystemTextEncoding());
-                    USHORT nPos = 0;
-                    DirEntry aDest( aName );
-                    aSrsBaseName = aDest.GetBase();
-                    //break;
-                }
-                if (aBuf2[0] == '-' &&  aBuf2[1] == 'i' )
-                {
-                    //printf("Include : %s\n", &aBuf[2] );
-                    pDep->AddSearchPath( &aBuf2[2] );
-                }
-                if (aBuf2[0] == '-' &&  aBuf2[1] == 'I' )
-                {
-                    //printf("Include : %s\n", &aBuf[2] );
-                    pDep->AddSearchPath( &aBuf2[2] );
-                }
-                if (( aBuf2[0] != '-' ) && ( aBuf2[0] != '@' ))
-                {
-                    pDep->AddSource( &aBuf2[0] );
-                    aRespArg += " ";
-                    aRespArg += &aBuf2[0];
-                    bSource = TRUE;
-                }
-            }
-        }
-    }
-
-    while( 1 )
-    {
-        int this_option_optind = optind ? optind : 1;
-        int option_index = 0;
-
-                static struct option long_options[] =
-                {
-                        {"add",1,0,0},
-                        {0,0,0,0}
-                };
-
-        c = getopt_long( argc, argv,
-        "_abcdefghi:jklmnopqrstuvwxyzABCDEFGHI:JKLMNOPQRSTUVWXYZ1234567890/-+=.\\()\"",
-                long_options, &option_index );
-        if ( c == -1 )
-            break;
-
-        switch( c )
-        {
-            case 0:
-#ifdef DEBUG_VERBOSE
-                printf("option %s", long_options[option_index].name);
-                if ( optarg)
-                    printf(" with arg %s", optarg );
-                printf("\n");
-#endif
-                break;
-            case 'a' :
-#ifdef DEBUG_VERBOSE
-                printf("option a\n");
-#endif
-                break;
-
-            case 'l' :
-#ifdef DEBUG_VERBOSE
-                printf("option l with Value %s\n", optarg );
-#endif
-                pDep->AddSource( optarg );
-                break;
-
-            case 'h' :
-            case 'H' :
-            case '?' :
-                printf("RscDep 1.0 (c)2000 StarOffice\n");
-                break;
-
-            default:
-#ifdef DEBUG_VERBOSE
-                printf("Unknown getopt error\n");
-#endif
-                ;
-        }
-    }
-
-
-    DirEntry aEntry(".");
-    aEntry.ToAbs();
-    String aCwd = aEntry.GetName();
-/*  USHORT nPos;
-#ifndef UNX
-    while ( (nPos = aCwd.Search('\\') != STRING_NOTFOUND  ))
-#else
-    while ( (nPos = aCwd.Search('/') != STRING_NOTFOUND  ))
-#endif
-    {
-        String attt = aCwd.Copy( 0, nPos );
-        aCwd.Erase( 0, nPos );
-    } */
-    SvFileStream aOutStream;
-    String aOutputFileName( pOutputFileName, gsl_getSystemTextEncoding());
-    DirEntry aOutEntry( aOutputFileName );
-    String aOutPath = aOutEntry.GetPath().GetFull();
-
-    String aFileName( aOutPath );
-    aFileName += aDelim;
-    aFileName += aCwd;
-    aFileName += String(".", gsl_getSystemTextEncoding());
-    aFileName += aSrsBaseName;
-    aFileName += String(".dpr", gsl_getSystemTextEncoding());
-    //fprintf( stderr, "OutFileName : %s \n",aFileName.GetStr());
-    aOutStream.Open( aFileName, STREAM_WRITE );
-
-    ByteString aString;
-    if ( optind < argc )
-    {
-#ifdef DEBUG_VERBOSE
-        printf("further arguments : ");
-#endif
-        aString = ByteString( pOutputFileName );
-        aString += ByteString(" : " );
-
-        while ( optind < argc )
-        {
-            if (!bSource )
-            {
-                aString += ByteString(" " );
-                aString += ByteString( argv[optind]);
-                pDep->AddSource( argv[optind++]);
-            }
-            else
-            {
-                optind++;
-            }
-        }
-    }
-    aString += aRespArg;
-    pDep->Execute();
-    ByteStringList *pLst = pDep->GetDepList();
-    ULONG nCount = pLst->Count();
-    if ( nCount == 0 )
-    {
-        aOutStream.WriteLine( aString );
-    }
-    else
-    {
-        aString += ByteString( "\\" );
-        aOutStream.WriteLine( aString );
-    }
-
-    for ( ULONG j=0; j<nCount; j++ )
-    {
-        ByteString *pStr = pLst->GetObject(j);
-        if ( j != (nCount-1) )
-            *pStr += ByteString( "\\" );
-        aOutStream.WriteLine( *pStr );
-    }
-    delete pDep;
-    aOutStream.Close();
-
-    return 0;
-}
-
-
-
-