diff options
Diffstat (limited to 'beanshell')
| -rw-r--r-- | beanshell/bsh-2.0b5-src.patch (renamed from beanshell/bsh-2.0b1-src.patch) | 41 | ||||
| -rw-r--r-- | beanshell/makefile.mk | 8 | ||||
| -rw-r--r-- | beanshell/prj/d.lst | 2 |
3 files changed, 19 insertions, 32 deletions
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b5-src.patch index 2d2963f81228..04aa72171d4a 100644 --- a/beanshell/bsh-2.0b1-src.patch +++ b/beanshell/bsh-2.0b5-src.patch @@ -1,16 +1,16 @@ ---- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003 -+++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008 -@@ -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... +--- misc/BeanShell-2.0b5/build.xml Fri Dec 19 17:14:27 2003 ++++ misc/build/BeanShell-2.0b5/build.xml Fri Mar 28 15:55:04 2008 +@@ -10,7 +10,7 @@ + - Why can't I nest filesets? This seems like it would be so easy and + useful... --> -<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"/> +@@ -65,6 +65,9 @@ + <property name="exclude-engine" value="bsh/engine/**"/> --> + <property name="exclude-bsf" @@ -19,18 +19,18 @@ <!-- 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"/> -@@ -80,6 +83,9 @@ - <property name="exclude-servlet" +@@ -75,6 +78,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" ---- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008 -+++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008 + <property name="excludes-legacy" + value="bsh/JThis.java"/> +--- misc/BeanShell-2.0b5/makefile.mk Fri Mar 28 15:56:40 2008 ++++ misc/build/BeanShell-2.0b5/makefile.mk Fri Mar 28 15:56:06 2008 @@ -1 +1,29 @@ -dummy +#************************************************************** @@ -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 d11515ee7c06..5bf174aba294 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_ROOTDIR=BeanShell -PATCH_FILES=bsh-2.0b1-src.patch +TARFILE_NAME=bsh-2.0b5-src +TARFILE_MD5=ec1941a74d3ef513c4ce57a9092b74e1 +TARFILE_ROOTDIR=BeanShell-2.0b5 +PATCH_FILES=bsh-2.0b5-src.patch ADDITIONAL_FILES=makefile.mk diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst index 661462345eec..21dbf3a4a64b 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-2.0b5\dist\bsh-2.0b5.jar %_DEST%\bin%_EXT%\bsh.jar |