INTEGRATION: CWS rt10 (1.2.4); FILE MERGED

2005/05/30 14:46:23 rt 1.2.4.1: #i50051# Add makefile.mk to ADDITIONAL_FILES

1 files changed, 119 insertions, 104 deletions

diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index b785a246ae4f..7de798952935 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b1-src.patch
@@ -1,104 +1,119 @@
---- misc/build/BeanShell/build.xml	2003-12-19 17:04:47.000000000 +0000
-+++ misc/build/BeanShell/build.xml	2003-12-19 17:53:18.000000000 +0000
-@@ -17,7 +17,7 @@
- 		up the build dir!  It has to be done manually the first time (or put
- 		in the jar file). There must be a way to fix this...
- -->
--<project name="beanshell" default="compile" basedir=".">
-+<project name="beanshell" default="jarall" basedir=".">
- 
- <!-- Project Configuration -->
- 
-@@ -71,6 +71,9 @@
- 		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
- 	-->
- 
-+	<property name="exclude-bsf" 
-+		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
-+
- 	<!-- Uncomment to build without the ASM class generator code.
- 	<property name="exclude-classgen" 
- 		value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
-@@ -81,6 +84,9 @@
- 		value="bsh/servlet/*"/>
- 	-->
- 
-+	<property name="exclude-servlet" 
-+		value="bsh/servlet/*"/>
-+
- 	<!-- Legacy excludes.  Comment this *out* to build these legacy items -->
- 	<property name="legacy-excludes" 
- 		value="bsh/JThis.java"/>
---- misc/build/BeanShell/makefile.mk	1970-01-01 01:00:00.000000000 +0100
-+++ misc/build/BeanShell/makefile.mk	2003-12-19 17:04:47.000000000 +0000
-@@ -0,0 +1,70 @@
-+#*************************************************************************
-+#
-+#   $RCSfile: bsh-2.0b1-src.patch,v $
-+#
-+#   $Revision: 1.2 $
-+#
-+#   last change: $Author: kz $ $Date: 2005-03-01 13:13:04 $
-+#
-+#   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): _______________________________________
-+#
-+#
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..$/..$/..
-+PRJNAME=ooo_beanshell
-+TARGET=jarall
-+
-+.INCLUDE : ant.mk
-+
-+ALLTAR : ANTBUILD
-+
+*** misc/BeanShell/build.xml	Fri Dec 19 17:14:27 2003
+--- misc/build/BeanShell/build.xml	Mon May 30 15:47:00 2005
+***************
+*** 17,23 ****
+  		up the build dir!  It has to be done manually the first time (or put
+  		in the jar file). There must be a way to fix this...
+  -->
+! <project name="beanshell" default="compile" basedir=".">
+  
+  <!-- Project Configuration -->
+  
+--- 17,23 ----
+  		up the build dir!  It has to be done manually the first time (or put
+  		in the jar file). There must be a way to fix this...
+  -->
+! <project name="beanshell" default="jarall" basedir=".">
+  
+  <!-- Project Configuration -->
+  
+***************
+*** 71,76 ****
+--- 71,79 ----
+  		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
+  	-->
+  
++ 	<property name="exclude-bsf" 
++ 		value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
++ 
+  	<!-- Uncomment to build without the ASM class generator code.
+  	<property name="exclude-classgen" 
+  		value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
+***************
+*** 81,86 ****
+--- 84,92 ----
+  		value="bsh/servlet/*"/>
+  	-->
+  
++ 	<property name="exclude-servlet" 
++ 		value="bsh/servlet/*"/>
++ 
+  	<!-- Legacy excludes.  Comment this *out* to build these legacy items -->
+  	<property name="legacy-excludes" 
+  		value="bsh/JThis.java"/>
+*** misc/BeanShell/makefile.mk	Mon May 30 15:55:35 2005
+--- misc/build/BeanShell/makefile.mk	Mon May 30 15:47:00 2005
+***************
+*** 1 ****
+! dummy
+--- 1,70 ----
+! #*************************************************************************
+! #
+! #   $RCSfile: bsh-2.0b1-src.patch,v $
+! #
+! #   $Revision: 1.3 $
+! #
+! #   last change: $Author: hr $ $Date: 2005-06-06 17:24: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 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): _______________________________________
+! #
+! #
+! #
+! #*************************************************************************
+! 
+! PRJ=..$/..$/..$/..
+! PRJNAME=ooo_beanshell
+! TARGET=jarall
+! 
+! .INCLUDE : ant.mk
+! 
+! ALLTAR : ANTBUILD
+!