fdo#70393: move beanshell to a subdir of external

Change-Id: I7e8324fd366a25db59becedfb3f00a10723f45be
Reviewed-on: https://gerrit.libreoffice.org/6283
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

7 files changed, 0 insertions, 141 deletions

diff --git a/beanshell/ExternalPackage_beanshell.mk b/beanshell/ExternalPackage_beanshell.mk
deleted file mode 100644
index 1346b889cbd0..000000000000
--- a/beanshell/ExternalPackage_beanshell.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell))
-
-$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell))
-
-$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk
deleted file mode 100644
index 889b79b153d2..000000000000
--- a/beanshell/ExternalProject_beanshell.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,beanshell))
-
-$(eval $(call gb_ExternalProject_register_targets,beanshell,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,beanshell,build) :
-	$(call gb_ExternalProject_run,build,\
-	$(ICECREAM_RUN) "$(ANT)" \
-		-q \
-		-f build.xml \
-		-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
-		$(if $(filter yes,$(JAVACISGCJ))\
-			,-Dbuild.compiler=gcj \
-			,-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
-				-Dant.build.javac.target=$(JAVA_TARGET_VER) \
-		) \
-		$(if $(debug),-Dbuild.debug="on") \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/Makefile b/beanshell/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/beanshell/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk
deleted file mode 100644
index e5f04092c659..000000000000
--- a/beanshell/Module_beanshell.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,beanshell))
-
-ifneq ($(ENABLE_JAVA),)
-ifneq ($(filter BSH,$(BUILD_TYPE)),)
-$(eval $(call gb_Module_add_targets,beanshell,\
-	ExternalPackage_beanshell \
-	ExternalProject_beanshell \
-	UnpackedTarball_beanshell \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/README b/beanshell/README
deleted file mode 100644
index 0b03fd35ad58..000000000000
--- a/beanshell/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Java interpreter from [http://www.beanshell.org/] with some patches.
-
-So you can write java in command shell; interactive java good for prototyping/macros.
-
diff --git a/beanshell/UnpackedTarball_beanshell.mk b/beanshell/UnpackedTarball_beanshell.mk
deleted file mode 100644
index b22cbcef101f..000000000000
--- a/beanshell/UnpackedTarball_beanshell.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell))
-
-$(eval $(call gb_UnpackedTarball_add_patches,beanshell,\
-	beanshell/bsh-2.0b1-src.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
deleted file mode 100644
index a1358d391168..000000000000
--- a/beanshell/bsh-2.0b1-src.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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...
- -->
--<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"/>
-@@ -80,6 +83,9 @@
- 	<property name="exclude-servlet" 
- 		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/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;
-