1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
|
#! /bin/sh -e
##
## DP: Prevents that output went in hidden log files.
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch)
patch $patch_opts -p0 < $0;;
-unpatch)
patch $patch_opts -p0 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -r -u ../source-tree.orig/build.xml source-tree/build.xml
--- ../source-tree.orig/build.xml 2005-10-20 10:46:42.000000000 +0200
+++ source-tree/build.xml 2005-10-20 10:48:50.000000000 +0200
@@ -129,19 +129,19 @@
pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.-->
<antcall target="install.eclipse.${archive.format}" />
- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv" output="platform.doc.isv.txt">
+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.isv">
<arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
</java>
- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user" output="platform.doc.user.txt">
+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.platform.doc.user">
<arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
</java>
- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv" output="jdt.doc.isv.txt">
+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.isv">
<arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
</java>
- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user" output="jdt.doc.user.txt">
+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.jdt.doc.user">
<arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
</java>
- <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user" output="pde.doc.user.txt">
+ <java fork="true" jar="${buildDirectory}/eclipse/startup.jar" dir="${buildDirectory}/plugins/org.eclipse.pde.doc.user">
<arg line="-data ${buildDirectory}/workspace -application org.eclipse.ant.core.antRunner gather.bin.parts -Ddestination.temp.folder=${buildDirectory}/tmp/eclipse/plugins/" />
</java>
diff -r -u ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml source-tree/plugins/org.eclipse.help.webapp/build.xml
--- ../source-tree.orig/plugins/org.eclipse.help.webapp/build.xml 2005-10-20 10:46:53.000000000 +0200
+++ source-tree/plugins/org.eclipse.help.webapp/build.xml 2005-10-20 10:50:02.000000000 +0200
@@ -167,7 +167,7 @@
fork="true"
failonerror="false"
classpathref="jasper.classpath"
- output="${temp.folder}/WEB-INF/lib/jsp.jar.bin.log">
+ >
<arg value="-v3" />
<arg value="-d" /><arg value="${temp.folder}/jsp.jar.src" />
<arg value="-die" />
Nur in source-tree/plugins/org.eclipse.help.webapp: build.xml.orig.
diff -r -u ../source-tree.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
--- ../source-tree.orig/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-10-20 10:46:45.000000000 +0200
+++ source-tree/plugins/org.eclipse.jdt.doc.isv/buildDoc.xml 2005-10-20 10:52:31.000000000 +0200
@@ -67,7 +67,7 @@
<delete dir="reference/api"/>
<mkdir dir="reference/api"/>
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
+ <exec dir="." executable="${javadoc}">
<arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
</exec>
</target>
diff -r -u ../source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml
--- ../source-tree.orig/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-10-20 10:46:45.000000000 +0200
+++ source-tree/plugins/org.eclipse.pde.doc.user/buildDoc.xml 2005-10-20 10:52:53.000000000 +0200
@@ -51,7 +51,7 @@
<delete dir="reference/api"/>
<mkdir dir="reference/api"/>
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
+ <exec dir="." executable="${javadoc}">
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
</exec>
</target>
diff -r -u ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml
--- ../source-tree.orig/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-10-20 10:46:45.000000000 +0200
+++ source-tree/plugins/org.eclipse.platform.doc.isv/buildDoc.xml 2005-10-20 10:51:53.000000000 +0200
@@ -100,7 +100,7 @@
<!--retrieve osgi javadoc-->
<unzip src="../org.eclipse.osgi/osgi/osgiJavaDoc.zip" dest="reference/osgi" />
- <exec dir="." executable="${javadoc}" output="doc.bin.log">
+ <exec dir="." executable="${javadoc}">
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
</exec>
|