Author: pfg
Date: Sun Jan 11 20:32:21 2015
New Revision: 1650962
URL: http://svn.apache.org/r1650962
Log:
Beanshell 2.0b5 update
The Beanshell source code has been licensed to the Apache Software
Foundation under a SGA. Huge thanks to Patrick Niemeyer for making
this software available under an Apache License version 2.
Added:
openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch
- copied, changed from r1650955,
openoffice/trunk/main/beanshell/bsh-2.0b1-src.patch
Removed:
openoffice/trunk/main/beanshell/bsh-2.0b1-src.patch
Modified:
openoffice/trunk/main/beanshell/makefile.mk
openoffice/trunk/main/external_deps.lst
Copied: openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch (from r1650955,
openoffice/trunk/main/beanshell/bsh-2.0b1-src.patch)
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch?p2=openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch&p1=openoffice/trunk/main/beanshell/bsh-2.0b1-src.patch&r1=1650955&r2=1650962&rev=1650962&view=diff
==============================================================================
--- openoffice/trunk/main/beanshell/bsh-2.0b1-src.patch (original)
+++ openoffice/trunk/main/beanshell/bsh-2.0b5-src.patch Sun Jan 11 20:32:21 2015
@@ -62,16 +62,3 @@
+
+ALLTAR : ANTBUILD
+
---- misc/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Dec 19 17:14:28 2003
-+++ misc/build/BeanShell/src/bsh/ClassGeneratorUtil.java Fri Mar 28
15:55:05 2008
-@@ -34,7 +34,9 @@
- package bsh;
-
- import bsh.org.objectweb.asm.*;
--import java.lang.reflect.*;
-+import java.lang.reflect.Constructor;
-+import java.lang.reflect.InvocationTargetException;
-+import java.lang.reflect.Method;
- import java.util.ArrayList;
- import java.util.List;
-
Modified: openoffice/trunk/main/beanshell/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/beanshell/makefile.mk?rev=1650962&r1=1650961&r2=1650962&view=diff
==============================================================================
--- openoffice/trunk/main/beanshell/makefile.mk (original)
+++ openoffice/trunk/main/beanshell/makefile.mk Sun Jan 11 20:32:21 2015
@@ -44,10 +44,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=bsh-2.0b1-src
-TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
+TARFILE_NAME=bsh-2.0b5-src
+TARFILE_MD5=ec1941a74d3ef513c4ce57a9092b74e1
TARFILE_ROOTDIR=BeanShell
-PATCH_FILES=bsh-2.0b1-src.patch
+PATCH_FILES=bsh-2.0b5-src.patch
ADDITIONAL_FILES=makefile.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1650962&r1=1650961&r2=1650962&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sun Jan 11 20:32:21 2015
@@ -252,6 +252,11 @@ if (RAT_JAR_HOME==BUILD)
URL1 = http://archive.apache.org/dist/creadur/apache-rat-0.10/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+if (SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
+ MD5 = ec1941a74d3ef513c4ce57a9092b74e1
+ name = bsh-2.0b5-src.zip
+ URL1 =
http://svn.codespot.com/a/apache-extras.org/beanshell/src_releases/$(name)
+
###############################################################################
# Libraries with category B license
#
@@ -323,10 +328,3 @@ if (ENABLE_CATEGORY_B==YES && SYSTEM_GRA
name = silgraphite-2.3.1.tar.gz
URL1 =
http://sourceforge.net/projects/silgraphite/files/silgraphite/2.3.1/silgraphite-2.3.1.tar.gz/download
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-
-if (ENABLE_CATEGORY_B==YES && SOLAR_JAVA==TRUE && SYSTEM_BSH!=YES)
- MD5 = ea570af93c284aa9e5621cd563f54f4d
- name = bsh-2.0b1-src.tar.gz
- # This used to be the original host, but the link is broken.
- # URL1 = http://www.beanshell.org/bsh-2.0b1-src.zip
- URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
