INTEGRATION: CWS ooo20030412 (1.1.72); FILE MERGED

2003/04/01 15:47:24 mh 1.1.72.1: fix: some nasty bugs, #i12100#

1 files changed, 68 insertions, 8 deletions

diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index cae26f905e21..4c20e8abd456 100644
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -5,7 +5,61 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 #   $RCSfile: gccinstlib.pl,v $
 #
-# ... massive header block to go here ...
+#   $Revision: 1.2 $
+#
+#   last change: $Author: hr $ $Date: 2003-04-28 16:41:16 $
+#
+#   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 WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRUNTIES 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): Michael Meeks
+#
+#
 #
 #*************************************************************************
 
@@ -17,17 +71,23 @@ $LibPaths = $SearchDirs{'libraries'} || die 'Foo';
 
 $Dest = pop(@ARGV) || die "No destination to copy to";
 
-if ($Dest =~ /--help/) {
-    printf ("Syntax:\n  gcc-copy <libraries-in-libpath> <dest-directory>\n");
+if ($Dest =~ /--help/ || @ARGV < 1) {
+    printf ("Syntax:\n  gcc-instlib <library-in-libpath ...>
+        <destination-dir>\n");
     exit (0);
 }
-
-foreach $Path (@Paths) {
-    foreach $File (@ARGV) {
+foreach $File (@ARGV) {
+   my $found = 0;
+   foreach $Path (@Paths) {
         if ( -e $Path.$File) {
-            push (@CopySrc, $Path.$File);
+           push (@CopySrc, $Path.$File);
+           $found = 1;
+           last;
         }
-    }
+   }
+   if (!$found) {
+           die "Couldn't find file $File in path\n";
+   }
 }
 
 foreach $Src (@CopySrc) {