beanshell/bsh-2.0b1-src.patch | 77 ------------------------------------------
beanshell/bsh-2.0b5-src.patch | 64 ++++++++++++++++++++++++++++++++++
beanshell/makefile.mk | 6 +--
beanshell/prj/d.lst | 2 -
external_deps.lst | 12 ++----
5 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit 87f6fe9767e845419b8e55ab524aa831b5372f4e
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Jan 11 20:54:52 2015 +0000
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.
diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst
index 6614623..0fb8c47 100644
--- a/beanshell/prj/d.lst
+++ b/beanshell/prj/d.lst
@@ -1 +1 @@
-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar
+..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b5.jar %_DEST%\bin%_EXT%\bsh.jar
commit 58e32ec03eec9cd1cf68e384b5cade00a71d364a
Author: Pedro Giffuni <p...@apache.org>
Date: Sun Jan 11 20:32:21 2015 +0000
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.
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b5-src.patch
similarity index 84%
rename from beanshell/bsh-2.0b1-src.patch
rename to beanshell/bsh-2.0b5-src.patch
index 2d2963f..d81758f 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b5-src.patch
@@ -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;
-
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index d11515ee..c163f74 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -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
diff --git a/external_deps.lst b/external_deps.lst
index c32029c..d1d0272 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -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_GRAPHITE!=YES &&
ENABLE_GRAPHITE==TRUE)
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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
