diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-06 13:05:26 -0500 |
commit | 801936459fa8cd5d452f875d14da7f34a9117f08 (patch) | |
tree | b68a8d557f97d432db6933f487ebdff842eee600 /tomcat/makefile.mk | |
parent | bf202438d88e650b69c9817f003f45aed1f58996 (diff) | |
parent | f8c7607ea291d7e7d976a9485abc1761627eb654 (diff) |
Merge remote branch 'extensions/master'MELD_LIBREOFFICE_REPOS
* extensions/master: (978 commits)
get this building for me
Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
enable l10n of presenter screen
oops Bjoern's .gitattributes link got commited by mistake
enable l10n of presenter screen
Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
poppler 0.17.0 changed its api for no some reason or other
Branch libreoffice-3-4-2
Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
Remove component_getImplementationEnvironment
hotfix to include localizations of Presenter screen extension
hotfix to include localizations of Presenter screen extension
Goodbye to CWS_WORK_STAMP
use OString::equalsL
fixing rebase errors
ause130: #i117218# change .idl handling to gnu make
CWS gnumake4: reimplement basegfx_s hack for new build system [hg:c943ed591aff]
Use DESKTOP and NATIVE where appropriate
Version 3.4.1.1, tag libreoffice-3.4.1.1 (3.4.1-rc1)
createFromAscii -> RTL_CONSTASCII_USTRINGPARAM
...
Diffstat (limited to 'tomcat/makefile.mk')
-rwxr-xr-x | tomcat/makefile.mk | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk new file mode 100755 index 000000000000..9bdae76a41ab --- /dev/null +++ b/tomcat/makefile.mk @@ -0,0 +1,68 @@ +#************************************************************************* +# +# 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=tomacat +TARGET=servlet + +.IF "$(SOLAR_JAVA)" != "" +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : antsettings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=jakarta-tomcat-5.0.30-src +TARFILE_MD5=2a177023f9ea8ec8bd00837605c5df1b + +TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src + +ADDITIONAL_FILES = jakarta-servletapi-5/build.xml + +PATCH_FILES=tomcat.patch + +BUILD_DIR=jakarta-servletapi-5 + +.IF "$(JAVACISGCJ)"=="yes" +BUILD_ACTION=$(ANT) +.ELSE +BUILD_ACTION=$(ANT) -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk + +.INCLUDE : tg_ext.mk + +.ELSE +@all: + @echo java disabled +.ENDIF |