r2447 - in trunk/eclipse/debian: . extra patches
Michael Koch
mkoch at costa.debian.org
Sun Sep 17 09:04:26 UTC 2006
Author: mkoch
Date: 2006-09-17 09:04:26 +0000 (Sun, 17 Sep 2006)
New Revision: 2447
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/extra/links.txt
trunk/eclipse/debian/extra/package-links.txt
trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
trunk/eclipse/debian/patches/eclipse-webapp-tomcat55.dpatch
trunk/eclipse/debian/rules
Log:
Added patches from Vladimir Lapacek for better Tomcat 5.5 integration.
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/changelog 2006-09-17 09:04:26 UTC (rev 2447)
@@ -29,13 +29,14 @@
- libswt3.1-gtk-gcj.install, libswt3.1-gtk-gcj.postrm, libswt3.1-gtk-gcj.postinst,
libswt3.1-gtk-java.install, libswt3.1-gtk-jni.dirs, libswt3.1-gtk-jni.install:
Removed.
+ (Thanks to Vladimir Lapacek for patches for Tomcat 5.5 integration)
* extra/package-links.txt, extra/links.txt: Link tomcat 5.5 jars.
* debian/rules: Changed list of patches to apply. Updated to version numbers.
* debian/com.ibm.icu_3.4.4.1.jar.uu, debian/com.ibm.icu.base_3.4.4.1.jar.uu,
debian/rules: Patch com.ibm.icu_3.4.4.1.jar and
com.ibm.icu.base_3.4.4.1.jar into the source-tree.
- -- Michael Koch <konqueror at gmx.de> Sun, 17 Sep 2006 08:35:02 +0000
+ -- Michael Koch <konqueror at gmx.de> Sun, 17 Sep 2006 09:00:44 +0000
eclipse (3.1.2-3) experimental; urgency=low
Modified: trunk/eclipse/debian/extra/links.txt
===================================================================
--- trunk/eclipse/debian/extra/links.txt 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/extra/links.txt 2006-09-17 09:04:26 UTC (rev 2447)
@@ -1,28 +1,25 @@
-/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat/tomcat-coyote.jar
-/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat/servlet.jar
-/usr/share/java/commons-collections.jar org.eclipse.tomcat/commons-collections.jar
-/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat/bootstrap.jar
-/usr/share/tomcat5.5/server/lib/tomcat-http11.jar org.eclipse.tomcat/tomcat-http11.jar
-/usr/share/java/commons-modeler.jar org.eclipse.tomcat/commons-modeler.jar
-/usr/share/java/commons-logging-api.jar org.eclipse.tomcat/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar org.eclipse.tomcat/commons-beanutils.jar
-/usr/share/tomcat5.5/server/lib/servlets-common.jar org.eclipse.tomcat/servlets-common.jar
-/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat/tomcat-util.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat/servlets-invoker.jar
-/usr/share/java/commons-digester.jar org.eclipse.tomcat/commons-digester.jar
-/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat/jasper-runtime.jar
-/usr/share/tomcat5.5/server/lib/jakarta-regexp.jar org.eclipse.tomcat/jakarta-regexp-1.3.jar
-/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat/servlets-default.jar
-/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat/naming-factory.jar
-/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat/catalina.jar
-/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat/catalina-optional.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat/mx4j-impl.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat/mx4j-jmx.jar
-/usr/share/tomcat5.5/common/lib/naming-common.jar org.eclipse.tomcat/naming-common.jar
-/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat/naming-resources.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat/jasper-compiler.jar
-/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat/jsp-api.jar
-/usr/share/java/commons-el.jar org.eclipse.tomcat/commons-el.jar
+/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat/lib/tomcat-coyote.jar
+/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat/lib/servletapi5.jar
+/usr/share/java/commons-collections.jar org.eclipse.tomcat/lib/commons-collections.jar
+/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat/lib/bootstrap.jar
+/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat/lib/tomcat-http.jar
+/usr/share/java/commons-modeler.jar org.eclipse.tomcat/lib/commons-modeler.jar
+/usr/share/java/commons-logging-api.jar org.eclipse.tomcat/lib/commons-logging-api.jar
+/usr/share/java/commons-beanutils.jar org.eclipse.tomcat/lib/commons-beanutils.jar
+/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat/lib/tomcat-util.jar
+/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat/lib/servlets-invoker.jar
+/usr/share/java/commons-digester.jar org.eclipse.tomcat/lib/commons-digester.jar
+/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat/lib/jasper-runtime.jar
+/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat/lib/servlets-default.jar
+/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat/lib/naming-factory.jar
+/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat/lib/catalina.jar
+/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat/lib/catalina-optional.jar
+/usr/share/java/mx4j.jar org.eclipse.tomcat/lib/mx4j-impl.jar
+/usr/share/java/mx4j.jar org.eclipse.tomcat/lib/mx4j-jmx.jar
+/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat/lib/naming-resources.jar
+/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat/lib/jasper-compiler.jar
+/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat/lib/jsp-api.jar
+/usr/share/java/commons-el.jar org.eclipse.tomcat/lib/commons-el.jar
/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant/lib/ant-apache-log4j.jar
/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant/lib/ant-commons-logging.jar
@@ -44,4 +41,4 @@
/usr/share/ant/lib/ant-swing.jar org.apache.ant/lib/ant-swing.jar
/usr/share/java/lucene-1.4.3.jar org.apache.lucene/lucene-1.4.3.jar
/usr/share/java/junit.jar org.junit/junit.jar
-/usr/share/java/jsch.jar org.eclipse.team.cvs.ssh2/jsch-0.1.18.jar
+/usr/share/java/jsch.jar ../baseLocation/plugins/com.jcraft.jsch_0.1.28.jar
Modified: trunk/eclipse/debian/extra/package-links.txt
===================================================================
--- trunk/eclipse/debian/extra/package-links.txt 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/extra/package-links.txt 2006-09-17 09:04:26 UTC (rev 2447)
@@ -1,28 +1,25 @@
-/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat_5.0.30/tomcat-coyote.jar
-/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat_5.0.30/servlet.jar
-/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.0.30/commons-collections.jar
-/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat_5.0.30/bootstrap.jar
-/usr/share/tomcat5.5/server/lib/tomcat-http11.jar org.eclipse.tomcat_5.0.30/tomcat-http11.jar
-/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.0.30/commons-modeler.jar
-/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.0.30/commons-logging-api.jar
-/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.0.30/commons-beanutils.jar
-/usr/share/tomcat5.5/server/lib/servlets-common.jar org.eclipse.tomcat_5.0.30/servlets-common.jar
-/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat_5.0.30/tomcat-util.jar
-/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.0.30/servlets-invoker.jar
-/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.0.30/commons-digester.jar
-/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat_5.0.30/jasper-runtime.jar
-/usr/share/tomcat5.5/server/lib/jakarta-regexp.jar org.eclipse.tomcat_5.0.30/jakarta-regexp-1.3.jar
-/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat_5.0.30/servlets-default.jar
-/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat_5.0.30/naming-factory.jar
-/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat_5.0.30/catalina.jar
-/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat_5.0.30/catalina-optional.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat_5.0.30/mx4j-impl.jar
-/usr/share/java/mx4j.jar org.eclipse.tomcat_5.0.30/mx4j-jmx.jar
-/usr/share/tomcat5.5/common/lib/naming-common.jar org.eclipse.tomcat_5.0.30/naming-common.jar
-/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat_5.0.30/naming-resources.jar
-/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat_5.0.30/jasper-compiler.jar
-/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat_5.0.30/jsp-api.jar
-/usr/share/java/commons-el.jar org.eclipse.tomcat_5.0.30/commons-el.jar
+/usr/share/tomcat5.5/server/lib/tomcat-coyote.jar org.eclipse.tomcat_5.5.17/tomcat-coyote.jar
+/usr/share/tomcat5.5/common/lib/servlet-api.jar org.eclipse.tomcat_5.5.17/servlet.jar
+/usr/share/java/commons-collections.jar org.eclipse.tomcat_5.5.17/commons-collections.jar
+/usr/share/tomcat5.5/bin/bootstrap.jar org.eclipse.tomcat_5.5.17/bootstrap.jar
+/usr/share/tomcat5.5/server/lib/tomcat-http.jar org.eclipse.tomcat_5.5.17/tomcat-http.jar
+/usr/share/java/commons-modeler.jar org.eclipse.tomcat_5.5.17/commons-modeler.jar
+/usr/share/java/commons-logging-api.jar org.eclipse.tomcat_5.5.17/commons-logging-api.jar
+/usr/share/java/commons-beanutils.jar org.eclipse.tomcat_5.5.17/commons-beanutils.jar
+/usr/share/tomcat5.5/server/lib/tomcat-util.jar org.eclipse.tomcat_5.5.17/tomcat-util.jar
+/usr/share/tomcat5.5/server/lib/servlets-invoker.jar org.eclipse.tomcat_5.5.17/servlets-invoker.jar
+/usr/share/java/commons-digester.jar org.eclipse.tomcat_5.5.17/commons-digester.jar
+/usr/share/tomcat5.5/common/lib/jasper-runtime.jar org.eclipse.tomcat_5.5.17/jasper-runtime.jar
+/usr/share/tomcat5.5/server/lib/servlets-default.jar org.eclipse.tomcat_5.5.17/servlets-default.jar
+/usr/share/tomcat5.5/common/lib/naming-factory.jar org.eclipse.tomcat_5.5.17/naming-factory.jar
+/usr/share/tomcat5.5/server/lib/catalina.jar org.eclipse.tomcat_5.5.17/catalina.jar
+/usr/share/tomcat5.5/server/lib/catalina-optional.jar org.eclipse.tomcat_5.5.17/catalina-optional.jar
+/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/mx4j-impl.jar
+/usr/share/java/mx4j.jar org.eclipse.tomcat_5.5.17/mx4j-jmx.jar
+/usr/share/tomcat5.5/common/lib/naming-resources.jar org.eclipse.tomcat_5.5.17/naming-resources.jar
+/usr/share/tomcat5.5/common/lib/jasper-compiler.jar org.eclipse.tomcat_5.5.17/jasper-compiler.jar
+/usr/share/tomcat5.5/common/lib/jsp-api.jar org.eclipse.tomcat_5.5.17/jsp-api.jar
+/usr/share/java/commons-el.jar org.eclipse.tomcat_5.5.17/commons-el.jar
/usr/share/ant/lib/ant-apache-log4j.jar org.apache.ant_1.6.5/lib/ant-apache-log4j.jar
/usr/share/ant/lib/ant-apache-resolver.jar org.apache.ant_1.6.5/lib/ant-apache-resolver.jar
/usr/share/ant/lib/ant-commons-logging.jar org.apache.ant_1.6.5/lib/ant-commons-logging.jar
@@ -42,6 +39,5 @@
/usr/share/ant/lib/ant-commons-net.jar org.apache.ant_1.6.5/lib/ant-commons-net.jar
/usr/share/ant/lib/ant-trax.jar org.apache.ant_1.6.5/lib/ant-trax.jar
/usr/share/ant/lib/ant-swing.jar org.apache.ant_1.6.5/lib/ant-swing.jar
-/usr/share/java/lucene-1.4.3.jar org.apache.lucene_1.4.3/lucene-1.4.3.jar
+/usr/share/java/lucene-1.4.3.jar org.apache.lucene_1.4.3/lucene-1.4.103.v20060601.jar
/usr/share/java/junit.jar org.junit_3.8.1/junit.jar
-/usr/share/java/jsch.jar org.eclipse.team.cvs.ssh2_3.1.0/jsch-0.1.18.jar
Modified: trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch 2006-09-17 09:04:26 UTC (rev 2447)
@@ -28,8 +28,8 @@
case $OS in
"Linux")
-+ GECKO_INCLUDES=`pkg-config --cflags firefox-gtkmozembed`
-+ GECKO_LIBS=`pkg-config --libs firefox-gtkmozembed`
++ GECKO_INCLUDES="`pkg-config --cflags firefox-gtkmozembed`"
++ GECKO_LIBS="`pkg-config --libs firefox-gtkmozembed`"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
case $MODEL in
Modified: trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch 2006-09-17 09:04:26 UTC (rev 2447)
@@ -28,8 +28,8 @@
case $OS in
"Linux")
-+ GECKO_INCLUDES=`pkg-config --cflags mozilla-gtkmozembed`
-+ GECKO_LIBS=`pkg-config --libs mozilla-gtkmozembed`
++ GECKO_INCLUDES="`pkg-config --cflags mozilla-gtkmozembed`"
++ GECKO_LIBS="`pkg-config --libs mozilla-gtkmozembed`"
+ # Set this to something to override the presets
+ GECKO_SDK="_"
case $MODEL in
Modified: trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/patches/eclipse-libswt-xulrunner.dpatch 2006-09-17 09:04:26 UTC (rev 2447)
@@ -24,15 +24,26 @@
diff -r -u --exclude='*.rej' --exclude='*.orig' source-tree.orig/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
--- source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig 2006-08-05 18:30:50.000000000 +0000
+++ source-tree/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 2006-08-05 18:33:39.000000000 +0000
-@@ -37,6 +37,11 @@
- ;;
- esac
+@@ -49,6 +49,9 @@
+ else
+ MODEL=`uname -m`
+ fi
++ if [ ${MODEL} = 'unknown' ]; then
++ MODEL=`uname -m`
++ fi
+ fi
+ case $MODEL in
+ "x86_64")
+@@ -92,9 +95,9 @@
+ fi
-+export GECKO_INCLUDES=`pkg-config --cflags xulrunner-xpcom`
-+export GECKO_LIB=`pkg-config --libs xulrunner-xpcom`
-+# Set this to something to override the presets
-+export GECKO_SDK="_"
-+
- # Determine which CPU type we are building for
- if [ "${MODEL}" = "" ]; then
- if uname -p > /dev/null 2>&1; then
+ if [ -z "${GECKO_INCLUDES}" -a -z "${GECKO_LIBS}" ]; then
+- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
+- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
+- GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
++ if [ x`pkg-config --exists xulrunner-xpcom && echo YES` = "xYES" ]; then
++ GECKO_INCLUDES=`pkg-config --cflags xulrunner-xpcom`
++ GECKO_LIBS=`pkg-config --libs xulrunner-xpcom`
+ export GECKO_INCLUDES
+ export GECKO_LIBS
+ MAKE_MOZILLA=make_mozilla
Modified: trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/patches/eclipse-tomcat55-build.dpatch 2006-09-17 09:04:26 UTC (rev 2447)
@@ -23,6 +23,17 @@
--- source-tree/plugins/org.eclipse.tomcat/build.xml.orig 2006-07-05 12:47:26.000000000 -0400
+++ source-tree/plugins/org.eclipse.tomcat/build.xml 2006-07-05 12:50:49.000000000 -0400
++@@ -58,7 +58,7 @@
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+- <zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"
+filesonly="false" whenempty="skip" update="false"/>
++ <zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17" filesonly="false"
+whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
@@ -144,50 +144,56 @@
<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
@@ -124,3 +135,61 @@
</path>
<!-- compile the source code -->
<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
+@@ -224,37 +224,37 @@
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
++ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}" includes="tomcatwrapper.jar" />
+ </copy>
+- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
++ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/" />
+ </copy>
+- <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
++ <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" version="5.5.17"/>
+ </target>
+
+ <target name="build.zips" depends="init">
+ </target>
+
+ <target name="gather.sources" depends="init" if="destination.temp.folder">
+- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+- <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
+- <copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
++ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
++ <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="false" overwrite="false"/>
++ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="false" overwrite="false">
+ <fileset dir="${basedir}" includes="about.html,*.license" />
+ </copy>
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+- <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
+- <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
++ <mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17"/>
++ <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17" failonerror="false" overwrite="false"/>
+ </target>
+
+ <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
+ <delete file="${build.result.folder}/tomcatwrapper.jar"/>
+ <delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
+- <delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
+- <delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
++ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.jar"/>
++ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.zip"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+@@ -277,7 +277,7 @@
+ <delete>
+ <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" />
+ </delete>
+- <zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++ <zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
Modified: trunk/eclipse/debian/patches/eclipse-webapp-tomcat55.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-webapp-tomcat55.dpatch 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/patches/eclipse-webapp-tomcat55.dpatch 2006-09-17 09:04:26 UTC (rev 2447)
@@ -48,7 +48,7 @@
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/tomcat-util.jar"/>
-+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
++ <pathelement path="../org.eclipse.tomcat/lib/jsp-api.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-el.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/commons-logging.jar"/>
</classpath>
@@ -69,7 +69,7 @@
+ <pathelement location="../org.eclipse.tomcat/lib/servletapi5.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/commons-logging-api.jar" />
+ <pathelement location="../org.eclipse.tomcat/lib/commons-el.jar" />
-+ <pathelement location="../org.eclipse.tomcat/lib/jspapi.jar" />
++ <pathelement location="../org.eclipse.tomcat/lib/jsp-api.jar" />
</path>
<delete dir="${temp.folder}/jsp.jar.src"/>
<mkdir dir="${temp.folder}/jsp.jar.src"/>
@@ -92,7 +92,7 @@
- <pathelement path="../org.eclipse.tomcat/jasper-runtime.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/servletapi5.jar"/>
+ <pathelement path="../org.eclipse.tomcat/lib/jasper-runtime.jar"/>
-+ <pathelement path="../org.eclipse.tomcat/lib/jspapi.jar"/>
++ <pathelement path="../org.eclipse.tomcat/lib/jsp-api.jar"/>
</classpath>
<src path="${temp.folder}/jsp.jar.src/" />
<compilerarg line="-log ${temp.folder}/WEB-INF/lib/jsp.jar.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2006-09-17 08:58:12 UTC (rev 2446)
+++ trunk/eclipse/debian/rules 2006-09-17 09:04:26 UTC (rev 2447)
@@ -304,6 +304,10 @@
# Replace all jars by links to previous install libraries.
ifeq ($(with_tomcat),yes)
cat $(EXTRA)/links.txt | while read FROM TO; do \
+ DIRNAME=""; \
+ if [ ! -d $(SOURCE_TREE)/plugins/$$(dirname $$TO) ]; then \
+ mkdir -p $(SOURCE_TREE)/plugins/$$(dirname $$TO); \
+ fi; \
ln -sf $$FROM $(SOURCE_TREE)/plugins/$$TO; \
done
else
@@ -409,7 +413,7 @@
# extract the jdtCompilerAdapter.jar file
mkdir -p $(DEBIAN_TMP)/usr/share/ant/lib
cd $(DEBIAN_TMP)/usr/share/ant/lib && \
- jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_$(UPSTREAM_VERSION).jar jdtCompilerAdapter.jar
+ jar xf $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins/org.eclipse.jdt.core_$(UPSTREAM_VERSION)*.jar jdtCompilerAdapter.jar
# Builds any Debian-specific extra files.
@@ -417,7 +421,7 @@
# Put debian version into about.mappings of org.eclipse.sdk to show it
# in Eclispe about dialog.
- plugin_dir=$(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_$(UPSTREAM_VERSION) ; \
+ plugin_dir=$$(ls -d $(DEBIAN_TMP)/usr/share/eclipse/plugins/org.eclipse.sdk_$(UPSTREAM_VERSION)*) ; \
sed -e "s/\(0=.*\)/\1 ($(DISTRIBUTION) version: $(SOURCE_VERSION))/" < $$plugin_dir/about.mappings > $$plugin_dir/about.mappings.tmp ; \
mv $$plugin_dir/about.mappings.tmp $$plugin_dir/about.mappings
More information about the pkg-java-commits
mailing list