rpms/maven2/devel maven2-fastjar-manifest-fix.patch,NONE,1.1

Deepak Bhole (dbhole) fedora-extras-commits at redhat.com
Tue Mar 20 01:08:56 UTC 2007


Author: dbhole

Update of /cvs/extras/rpms/maven2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8640

Added Files:
	maven2-fastjar-manifest-fix.patch 
Log Message:

Adding patch file that didn't get added due to error during import.



maven2-fastjar-manifest-fix.patch:

--- NEW FILE maven2-fastjar-manifest-fix.patch ---
--- ./maven2/bootstrap/bootstrap-mini/build.sav 2006-10-13 22:45:08.000000000 -0400
+++ ./maven2/bootstrap/bootstrap-mini/build     2006-10-13 23:03:50.000000000 -0400
@@ -9,7 +9,14 @@
 mkdir -p ${classesDir}
 
 "$JAVA_HOME/bin/javac" -g -d ${classesDir} `find ${srcDir} -name '*.java'`
+
+# FIXME: Is there a better way to make the compiler see the jdom classes? 
+# setting CLASSPATH, or giving -cp/-classpath didn't work :(
+(cd ${classesDir} 
+	jar xf $JDOMCLASS 
+)
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi
 
-( cd ${classesDir} ; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
+
+( cd ${classesDir} ; /bin/cp -f ../../src/main/resources/META-INF/MANIFEST.MF META-INF; "$JAVA_HOME/bin/jar" -cfm ../../bootstrap-mini.jar ../../src/main/resources/META-INF/MANIFEST.MF * )
 ret=$?; if [ $ret != 0 ]; then exit $ret; fi




More information about the fedora-extras-commits mailing list