rpms/ant/devel ant.spec,1.23,1.24

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Mar 30 11:39:59 UTC 2005


Update of /cvs/dist/rpms/ant/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4360

Modified Files:
	ant.spec 
Log Message:
Well, it _might_ work...


Index: ant.spec
===================================================================
RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ant.spec	30 Mar 2005 10:30:50 -0000	1.23
+++ ant.spec	30 Mar 2005 11:39:57 -0000	1.24
@@ -334,6 +334,12 @@
 # classpath selects optional components to build
 export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp commons-logging jsch xml-commons-resolver)
 
+# XXX this class does not build properly with ecj (#152256)
+mkdir -p build/classes
+CLASSPATH="src/main:$CLASSPATH" \
+    gcj -d build/classes \
+        -C src/main/org/apache/tools/ant/IntrospectionHelper.java
+
 # perform bootstrap and build without jjp or user configs,
 # (except JAVA_HOME as required by build script)
 [ -n "$JAVA_HOME" ] && unset JAVA_HOME
@@ -341,10 +347,6 @@
 [ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
 export JAVA_HOME
 sh build.sh --noconfig jars javadocs
-if [ ! -f build/lib/%{name}.jar ]; then
-    jcf-dump 'build/classes/org/apache/tools/ant/IntrospectionHelper$1.class'
-    exit 1
-fi
 
 # -----------------------------------------------------------------------------
 




More information about the fedora-cvs-commits mailing list