Issue number:

Submitted by:
Reviewed by:
#i85726# don't ship binary-only jars, build them

4 files changed, 108 insertions, 0 deletions

diff --git a/tomcat/makefile.mk b/tomcat/makefile.mk
new file mode 100755
index 000000000000..4ab0b35c514e
--- /dev/null
+++ b/tomcat/makefile.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: rene $ $Date: 2008-02-04 09:02:14 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library 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 for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=tomacat
+TARGET=servlet
+
+.IF "$(SOLAR_JAVA)" != ""
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=jakarta-tomcat-5.0.30-src
+
+TARFILE_ROOTDIR=jakarta-tomcat-5.0.30-src
+
+#CONVERTFILES=build$/build.xml
+
+PATCH_FILE_NAME=tomcat.patch
+
+BUILD_DIR=jakarta-servletapi-5
+BUILD_ACTION=$(ANT)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.INCLUDE : tg_ext.mk
+
+.ELSE
+@all:
+    @echo java disabled
+.ENDIF
diff --git a/tomcat/prj/build.lst b/tomcat/prj/build.lst
new file mode 100755
index 000000000000..184f6dd19b3e
--- /dev/null
+++ b/tomcat/prj/build.lst
@@ -0,0 +1,2 @@
+to	tomcat	:	solenv NULL
+to	tomcat			nmake	-	all	to_mkout NULL
diff --git a/tomcat/prj/d.lst b/tomcat/prj/d.lst
new file mode 100755
index 000000000000..825601e3b2ad
--- /dev/null
+++ b/tomcat/prj/d.lst
@@ -0,0 +1 @@
+..\%__SRC%\misc\build\jakarta-tomcat-5.0.30-src\jakarta-servletapi-5\jsr154\dist\lib\servlet-api.jar %_DEST%\bin%_EXT%\servlet-api.jar
diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch
new file mode 100644
index 000000000000..133b67d69fba
--- /dev/null
+++ b/tomcat/tomcat.patch
@@ -0,0 +1,36 @@
+*** /dev/null	2008-02-01 11:10:25.957002171 +0100
+--- misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	2008-02-01 16:10:27.000000000 +0100
+***************
+*** 0 ****
+--- 1,31 ----
++ <project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
++ 
++   <target name="debuild"
++    description="Build jsr154 and jsr152 for Debian (Default)">
++     <echo message="Building Servlet 2.4 API"/>
++     <ant antfile="jsr154/build.xml"
++          target="dist"
++          inheritAll="false"
++     />
++     <echo message="Building JSP 2.0 API"/>
++     <ant antfile="jsr152/build.xml"
++          target="dist"
++          inheritAll="false"
++     />
++   </target>
++ 
++   <target name="clean" description="Clean">
++     <echo message="Cleaning JSP 2.0 API"/>
++     <ant antfile="jsr152/build.xml"
++          target="clean"
++          inheritAll="false"
++     />
++     <echo message="Cleaning Servlet 2.4 API"/>
++     <ant antfile="jsr154/build.xml"
++          target="clean"
++          inheritAll="false"
++     />
++     <delete dir="tmp"/>
++   </target>
++ 
++ </project>