Date: Thu, 30 Sep 2010 21:08:37 +0200 From: Thomas Gellekum <Thomas.Gellekum@gmx.de> To: freebsd-eclipse@FreeBSD.org Subject: JUnit4 jar overwritten by JUnit3 jar during installation of java/eclipse Message-ID: <86k4m3m4lm.fsf@siegel.tg.intern>
next in thread | raw e-mail | index | archive | help
--=-=-=
Moin,
I noticed that JUnit4 doesn't work out of the box with the eclipse port.
The reason seems to be the loop in the do-install target, which installs
jars from ${BUILD_WRKSRC} to the final installation directory. I've
removed that loop and instead added "-L" to the "cp -R" command in
build.xml. Please test the attached patch, I could easily be missing
something here.
I guess eclipse-devel will need a similar change.
tg
--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=eclipse-port.diff
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile 7 Sep 2010 08:40:13 -0000 1.71
+++ Makefile 30 Sep 2010 18:51:49 -0000
@@ -183,6 +183,7 @@
.endfor
@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties
@${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/nonosgidependencies.properties
+ @${REINPLACE_CMD} -e "s+/usr/share/java/junit4.jar+${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/build.xml
.if defined(WITH_TESTS)
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
.endif
@@ -208,16 +209,6 @@
${BUILD_WRKSRC}/eclipse.tmp
.endif
@${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME}
- @for f in `ls ${BUILD_WRKSRC}/bundles/*.jar`; do \
- BASE=`basename $$f`; \
- FILES=`find ${PORTDESTDIR}/plugins/ -name "$$BASE"`; \
- if [ ! -z "$$FILES" ]; then \
- for s in $$FILES; do \
- ${RM} "$$s"; \
- ${INSTALL_DATA} "$$f" "$$s"; \
- done; \
- fi; \
- done
@${PREFIX}/bin/${PORTNAME} -initialize -consolelog
-@update-desktop-database
@(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST}
Index: files/patch-eclipse-build
===================================================================
RCS file: /home/ncvs/ports/java/eclipse/files/patch-eclipse-build,v
retrieving revision 1.1
diff -u -r1.1 patch-eclipse-build
--- files/patch-eclipse-build 10 Jul 2010 19:34:26 -0000 1.1
+++ files/patch-eclipse-build 30 Sep 2010 18:52:39 -0000
@@ -122,7 +122,7 @@
- <arg value="--no-target-directory" />
- <arg value="${buildDirectory}/installation" />
- <arg value="${destDir}${prefix}/${libDir}/eclipse" />
-+ <arg value="-R" />
++ <arg value="-RL" />
+ <arg value="${buildDirectory}/installation/" />
+ <arg value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
</exec>
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k4m3m4lm.fsf>