Author: mkoch
Date: 2008-01-15 07:31:25 +0000 (Tue, 15 Jan 2008)
New Revision: 5453
Modified:
trunk/eclipse/debian/patches/eclipse-build.dpatch
trunk/eclipse/debian/rules
Log:
- revert accidentally commited changes
Modified: trunk/eclipse/debian/patches/eclipse-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-build.dpatch 2008-01-15 07:27:35 UTC
(rev 5452)
+++ trunk/eclipse/debian/patches/eclipse-build.dpatch 2008-01-15 07:31:25 UTC
(rev 5453)
@@ -57,14 +57,3 @@
<!--set the compiler and compiler arguments-->
<!--the default compiler is set to the one used by eclipse rel.
eng. -->
---- source-tree/plugins/org.eclipse.platform.doc.isv/build.xml.orig
2007-10-26 11:22:24.000000000 +0200
-+++ source-tree/plugins/org.eclipse.platform.doc.isv/build.xml 2007-10-26
11:23:25.000000000 +0200
-@@ -197,7 +197,7 @@
- </subant>
- <available property="activeHelpSample.jar"
file="${build.result.folder}/activeHelpSample.jar"/>
- <antcall target="activeHelpSample.jar"/>
-- <subant antfile="${customBuildCallbacks}"
target="post.build.jars" failonerror="false" buildpath=".">
-+ <subant antfile="${customBuildCallbacks}"
target="post.build.jars" failonerror="false" buildpath="." verbose="true">
- <property name="build.result.folder"
value="${build.result.folder}"/>
- </subant>
- </target>
Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules 2008-01-15 07:27:35 UTC (rev 5452)
+++ trunk/eclipse/debian/rules 2008-01-15 07:31:25 UTC (rev 5453)
@@ -366,17 +366,7 @@
find . -type f -name "build.xml" -exec \
perl -pi -e 's| verbose="true"| verbose="false"|g' \
{} ';'
-
- # Make subant invocations fail on error.
-# find . -type f -name "build.xml" -exec \
-# perl -pi -e 's| failonerror="false"| failonerror="true"|g' \
-# {} ';'
- # Disable compiler warnings.
- find . -type f -name "build.xml" -exec \
- perl -pi -e 's|<javac|<javac nowarn="true"|g' \
- {} ';'
-
# Replace all jars by links to previous install libraries.
ifeq ($(with_tomcat),yes)
cat $(EXTRA)/links.txt | while read FROM TO; do \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
