Author: nickboldt
Date: 2011-01-13 13:55:26 -0500 (Thu, 13 Jan 2011)
New Revision: 28198
Modified:
branches/jbosstools-3.2.0.CR1/drools/build.sh
Log:
remove .rej file and be sure to svn revert before patching
Modified: branches/jbosstools-3.2.0.CR1/drools/build.sh
===================================================================
--- branches/jbosstools-3.2.0.CR1/drools/build.sh 2011-01-13 18:55:24 UTC (rev 28197)
+++ branches/jbosstools-3.2.0.CR1/drools/build.sh 2011-01-13 18:55:26 UTC (rev 28198)
@@ -33,6 +33,7 @@
cd ${WORKSPACE}/sources/drools/org.drools.eclipse
rm -fr ${WORKSPACE}/sources/drools/org.drools.eclipse/JBIDE-1484_MANIFEST.MF.patch
wget -nc
http://anonsvn.jboss.org/repos/jbosstools/trunk/drools/JBIDE-1484_MANIFES...
+rm -fr META-INF/MANIFEST.MF.rej; svn revert META-INF/MANIFEST.MF
patch ${WORKSPACE}/sources/drools/org.drools.eclipse/META-INF/MANIFEST.MF
JBIDE-1484_MANIFEST.MF.patch
cd ${WORKSPACE}/sources