[Libreoffice-commits] .: 3 commits - beanshell/ExternalProject_beanshell.mk beanshell/makefile.mk beanshell/Package_beanshell.mk

[Libreoffice Gerrit user]

 beanshell/ExternalProject_beanshell.mk |    1 
 beanshell/Package_beanshell.mk         |    6 +--
 beanshell/makefile.mk                  |   57 ---------------------------------
 3 files changed, 3 insertions(+), 61 deletions(-)

New commits:
commit e17db9f50e3a50b656dc8234330b61f30313e8fa
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 2 13:13:22 2012 +0200

    remove dmakefile
    
    Change-Id: I1d6df640011a4a2d0361be0bc1f46cb83282ded5

diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
deleted file mode 100644
index 09b8427..0000000
--- a/beanshell/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org 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 version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=ooo_beanshell
-TARGET=ooo_beanshell
-
-.IF "$(SOLAR_JAVA)"!=""
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :	antsettings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=bsh-2.0b1-src
-TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
-TARFILE_ROOTDIR=BeanShell
-PATCH_FILES=bsh-2.0b1-src.patch
-
-BUILD_ACTION="$(ANT)" $(ANT_FLAGS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ELSE
-all:
-        @echo java disabled
-.ENDIF
commit 369a5ffbf1cd92c26a8e61c40b75fabb44d64da2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 2 13:12:50 2012 +0200

    beanshell: we didn't need -Dfile.encoding=ISO-8859-1 before
    
    Change-Id: Ic1cbd5e7ad15452d4fabaff273dad78188b2201b

diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk
index b1bfa9f..0fc720d 100644
--- a/beanshell/ExternalProject_beanshell.mk
+++ b/beanshell/ExternalProject_beanshell.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\
 
 $(call gb_ExternalProject_get_state_target,beanshell,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,beanshell)" && \
-	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	"$(ANT)" \
 		-q \
 		-f build.xml \
commit 9fadb7804fb425ab92b1a5e85db9a89207ce2607
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 2 13:09:26 2012 +0200

    beanshell: rename package to beanshell
    
    Change-Id: Ie4979cfb2a20bc0128a550358b0d0adc3f3d209c

diff --git a/beanshell/Package_beanshell.mk b/beanshell/Package_beanshell.mk
index 983c1fc..bb4b829 100644
--- a/beanshell/Package_beanshell.mk
+++ b/beanshell/Package_beanshell.mk
@@ -7,10 +7,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,beanshell_inc,$(call gb_UnpackedTarball_get_dir,beanshell)))
+$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell)))
 
-$(eval $(call gb_Package_use_external_project,beanshell_inc,beanshell))
+$(eval $(call gb_Package_use_external_project,beanshell,beanshell))
 
-$(eval $(call gb_Package_add_file,beanshell_inc,bin/bsh.jar,dist/bsh-2.0b1.jar))
+$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
 
 # vim: set noet sw=4 ts=4: