Use sed instead of patches for tomcat version numbers.
This commit is contained in:
Ben Konrath
parent
8b6e80ff09
commit
e1c99230a5
|
|
@ -1,14 +1,5 @@
|
|||
--- build.xml.orig 2006-07-05 12:47:26.000000000 -0400
|
||||
+++ 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.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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"/>
|
||||
|
|
@ -110,61 +101,3 @@
|
|||
</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 +230,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.v20060601"/>
|
||||
+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.v20060601" 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.v20060601" version="5.5.17.v20060601"/>
|
||||
</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.v20060601"/>
|
||||
+ <copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
|
||||
+ <copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.v20060601"/>
|
||||
+ <copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" 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.v20060601.jar"/>
|
||||
+ <delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
|
||||
<delete dir="${temp.folder}"/>
|
||||
</target>
|
||||
|
||||
@@ -277,7 +283,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.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
|
||||
<delete dir="${temp.folder}"/>
|
||||
</target>
|
||||
|
||||
|
|
|
|||
13
eclipse.spec
13
eclipse.spec
|
|
@ -41,7 +41,7 @@ Epoch: 1
|
|||
Summary: %{pkg_summary}
|
||||
Name: eclipse
|
||||
Version: %{eclipse_majmin}.%{eclipse_micro}
|
||||
Release: 1jpp_8fc
|
||||
Release: 1jpp_9fc
|
||||
License: EPL
|
||||
Group: Text Editors/Integrated Development Environments (IDE)
|
||||
URL: http://www.eclipse.org/
|
||||
|
|
@ -106,8 +106,6 @@ Patch55: %{name}-disable-junit4-apt.patch
|
|||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98371
|
||||
Patch28: %{name}-tomcat55.patch
|
||||
Patch29: %{name}-tomcat55-build.patch
|
||||
Patch30: %{name}-tomcat55-build.2.patch
|
||||
Patch50: %{name}-tomcat55-build.3.patch
|
||||
Patch31: %{name}-webapp-tomcat55.patch
|
||||
Patch56: %{name}-webapp-tomcat55-newarches.patch
|
||||
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=98707
|
||||
|
|
@ -405,8 +403,10 @@ pushd plugins/org.eclipse.tomcat
|
|||
%patch28 -p0
|
||||
%patch29 -p0
|
||||
popd
|
||||
%patch30 -p0
|
||||
%patch50 -p1
|
||||
sed --in-place "s/4.1.130/5.5.17/" \
|
||||
features/org.eclipse.platform/build.xml \
|
||||
plugins/org.eclipse.tomcat/build.xml \
|
||||
assemble.*.xml
|
||||
pushd plugins/org.eclipse.help.webapp
|
||||
%patch31 -p0
|
||||
popd
|
||||
|
|
@ -1634,6 +1634,9 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jul 25 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_9fc
|
||||
- Use sed instead of patches for tomcat version numbers.
|
||||
|
||||
* Sun Jul 23 2006 Ben Konrath <bkonrath@redhat.com> 3.2.0-1jpp_8fc
|
||||
- Disable build.index doc generation on i386.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue