diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-01-30 06:16:25 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2002-01-30 06:16:25 +0000 |
commit | f745f198e5e086910804697226f126f39835147d (patch) | |
tree | ea697d9593a068f3e6bc42c3687b475ec7f999ba /solenv/bin/merge2top | |
parent | 4784e8a93930ad156e9fc54a334882c7aff7fdd5 (diff) |
initial revision
Diffstat (limited to 'solenv/bin/merge2top')
-rwxr-xr-x | solenv/bin/merge2top | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/solenv/bin/merge2top b/solenv/bin/merge2top new file mode 100755 index 000000000000..6f7d72ae8eca --- /dev/null +++ b/solenv/bin/merge2top @@ -0,0 +1,73 @@ +#!/bin/sh +#************************************************************************* +# +# $RCSfile: merge2top,v $ +# +# $Revision: 1.1 $ +# +# last change: $Author: hr $ $Date: 2002-01-30 07:16:25 $ +# +# 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): _______________________________________ +# +# +# +#************************************************************************* + +# +# merge2top - merge branch into top level revision, shell wrapper +# + + +if [ x${SOLARENV}x = 'xx' ]; then + echo "Please configure environment with setsolar" + exit 1 +fi +perl -I${SOLARENV}/modules ${SOLARENV}/merge2top.pl "$@" |