don't use dmake ant.mk during beanshell build
This commit is contained in:
parent
0d0bd89720
commit
2f6dc09c05
2 changed files with 2 additions and 42 deletions
|
@ -29,45 +29,6 @@
|
|||
|
||||
<!-- 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
|
||||
@@ -1 +1,35 @@
|
||||
-dummy
|
||||
+#*************************************************************************
|
||||
+#
|
||||
+# 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=jarall
|
||||
+
|
||||
+.INCLUDE : ant.mk
|
||||
+
|
||||
+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 @@
|
||||
|
|
|
@ -34,6 +34,7 @@ TARGET=ooo_beanshell
|
|||
# --- Settings -----------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
.INCLUDE : antsettings.mk
|
||||
|
||||
# --- Files --------------------------------------------------------
|
||||
|
||||
|
@ -42,9 +43,7 @@ TARFILE_MD5=ea570af93c284aa9e5621cd563f54f4d
|
|||
TARFILE_ROOTDIR=BeanShell
|
||||
PATCH_FILES=bsh-2.0b1-src.patch
|
||||
|
||||
ADDITIONAL_FILES=makefile.mk
|
||||
|
||||
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
|
||||
BUILD_ACTION=$(ANT) $(ANT_FLAGS)
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
|
|
Loading…
Reference in a new issue