Date: Tue, 26 Oct 2010 17:37:50 +0200 From: Thomas Gellekum <Thomas.Gellekum@gmx.de> To: freebsd-eclipse@freebsd.org Subject: Upgrade eclipse-devel to 3.6.1 Message-ID: <86ocahge29.fsf@siegel.tg.intern>
next in thread | raw e-mail | index | archive | help
--=-=-= Moin, attached are patches to upgrade the eclipse-devel port to version 3.6.1. I've tested the new version with a few small Java and RCP projects, and there were no surprises for me at least. However, there are some areas where the port can certainly be improved, and I hope that we get a few more pairs of eyes looking at those. From the top of my head: - JUnit4. I've made the mistake of updating the required version too early. It turned out that there is a build property for the location of a JUnit4 installation. I didn't try that yet, but we might actually take JUnit4 from a separate port and just depend on that. This will simplify the port's makefile a bit. - REINPLACE_CMD. I think I'd like to see patches that add properties to the Ant build files and pass those via MAKE_ARGS. Again, this simplifies the makefile and we'd no longer patch the same files several times with different methods. - Upstream patches were updated for eclipse-build-0.6.1. How do we manage these? - Build output. There seems to be some verbosity flag set somewhere; I didn't look for it yet. - Build errors/warnings. I've seen errors scroll by, haven't checked them yet. - Needs OpenJDK6. The diablo-jdk16 VM crashes when compiling some files. I don't bother (too much), I think that port has become useful mainly for bootstrapping. In the same vein, the javavmwrapper's lookup order should be updated, IMHO. So, please check the patches and send your suggestions/comments/improvements to the list. Working on the improvements might actually be easiest if we'd just update the port; it seems to be lagging behind the standard port anyway ;-). tg --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=eclipse-devel.diff Content-Transfer-Encoding: 8bit cvs diff: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/Makefile,v retrieving revision 1.32 diff -u -r1.32 Makefile --- Makefile 8 Aug 2010 08:56:39 -0000 1.32 +++ Makefile 26 Oct 2010 14:43:23 -0000 @@ -6,15 +6,14 @@ # PORTNAME= eclipse-devel -PORTVERSION= 3.5.2 -PORTREVISION= 3 +PORTVERSION= 3.6.1 +#PORTREVISION= 3 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \ - http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \ - http://download.eclipse.org/tools/orbit/downloads/drops/S20100308015149/bundles/:3 \ +MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.6.x_Helios/:1 \ + http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/:2 \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \ ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \ - ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT4_VERSION}/:6,} + http://cloud.github.com/downloads/KentBeck/junit/:6 DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ ${ECLIPSE_SRCFILE}:1 \ ${ANT_SRCFILE}:4 \ @@ -51,28 +50,29 @@ JAVA_OS= native JAVA_RUN= yes JAVA_VERSION= 1.6 +JAVA_VENDOR= openjdk -ECLIPSE_BUILD_SRCFILE= eclipse-build-0.5.0${EXTRACT_SUFX} +ECLIPSE_BUILD_SRCFILE= eclipse-build-0.6.1${EXTRACT_SUFX} ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-src${EXTRACT_SUFX} ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${EXTRACT_SUFX} ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${EXTRACT_SUFX} -ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.0.1.v20090822.jar \ +ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.2.1.v20100412.jar \ com.jcraft.jsch_0.1.41.v200903070017.jar \ - javax.servlet_2.5.0.v200806031605.jar \ + javax.servlet_2.5.0.v200910301333.jar \ javax.servlet.jsp_2.0.0.v200806031607.jar \ org.apache.commons.codec_1.3.0.v20080530-1600.jar \ org.apache.commons.el_1.0.0.v200806031608.jar \ - org.apache.commons.httpclient_3.1.0.v20080605-1935.jar \ - org.apache.commons.logging_1.0.4.v200904062259.jar \ + org.apache.commons.httpclient_3.1.0.v201005080502.jar \ + org.apache.commons.logging_1.0.4.v201005080501.jar \ org.apache.jasper_5.5.17.v200903231320.jar \ - org.apache.lucene_1.9.1.v20080530-1600.jar \ - org.apache.lucene.analysis_1.9.1.v20080530-1600.jar \ + org.apache.lucene_1.9.1.v20100518-1140.jar \ + org.apache.lucene.analysis_1.9.1.v20100518-1140.jar \ + org.mortbay.jetty.util_6.1.23.v201004211559.jar \ + org.mortbay.jetty.server_6.1.23.v201004211559.jar \ org.hamcrest.core_1.1.0.v20090501071000.jar \ - org.mortbay.jetty.server_6.1.15.v200905151201.jar \ - org.mortbay.jetty.util_6.1.15.v200905182336.jar \ - org.objectweb.asm_3.1.0.v200803061910.jar -ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.1.1.v20090825.jar \ - org.sat4j.pb_2.1.1.v20090825.jar + org.objectweb.asm_3.2.0.v200909071300.jar +ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.2.0.v20100429.jar \ + org.sat4j.pb_2.2.0.v20100429.jar ANT_VERSION= 1.7.1 ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${EXTRACT_SUFX} ANT_BUNDLES= ant-antlr.jar \ @@ -95,12 +95,13 @@ ant-trax.jar JUNIT3_VERSION= 3.8.2 JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip -JUNIT4_VERSION= 4.8.1 +JUNIT4_VERSION= 4.8.2 JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar FBSD_SUPPORT_SRCFILE= freebsd-support.patch -MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" +MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION} +MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR} + WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//} PATCH_STRIP= -p1 @@ -115,14 +116,10 @@ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ share/pixmaps/${PORTNAME}.png -.for f in ${ECLIPSE_JAR_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} DISTFILES+= ${f}:2 .endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} -DISTFILES+= ${f}:3 -.endfor - .include <bsd.port.pre.mk> .if defined(WITH_TESTS) @@ -134,19 +131,12 @@ ALL_TARGET= provision.tests .endif -.if ${OSVERSION} >= 800000 -JAVA_VENDOR= bsdjava -.endif - # Copy the eclipse source file to the work area post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC} @${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/ @${MKDIR} ${BUILD_WRKSRC}/bundles -.for f in ${ECLIPSE_JAR_BUNDLES} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ -.endfor -.for f in ${ECLIPSE_SAT4J_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor .for f in ${ANT_BUNDLES} @@ -169,11 +159,14 @@ # Fixup boot classes path post-patch: @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties - @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/pdebuild.properties + @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml + @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/eclipse.desktop @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyPatches) .for f in ${ECLIPSE_JAR_BUNDLES} @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/jdtdependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties .endfor .for f in ${ECLIPSE_SAT4J_BUNDLES} @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties @@ -181,8 +174,9 @@ .for f in ${ANT_BUNDLES} @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties .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/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.properties + @${REINPLACE_CMD} -e "s+=/usr/share/java/junit4.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_WRKSRC}/jdtnonosgidependencies.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 +202,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: distinfo =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- distinfo 1 May 2010 17:27:58 -0000 1.10 +++ distinfo 26 Oct 2010 14:43:23 -0000 @@ -1,27 +1,27 @@ -MD5 (eclipse/eclipse-build-0.5.0.tar.bz2) = 4222efa5f5817b369db90843b0ca7563 -SHA256 (eclipse/eclipse-build-0.5.0.tar.bz2) = d5f184bb9337eff30e4828c55c866f678eb512b93c908402ef1acc812e1bcf16 -SIZE (eclipse/eclipse-build-0.5.0.tar.bz2) = 276662 -MD5 (eclipse/eclipse-3.5.2-src.tar.bz2) = 942cf2b429c3ce96bd8256f3cb5b2f81 -SHA256 (eclipse/eclipse-3.5.2-src.tar.bz2) = e16b9d392132054733ef510fa41123e61dc5dbc25e386124d497d9d8469324cf -SIZE (eclipse/eclipse-3.5.2-src.tar.bz2) = 59509303 +MD5 (eclipse/eclipse-build-0.6.1.tar.bz2) = dac006a81d45f366ecbf3f78f7fa9424 +SHA256 (eclipse/eclipse-build-0.6.1.tar.bz2) = 66b6344fe55523b1e2243bd37f9ad14aeff0fd7f0f44669a89cada9146e5b46e +SIZE (eclipse/eclipse-build-0.6.1.tar.bz2) = 295425 +MD5 (eclipse/eclipse-3.6.1-src.tar.bz2) = 306f8bf4ec2b0bf6f3f8329608cb15dd +SHA256 (eclipse/eclipse-3.6.1-src.tar.bz2) = 588f90209a75c8359e86deed5a48f5b3bff69e5d7e1856119e8a740c17646250 +SIZE (eclipse/eclipse-3.6.1-src.tar.bz2) = 62707872 MD5 (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 9330447f3763b87570dd1118c49a8efd SHA256 (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 24e54c9d90b81d1b7342695a8285a969393fd883e99ffbbc04203c106d9c2f97 SIZE (eclipse/apache-ant-1.7.1-bin.tar.bz2) = 7641928 MD5 (eclipse/junit3.8.2.zip) = 9b8963ba2147a64bd5f1574b6fd289cb SHA256 (eclipse/junit3.8.2.zip) = aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SIZE (eclipse/junit3.8.2.zip) = 461426 -MD5 (eclipse/junit-4.8.1.jar) = fb44723f35c2f1af5c51eb729b502f0d -SHA256 (eclipse/junit-4.8.1.jar) = efd8cf93b57d01e8f5fbefbe1f17ae39e6e22553615926e00a6eefc307da21e6 -SIZE (eclipse/junit-4.8.1.jar) = 237047 -MD5 (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 2c0e3112c5fe9361ea61b905a02150e8 -SHA256 (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 9629635b5ab76be6de3364bf2487356f57941a7cbe04239a70db9df566c169e7 -SIZE (eclipse/com.ibm.icu_4.0.1.v20090822.jar) = 5787493 +MD5 (eclipse/junit-4.8.2.jar) = 8a498c3d820db50cc7255d8c46c1ebd1 +SHA256 (eclipse/junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e +SIZE (eclipse/junit-4.8.2.jar) = 237344 +MD5 (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 3e6690e17b268a280532c2aff54c0cc6 +SHA256 (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 78150e19c1084d4ad085de156332f6985872d1da9d7b2e22b2c0360ecdc3b974 +SIZE (eclipse/com.ibm.icu_4.2.1.v20100412.jar) = 6451214 MD5 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 43d0a7e7f2b72bc94827a1420c99a3e1 SHA256 (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = ee8af42d01fbdd07a70762483b9eeda5dc8f23b386e04a6aa034b06df75c9396 SIZE (eclipse/com.jcraft.jsch_0.1.41.v200903070017.jar) = 225576 -MD5 (eclipse/javax.servlet_2.5.0.v200806031605.jar) = e3ee9d09500707048362df8b16e7b4c2 -SHA256 (eclipse/javax.servlet_2.5.0.v200806031605.jar) = 4c5fef96a177c72fa28470cb23d65833a541c77e0ea0914fb3d92f7c6aa902f0 -SIZE (eclipse/javax.servlet_2.5.0.v200806031605.jar) = 117853 +MD5 (eclipse/javax.servlet_2.5.0.v200910301333.jar) = e46e37400d01a527fab7a22edc74bd2d +SHA256 (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 27c684a06d3832578e2b0bfbd183d973ad5662cfee5cf116791091b74e0297ee +SIZE (eclipse/javax.servlet_2.5.0.v200910301333.jar) = 118873 MD5 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = afa76cbe2cf90a605d0d415eae4d7109 SHA256 (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 7129d8eb8759eae6169cb494d2ee031bb75a3dab68bc789d92d8a34f2f8a873e SIZE (eclipse/javax.servlet.jsp_2.0.0.v200806031607.jar) = 62707 @@ -31,42 +31,36 @@ MD5 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 8dfda26bbd970749ff7ae341a93c140f SHA256 (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 0d8b55ca35e851ce3d1e5beeb0e4c32ab0630d4d21b3ce324ef0ac0a45e3ad37 SIZE (eclipse/org.apache.commons.el_1.0.0.v200806031608.jar) = 127481 -MD5 (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 8dd836d15bf93050746681d726242461 -SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 339385ec9ffd7398db682988afaf6ccdca82086cf0255e7dd1fc298dc8ba08d5 -SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v20080605-1935.jar) = 320150 -MD5 (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 805a903497b0a7df138ea5e4a1fd0f54 -SHA256 (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 001948a5c62731984a3752043fb1f2d892806e1efb2ba8396c12fe5db2afadbd -SIZE (eclipse/org.apache.commons.logging_1.0.4.v200904062259.jar) = 44210 +MD5 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 4bf4a6337ada12733a56746c679adb72 +SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 0f215df922704e121e8504d9c34e60a40729d43badd90576e4c83446203cf77e +SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201005080502.jar) = 321329 +MD5 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = a5e6de22b126c858813d5a3431704e71 +SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 5f0c8730284da1752cca07de023eca14bdd50e99f7262239b17db8eaf7b40a71 +SIZE (eclipse/org.apache.commons.logging_1.0.4.v201005080501.jar) = 45398 MD5 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 0376ebc2882221c22315ffee622766fc SHA256 (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 0e440bffabde8db6ad20dee3075ad0a7a7699867be4f5e4b755fd1e56a93fb03 SIZE (eclipse/org.apache.jasper_5.5.17.v200903231320.jar) = 1721330 -MD5 (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 1188266fdd5e5d845ea3a4c54d148de1 -SHA256 (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 64cfb714fc520fba75277494fadab655d3d14f9429dfcb5a55d547a9e1d90e3f -SIZE (eclipse/org.apache.lucene_1.9.1.v20080530-1600.jar) = 444122 -MD5 (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = a943517c8c2ce1b2c9bd05f3a0a313b9 -SHA256 (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = 7eb8cfbe5ff091b186666daa2778b021b1f24d47fffdc8aff7ce693095d6954f -SIZE (eclipse/org.apache.lucene.analysis_1.9.1.v20080530-1600.jar) = 70361 +MD5 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 80107b569a61aed776e342626da0b51f +SHA256 (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 2bab6a2feaabaf8db9c04db16fec03435e37fe201294aead06096884e210ad7b +SIZE (eclipse/org.apache.lucene_1.9.1.v20100518-1140.jar) = 445306 +MD5 (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = 514505c60dd7d072a190b6daade42eb8 +SHA256 (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = bc55013ceb92b3f911217a9d913e89a72172af90895cec55a069bf047b0cac28 +SIZE (eclipse/org.apache.lucene.analysis_1.9.1.v20100518-1140.jar) = 71545 +MD5 (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 54e05281d44ccc038b09b16bd23368e3 +SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 36dc0cf4e75888f9ffb0d36551a915926f247cb4b3cfdeed80479ec8a687f011 +SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201004211559.jar) = 192846 +MD5 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = e800bdb1e4d56a9fe8a87766fe40738c +SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 17bcd3edc28a4808a13558077507da6ed5fe88cc8c216d00d87da88683d3d94d +SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201004211559.jar) = 557434 MD5 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = aa182429a9bbe01c485571f199a471aa SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 211c869941f7151fe7d3ecaae31b53d128a2d97684ed4ce455d2ca4ea3a0abeb SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 26650 -MD5 (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = a5108cbf1472be6299c0ea520e9d3dd1 -SHA256 (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = 06f490b0b13477cc110c78a9e5a2097e620404fa89ddc3411e66fd111d303599 -SIZE (eclipse/org.mortbay.jetty.server_6.1.15.v200905151201.jar) = 539578 -MD5 (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = ff20b874c732e0456f0c68032df06fff -SHA256 (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = b112a4f80922bd14ed5737160ba99fa4aabc04db6cea8913f2ca23d622e067ea -SIZE (eclipse/org.mortbay.jetty.util_6.1.15.v200905182336.jar) = 186357 -MD5 (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 35e516bfc32eb9145871c172b7cc4cf9 -SHA256 (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 62eac6f966b20394a349b44da04d87dd99c39edaa16b996d911c1cf88547388e -SIZE (eclipse/org.objectweb.asm_3.1.0.v200803061910.jar) = 220211 -MD5 (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 762d93cbd20e994347d2a9fabf085c01 -SHA256 (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 6f8541e936d770f8c21978f8939c5b97e9db38c0ac9826ae9a745ef91181d1a1 -SIZE (eclipse/org.sat4j.core_2.1.1.v20090825.jar) = 181816 -MD5 (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = a1de7d00453c99b8580bcc4c558be1d8 -SHA256 (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = 7329c67e844d59bbc2fd5d4cfcfbca7819eecfaac55afaf6c39c0d3dbcc108b0 -SIZE (eclipse/org.sat4j.pb_2.1.1.v20090825.jar) = 111984 -MD5 (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = c0103f2bc13eb2049ad9c6abcf46f8d2 -SHA256 (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = e2f2490e7854a26ccff3deca732e2565f3d86a246645160997b914a176924b06 -SIZE (eclipse/eclipse-sdktests-3.5.2-src.tar.bz2) = 86258617 -MD5 (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = 4e0445e114067defa20135a06cb184a1 -SHA256 (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = e06efe159fe1ee99536799795c6d76324d87fb125366ae03b85ada15f2629137 -SIZE (eclipse/eclipse-sdktests-3.5.2-scripts.tar.bz2) = 4802 +MD5 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 7aff7763a60c1e2c095e9ab05cca0a29 +SHA256 (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 3b30b0b87d9d517829eb6227c45657c767f3ec90019cb99d26638f5c4a07a15d +SIZE (eclipse/org.objectweb.asm_3.2.0.v200909071300.jar) = 229434 +MD5 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 02e0e62e6c55dbba2afb65fb649eda32 +SHA256 (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 4c3c8b6c3b05576fd1adba3c1ce04e6ea88dd1d9615163411baa76f269c750aa +SIZE (eclipse/org.sat4j.core_2.2.0.v20100429.jar) = 193845 +MD5 (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 3ded0a927f1736ba146a4b289c8eb3b9 +SHA256 (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 4c57e12cd17a128e14d3cf093ec265e6991a74fcba096c0d284145bf2cd0d44d +SIZE (eclipse/org.sat4j.pb_2.2.0.v20100429.jar) = 121389 cvs diff: Diffing files Index: files/eclipse-build-upstream.patch =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/eclipse-build-upstream.patch,v retrieving revision 1.1 diff -u -r1.1 eclipse-build-upstream.patch --- files/eclipse-build-upstream.patch 1 May 2010 17:27:59 -0000 1.1 +++ files/eclipse-build-upstream.patch 26 Oct 2010 14:43:24 -0000 @@ -17,7 +17,7 @@ =================================================================== --- build.xml (revision 23733) +++ build.xml (working copy) -@@ -88,6 +88,7 @@ +@@ -130,6 +130,7 @@ <ant inheritall="false" antfile="pdebuild.xml"> <property name="buildId" value="${buildId}" /> <property name="buildArch" value="${buildArch}" /> @@ -25,7 +25,7 @@ </ant> </target> -@@ -264,7 +265,10 @@ +@@ -315,7 +316,10 @@ <!-- end back-ported patches --> <!-- Only build for one target (bug #293952) --> <copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" /> @@ -34,10 +34,10 @@ + <replacefilter token="@build_arch@" value="${buildArch}" /> + <replacefilter token="@build_os@" value="${buildOs}" /> + </replace> + <patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" /> <echo file="patch-stamp" /> </target> - -@@ -350,6 +354,7 @@ +@@ -399,6 +403,7 @@ <!-- <ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}"> <property name="arch" value="${buildArch}"/> @@ -45,7 +45,7 @@ <property name="builder" value="${buildConfig}" /> </ant> --> -@@ -404,9 +409,9 @@ +@@ -462,9 +467,9 @@ <target name="compile.libgnomeproxy" if="build.libgnomeproxy"> <!-- build libgnomeproxy --> @@ -58,7 +58,7 @@ </target> <target name="compilelibs" unless="compilelibs.complete"> -@@ -418,16 +423,16 @@ +@@ -476,16 +481,16 @@ <include name="**/*.so" /> </fileset> </delete> @@ -78,14 +78,14 @@ <copy todir="${buildDirectory}/plugins/${launcherfragment}"> <fileset dir="${launcherlibs}/library/gtk"> <include name="**/*.so" /> -@@ -435,13 +440,13 @@ +@@ -493,13 +498,13 @@ </copy> <!-- build liblocalfile --> - <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" /> -- <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}"> +- <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}"> + <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}" executable="make" failonerror="true" /> -+ <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}"> ++ <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}"> </move> <!-- build libgnomeproxy --> <antcall target="compile.libgnomeproxy" /> @@ -95,7 +95,7 @@ <echo file="compilelibs-stamp" /> </target> -@@ -544,7 +549,7 @@ +@@ -593,7 +598,7 @@ <arg line="-application org.eclipse.ant.core.antRunner " /> <arg line="-buildfile buildConfiguration.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> @@ -104,41 +104,41 @@ <arg line="-Dreposource=${reposource} " /> <arg line="-Dbasedir=${productFiles}/rcpConfig" /> <arg line="-DbuildId=${buildId} " /> -@@ -570,6 +575,7 @@ +@@ -631,6 +636,7 @@ <arg line="-buildfile publishProduct.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> <arg line="-DbuildArch=${buildArch} " /> + <arg line="-DbuildOs=${buildOs} " /> <arg line="-Dreposource=${reposource} " /> <arg line="-DbuildConfig=${buildConfig} " /> - <arg line="-DproductFiles=${productFiles} " /> -@@ -587,7 +593,7 @@ - <param name="p2.director.profile" value="SDKProfile" /> - <param name="p2.director.install.path" value="${buildDirectory}/installation" /> + <arg line="-DproductFile=${productFile} " /> +@@ -721,7 +727,7 @@ + <param name="p2.director.profile" value="${profileName}" /> + <param name="p2.director.install.path" value="${provisionDir}" /> <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" /> - <param name="p2.os" value="linux" /> + <param name="p2.os" value="${buildOs}" /> <param name="p2.ws" value="gtk" /> <param name="p2.arch" value="${buildArch}" /> <param name="p2.repo" value="${reposource}" /> -@@ -647,6 +653,8 @@ - <chmod perm="ugo+rx" file="${basedir}/runtests.sh" /> +@@ -800,6 +806,8 @@ + --> <exec executable="${basedir}/runtests.sh" dir="${basedir}"> <arg value="-t${timestamp}" /> + <arg value="-a${buildArch}" /> + <arg value="-o${buildOs}" /> - </exec> - <property name="testResultDir" value="${basedir}/tests_${timestamp}/results" /> - <!-- Copy over the XML to generate a top-level report for all of the tests --> -@@ -772,7 +780,7 @@ + <arg value="-b ${testsBuildDirectory}" /> + <arg value="-p ${provisionDir}" /> + <arg value="${testSwitches}" /> +@@ -924,7 +932,7 @@ <property name="startupjarpath" refid="startupjar" /> - <symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" /> + <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" /> <!-- Create the "swt.jar" and friends symlinks --> -- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" /> -+ <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> +- <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" /> ++ <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> <property name="swtjarpath" refid="swtjar" /> - <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" /> - <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk.jar" resource="plugins/${swtjarpath}" /> + <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" /> + <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" /> Index: pdebuild.xml =================================================================== --- pdebuild.xml (revision 23733) @@ -179,10 +179,10 @@ =================================================================== --- publishProduct.xml (revision 23733) +++ publishProduct.xml (working copy) -@@ -2,7 +2,7 @@ +@@ -1,7 +1,7 @@ + <project name="Eclipse SDK build" default="publish" basedir="."> <target name="publish"> - <echo message="Calling p2.publish.product with repository=${reposource} and productFile=${productFiles}/sdk/sdk.product"/> - <p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFiles}/sdk/sdk.product" compress="true"> + <p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFile}" compress="true"> - <config os="linux" ws="gtk" arch="${buildArch}" /> + <config os="${buildOs}" ws="gtk" arch="${buildArch}" /> <advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> @@ -192,24 +192,25 @@ =================================================================== --- runtests.sh (revision 23733) +++ runtests.sh (working copy) -@@ -14,6 +14,8 @@ - -g Don't run the tests headless - -d Allow remote connection to test runs' JVM +@@ -16,6 +16,8 @@ + -b Tests build directory + -p Clean installation directory to copy for running test suites -t Timestamp string with which to tag the results + -a Architecture to run the tests on + -o OS to run the tests on + -v Make test runs output to the console _EOF_ } +@@ -83,6 +85,8 @@ + headless=1 + fi -@@ -72,6 +74,7 @@ - # Defaults - debugTests=0 - headless=1 + buildOs=linux - testFramework=org.eclipse.test_3.2.0 - if [ -z ${timestamp} ]; then - timestamp=$(date "+%Y%m%d%H%M%S") -@@ -116,21 +119,16 @@ ++ + label=$(grep label build.properties | sed s/label=//) + testframework=$(grep ^testframework build.properties | sed s/testframework=//) + +@@ -142,21 +146,16 @@ if [ ${headless} == 1 ]; then # Try to find Xvnc xvnc= @@ -238,7 +239,7 @@ fi } -@@ -139,9 +137,11 @@ +@@ -165,9 +164,11 @@ port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58` echo localhost > Xvnc.cfg echo "Setting up Xvnc on port ${port} with password VNCpassword1" @@ -252,7 +253,7 @@ } function setArch() { -@@ -160,13 +160,15 @@ +@@ -186,13 +187,15 @@ arch=ia64 ;; ppc) arch=ppc ;; @@ -269,36 +270,36 @@ fi } -@@ -177,7 +179,7 @@ - -application org.eclipse.ant.core.antRunner \ - -file $testDriver \ - -Declipse-home=${eclipseHome} \ -- -Dos=linux \ -+ -Dos=${buildOs} \ - -Dws=gtk \ - -Darch=${arch} \ - -Dlibrary-file=$libraryXml \ -@@ -185,7 +187,7 @@ - -logger org.apache.tools.ant.DefaultLogger \ - -vmargs \ - -Duser.home=${homedir} \ -- -Dosgi.os=linux \ -+ -Dosgi.os=${buildOs} \ - -Dosgi.ws=gtk \ - -Dosgi.arch=${arch} - } -@@ -288,7 +290,7 @@ +@@ -206,7 +209,7 @@ + -application org.eclipse.ant.core.antRunner \ + -file $testDriver \ + -Declipse-home=${eclipseHome} \ +- -Dos=linux \ ++ -Dos=${buildOs} \ + -Dws=gtk \ + -Darch=${arch} \ + -Dlibrary-file=$libraryXml \ +@@ -214,7 +217,7 @@ + -logger org.apache.tools.ant.DefaultLogger \ + -vmargs \ + -Duser.home=${homedir} \ +- -Dosgi.os=linux \ ++ -Dosgi.os=${buildOs} \ + -Dosgi.ws=gtk \ + -Dosgi.arch=${arch} + else +@@ -348,7 +351,7 @@ } # Command-line arguments --while getopts "de:gt:h" OPTION -+while getopts "de:gt:a:o:h" OPTION +-while getopts "vde:gb:p:t:h" OPTION ++while getopts "vde:gb:p:t:a:o:h" OPTION do case $OPTION in d) -@@ -300,6 +302,12 @@ - t) - timestamp=$OPTARG +@@ -366,6 +369,12 @@ + p) + provisionDir=$OPTARG ;; + a) + buildArch=$OPTARG @@ -309,14 +310,3 @@ h) usage exit 1 -Index: build.sh -=================================================================== ---- build.sh (revision 23733) -+++ build.sh (working copy) -@@ -38,5 +38,5 @@ - esac - DATE=`date +%Y%m%d%H%M%S` - --ant -DbuildArch=${arch} 2>&1 | tee build_${DATE}.log -+ant -DbuildArch=${arch} -DbuildOs=linux 2>&1 | tee build_${DATE}.log - echo "Build log is available in build_${DATE}.log" Index: files/freebsd-support.patch =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/freebsd-support.patch,v retrieving revision 1.1 diff -u -r1.1 freebsd-support.patch --- files/freebsd-support.patch 1 May 2010 17:27:59 -0000 1.1 +++ files/freebsd-support.patch 26 Oct 2010 14:43:43 -0000 @@ -10,12 +10,12 @@ case $MODEL in "x86_64") defaultOSArch="x86_64" -@@ -97,6 +98,7 @@ +@@ -98,6 +98,7 @@ "SunOS") makefile="make_solaris.mak" defaultOS="solaris" + MAKE=make - javaHome="/usr/jdk/jdk1.5.0_01" + [ -d /usr/jdk/jdk1.5.0_01 ] && javaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH @@ -119,6 +121,24 @@ @@ -109,7 +109,7 @@ +DLL = $(PROGRAM_LIBRARY) +#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl +LIBS = -lpthread -+GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" ++GTK_LIBS = -DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" -DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\"" +LFLAGS = -shared -fpic -Wl,--export-dynamic +CFLAGS = -g -s -Wall\ + -fpic \ @@ -175,10 +175,10 @@ + rm -f $(EXEC) $(DLL) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) --- build.orig/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/target.build.properties 2009-12-23 15:12:32.595953209 -0500 +++ build/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/target.build.properties 2009-12-23 15:14:12.390811604 -0500 -@@ -89,3 +89,6 @@ +@@ -98,3 +98,6 @@ - root.linux.motif.x86=bin/motif/linux/x86,motif_root - root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so + root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root + root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root + +root.freebsd.gtk.x86=bin/gtk/freebsd/x86,gtk_root +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root @@ -305,7 +305,7 @@ ws="motif" --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2009-12-23 15:14:12.391816744 -0500 -@@ -0,0 +1,32 @@ +@@ -0,0 +1,36 @@ +#********************************************************************** +# Copyright (c) 2000, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials @@ -314,12 +314,12 @@ +# http://www.eclipse.org/legal/epl-v10.html +#********************************************************************** +# -+# makefile for libcore.so ++# makefile for libunixfile_1_0_0.so + -+CORE.C = ../localfile.c -+CORE.O = localfile.o -+LIB_NAME = liblocalfile.so -+LIB_NAME_FULL = liblocalfile_1_0_0.so ++CORE.C = ../unixfile.c ++CORE.O = unixfile.o ++LIB_NAME = libunixfile.so ++LIB_NAME_FULL = libunixfile_1_0_0.so + +#Set this to be your OS type +OS_TYPE = freebsd @@ -338,6 +338,10 @@ + +clean : + rm *.o ++ ++install: core ++ rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so ++ mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/ --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem/natives/unix/freebsd/include/os_custom.h 2009-12-23 15:14:12.392819649 -0500 @@ -0,0 +1,23 @@ @@ -859,7 +863,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Bundle-Localization: launcher.gtk.freebsd.x86_64 +Eclipse-BundleShape: dir @@ -1109,7 +1113,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) +Bundle-Localization: launcher.gtk.freebsd.x86 +Eclipse-BundleShape: dir @@ -1267,8 +1271,8 @@ + <target name="post.clean"> + </target> +</project> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.linux.x86.properties 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.linux.x86.properties 2009-12-23 15:14:12.423942951 -0500 +--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 1969-12-31 19:00:00.000000000 -0500 ++++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2009-12-23 15:14:12.423942951 -0500 @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2007 IBM Corporation and others. @@ -1323,7 +1327,7 @@ +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true +Bundle-Version: 1.0.200.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1.0)" ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.2.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Bundle-Localization: launcher.gtk.freebsd.x86_64 +Eclipse-BundleShape: dir @@ -1645,14 +1649,14 @@ +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java 2009-12-23 15:14:12.440005914 -0500 @@ -93,6 +93,8 @@ brandAIX(); - if ("hpux".equals(os)) //$NON-NLS-1$ + else if ("hpux".equals(os)) //$NON-NLS-1$ brandHPUX(); -+ if ("freebsd".equals(os)) //$NON-NLS-1$ ++ else if ("freebsd".equals(os)) //$NON-NLS-1$ + brandFreeBSD(); + else + renameLauncher(); } - - private void brandAIX() { -@@ -213,6 +215,12 @@ +@@ -224,6 +226,12 @@ } } @@ -1985,14 +1989,14 @@ +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java 2009-12-23 15:14:12.471129495 -0500 @@ -80,6 +80,8 @@ brandAIX(); - if ("hpux".equals(os)) //$NON-NLS-1$ + else if ("hpux".equals(os)) //$NON-NLS-1$ brandHPUX(); -+ if ("freebsd".equals(os)) //$NON-NLS-1$ ++ else if ("freebsd".equals(os)) //$NON-NLS-1$ + brandFreeBSD(); + else + renameLauncher(); } - - private void brandAIX() { -@@ -107,6 +109,12 @@ +@@ -110,6 +112,12 @@ } } @@ -2217,7 +2221,7 @@ @@ -45,7 +45,7 @@ inSDK=1 inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR) - if [ $inSDK == 0 ]; then + if [ $inSDK = 0 ]; then - PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7) + PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut -d ' ' -f 7) ERROR="" @@ -2225,7 +2229,7 @@ echo "ERROR: could not determine the feature id for $PROJECTDIR" @@ -59,7 +59,7 @@ if [ "x$ERROR" != "xyes" ]; then - if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then + if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR" - ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME" + ln -sf "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME" @@ -2234,7 +2238,7 @@ fi @@ -74,11 +74,11 @@ inSDK=$(echo $dir | grep -c $BUILDDIR) - if [ $inSDK == 0 ]; then + if [ $inSDK = 0 ]; then if [ -e "$dir/META-INF/MANIFEST.MF" ]; then - PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2) + PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut -d ';' -f 1 | cut -d ' ' -f 2) @@ -2249,7 +2253,7 @@ if [ -z "$PROJECTNAME" ]; then @@ -93,7 +93,7 @@ if [ "x$ERROR" != "xyes" ]; then - if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then + if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir" - ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME" + ln -sf "$dir" $BUILDDIR/plugins/"$PROJECTNAME" @@ -2309,15 +2313,15 @@ +root.freebsd.gtk.x86_64=eclipse,about_files/,about.html,icon.xpm --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java 2009-04-27 14:28:33.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/exports/ProductExportOperation.java 2009-12-23 15:14:12.484181229 -0500 -@@ -327,6 +327,8 @@ - images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); - } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ - images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); -+ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ -+ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); - } - if (images != null) { - if (icons.length() > 0) +@@ -329,6 +329,8 @@ + images = getExpandedPath(info.getIconPath(ILauncherInfo.LINUX_ICON)); + } else if (configs[i][0].equals("macosx")) { //$NON-NLS-1$ + images = getExpandedPath(info.getIconPath(ILauncherInfo.MACOSX_ICON)); ++ } else if (configs[i][0].equals("freebsd")) { //$NON-NLS-1$ ++ images = getExpandedPath(info.getIconPath(ILauncherInfo.FREEBSD_ICON)); + } + if (images != null) { + if (icons.length() > 0) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java 2009-05-27 16:25:43.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IArgumentsInfo.java 2009-12-23 15:14:12.493217711 -0500 @@ -13,22 +13,25 @@ @@ -2737,13 +2741,6 @@ LauncherSection_linuxLabel=A single XPM icon is required: LauncherSection_large=Large: LauncherSection_medium=Medium: -@@ -2282,4 +2283,4 @@ - - Product_FeatureSection_properties=Properties... - --PDEJUnitLaunchConfigurationTab_Run_Tests_In_UI_Thread=Run in &UI thread -\ No newline at end of file -+PDEJUnitLaunchConfigurationTab_Run_Tests_In_UI_Thread=Run in &UI thread --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 2009-03-06 17:52:06.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 2009-12-23 15:14:12.521328666 -0500 @@ -128,7 +128,7 @@ @@ -2847,8 +2844,8 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" ]; then - if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then + if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then -+ XULRUNNER_INCLUDES=`pkg-config --cflags libxul-unstable` -+ XULRUNNER_LIBS="`pkg-config --libs libxul-unstable` -lxpcomglue" ++ XULRUNNER_INCLUDES=`pkg-config --cflags libxul` ++ XULRUNNER_LIBS="`pkg-config --libs libxul` -lxpcomglue" + export XULRUNNER_INCLUDES + export XULRUNNER_LIBS + MAKE_MOZILLA="make_xulrunner make_xpcominit" @@ -2871,14 +2868,15 @@ echo " *** Mozilla embedding support will not be compiled." --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2007-06-20 12:01:22.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak 2009-12-23 15:17:21.337309883 -0500 -@@ -1,5 +1,5 @@ - #******************************************************************************* --# Copyright (c) 2000, 2007 IBM Corporation and others. -+# Copyright (c) 2000, 2009 IBM Corporation and others. - # All rights reserved. This program and the accompanying materials - # are made available under the terms of the Eclipse Public License v1.0 - # which accompanies this distribution, and is available at -@@ -46,7 +46,7 @@ +@@ -39,6 +39,7 @@ + MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so ++WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + + CAIROCFLAGS = `pkg-config --cflags cairo` +@@ -46,11 +47,11 @@ # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) GTKCFLAGS = `pkg-config --cflags gtk+-2.0` @@ -2887,19 +2885,24 @@ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc -@@ -59,7 +59,7 @@ +-AWT_LFLAGS = -shared ++AWT_LFLAGS = -shared ${SWT_LFLAGS} + AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt + + ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` +@@ -59,7 +60,7 @@ + GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 - GLXCFLAGS = --GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm -+GLXLIBS = -shared -fPIC -L${LOCALBASE}/lib -lGL -lGLU -lm +-GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm ++GLXLIBS = -L${LOCALBASE}/lib -lGL -lGLU -lm # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -@@ -78,7 +78,17 @@ +@@ -78,7 +79,20 @@ -I$(JAVA_HOME)/include/freebsd \ ${SWT_PTR_CFLAGS} - MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic - +MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ + -DNO__1XPCOMGlueStartup \ @@ -2912,19 +2915,23 @@ + -DNO_nsDynamicFunctionLoad +XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 + ++WEBKITCFLAGS = `pkg-config --cflags gtk+-2.0 webkit-1.0` ++WEBKITLIBS = `pkg-config --libs webkit-1.0` ++ SWT_OBJECTS = swt.o c.o c_stats.o callback.o CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o AWT_OBJECTS = swt_awt.o -@@ -87,7 +97,7 @@ +@@ -87,14 +101,16 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o -XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o +XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o ++WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -@@ -95,6 +105,7 @@ + CFLAGS = -O -Wall \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DFREEBSD -DGTK \ @@ -2932,8 +2939,8 @@ -I$(JAVA_HOME)/include \ -I$(JAVA_HOME)/include/freebsd \ -fPIC \ -@@ -209,16 +220,16 @@ - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} +@@ -209,16 +225,16 @@ + $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp @@ -2953,8 +2960,8 @@ # # XULRunner lib -@@ -229,22 +240,16 @@ - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} +@@ -229,22 +245,16 @@ + $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp @@ -2980,6 +2987,30 @@ # # XPCOMInit lib +@@ -264,6 +274,23 @@ + $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp + + # ++# WebKit lib ++# ++make_webkit: $(WEBKIT_LIB) ++ ++$(WEBKIT_LIB): $(WEBKIT_OBJECTS) ++ $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) ++ ++webkit.o: webkitgtk.c ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o ++ ++webkit_structs.o: webkitgtk_structs.c ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o ++ ++webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h ++ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o ++ ++# + # GLX lib + # + make_glx: $(GLX_LIB) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:12:33.298742157 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java 2009-12-23 15:14:12.577551971 -0500 @@ -23,18 +23,19 @@ @@ -3044,7 +3075,7 @@ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true -+Bundle-Version: 3.5.0.qualifier ++Bundle-Version: 3.6.1.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -4858,425 +4889,18 @@ +custom = true --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/build.xml 2009-12-23 15:14:12.583575548 -0500 -@@ -0,0 +1,419 @@ +@@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir="."> + -+ <target name="init" depends="properties"> -+ <property name="compilerArg" value="" /> -+ <property name="ws" value="gtk" /> -+ <property name="os" value="freebsd" /> -+ <property name="arch" value="x86" /> -+ <property name="fragment" value="org.eclipse.swt.gtk.freebsd.x86" /> -+ <property name="version.suffix" value="3.5.0" /> -+ <property name="full.name" value="${fragment}_${version.suffix}" /> -+ <property name="temp.folder" value="${basedir}/temp.folder" /> -+ <property name="plugin.destination" value="${basedir}" /> -+ <property name="build.result.folder" value="${basedir}" /> -+ <property name="destination" value="${basedir}" /> -+ <property name="plugindir" value="../org.eclipse.swt" /> -+ <property name="bootclasspath" value="" /> -+ <property name="javacVerbose" value="false" /> -+ <property name="logExtension" value=".xml" /> -+ <property name="javacSource" value="1.3" /> -+ <property name="javacTarget" value="1.2" /> -+ <path id="path_bootclasspath"> -+ <fileset dir="${java.home}/lib"> -+ <include name="*.jar" /> -+ </fileset> -+ </path> -+ <property name="bootclasspath" refid="path_bootclasspath" /> -+ <condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"> -+ <isset property="CDC-1.0/Foundation-1.0" /> -+ </condition> -+ <condition property="bundleBootClasspath" value="${J2SE-1.3}"> -+ <isset property="J2SE-1.3" /> -+ </condition> -+ <property name="bundleJavacSource" value="${javacSource}" /> -+ <property name="bundleJavacTarget" value="${javacTarget}" /> -+ <property name="bundleBootClasspath" value="${bootclasspath}" /> -+ <condition property="p2.publish.parts" value="true"> -+ <istrue value="${p2.gathering}" /> -+ </condition> -+ </target> -+ -+ <target name="properties" if="eclipse.running"> -+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" /> -+ </target> -+ -+ <target name="build.update.jar" depends="init"> -+ <delete dir="${temp.folder}" /> -+ <mkdir dir="${temp.folder}" /> -+ <antcall target="build.jars" /> -+ <antcall target="gather.bin.parts"> -+ <param name="destination.temp.folder" value="${temp.folder}/" /> -+ </antcall> -+ <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false" /> -+ <delete dir="${temp.folder}" /> -+ </target> -+ -+ <target name="@dot" depends="init" unless="@dot" description="Create jar: @dot."> -+ <property name="destdir" value="${temp.folder}/@dot.bin" /> -+ <property name="debug" value="true" /> -+ <property name="jar.filename" value="swt.jar" /> -+ <delete dir="${temp.folder}/@dot.bin" /> -+ <mkdir dir="${temp.folder}/@dot.bin" /> -+ <javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" classpath="${plugindir}/extra_jars/exceptions.jar" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"> -+ <src path="${plugindir}/Eclipse SWT/cairo/" /> -+ <src path="${plugindir}/Eclipse SWT/common/" /> -+ <src path="${plugindir}/Eclipse SWT/common_j2se/" /> -+ <src path="${plugindir}/Eclipse SWT/emulated/bidi/" /> -+ <src path="${plugindir}/Eclipse SWT/emulated/coolbar/" /> -+ <src path="${plugindir}/Eclipse SWT/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Accessibility/common/" /> -+ <src path="${plugindir}/Eclipse SWT Accessibility/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT AWT/common/" /> -+ <src path="${plugindir}/Eclipse SWT AWT/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Browser/common/" /> -+ <src path="${plugindir}/Eclipse SWT Mozilla/common/" /> -+ <src path="${plugindir}/Eclipse SWT Mozilla/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Custom Widgets/common/" /> -+ <src path="${plugindir}/Eclipse SWT Drag and Drop/common/" /> -+ <src path="${plugindir}/Eclipse SWT Drag and Drop/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT OpenGL/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT OpenGL/glx/" /> -+ <src path="${plugindir}/Eclipse SWT OpenGL/common/" /> -+ <src path="${plugindir}/Eclipse SWT PI/cairo/" /> -+ <src path="${plugindir}/Eclipse SWT PI/common/" /> -+ <src path="${plugindir}/Eclipse SWT PI/common_j2se/" /> -+ <src path="${plugindir}/Eclipse SWT PI/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Printing/common/" /> -+ <src path="${plugindir}/Eclipse SWT Printing/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Program/cde/" /> -+ <src path="${plugindir}/Eclipse SWT Program/common/" /> -+ <src path="${plugindir}/Eclipse SWT Program/gnome/" /> -+ <src path="${plugindir}/Eclipse SWT Program/gtk/" /> -+ <src path="${plugindir}/Eclipse SWT Theme/gtk/" /> -+ <compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> -+ <compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" /> -+ </javac> -+ <property name="includes" value="" /> -+ <property name="excludes" value="**/*.java,**/library/,**/package.htm*,**/*._properties,**/*.idl" /> -+ <copy todir="${temp.folder}/@dot.bin"> -+ <fileset dir="${plugindir}/Eclipse SWT/cairo/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/bidi/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/coolbar/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Browser/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common_j2se/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/common/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="${includes}" excludes="${excludes}" /> -+ <fileset dir="${plugindir}/components/" includes="${includes}" excludes="${excludes}" /> -+ </copy> -+ <antcall target="copy.translationfiles" /> -+ -+ <mkdir dir="${build.result.folder}/@dot" /> -+ <copy todir="${build.result.folder}/@dot" failonerror="true"> -+ <fileset dir="${temp.folder}/@dot.bin" /> -+ </copy> -+ <!-- prepare a jar file solely for the download target --> -+ <jar jarfile="${build.result.folder}/${jar.filename}" basedir="${temp.folder}/@dot.bin" /> -+ <delete dir="${temp.folder}/@dot.bin" /> -+ </target> -+ -+ <target name="build.jars" depends="init"> -+ <available property="@dot" file="${build.result.folder}/@dot" /> -+ <antcall target="@dot" /> -+ </target> -+ -+ <target name="build.cfiles" depends="init"> -+ <mkdir dir="${build.result.folder}/library" /> -+ <copy todir="${build.result.folder}/library"> -+ <fileset dir="${plugindir}/Eclipse SWT/common/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library"/> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library" /> -+ </copy> -+ </target> -+ -+ <target name="build.nativeLibraries" depends="build.cfiles"> -+ <exec dir="${build.result.folder}/library" executable="sh"> -+ <env key="OUTPUT_DIR" value="${build.result.folder}" /> -+ <arg line="${build.result.folder}/library/build.sh" /> -+ <arg line="install" /> -+ </exec> -+ </target> -+ -+ <target name="src.zip" depends="init" unless="src.zip"> -+ <mkdir dir="${build.result.folder}/" /> -+ <zip zipfile="${build.result.folder}/src.zip"> -+ <fileset dir="${plugindir}/Eclipse SWT/cairo/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/bidi/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/coolbar/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Browser/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common_j2se/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library/" excludes="**/*.sh" /> -+ <zipfileset filemode="755" dir="${plugindir}/Eclipse SWT PI/gtk/library/" includes="**/*.sh" /> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="**/*.properties" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/" includes="**/version.txt" excludes="" /> -+ <fileset dir="${basedir}" includes="about.html,about_files/" excludes="" /> -+ </zip> -+ </target> -+ -+ <target name="copy.src" depends="init"> -+ <copy todir="${destination.temp.folder}/" failonerror="true" overwrite="true"> -+ <fileset dir="${plugindir}/Eclipse SWT/cairo/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/bidi/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/emulated/coolbar/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Accessibility/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Browser/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Custom Widgets/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Drag and Drop/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT OpenGL/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/cairo/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common_j2se/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/common/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT PI/gtk/library/" /> -+ <!--<zipfileset filemode="755" dir="${plugindir}/Eclipse SWT PI/gtk/library/" includes="**/*.sh"/> --> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Printing/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/cde/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/common/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gnome/library/" /> -+ <fileset dir="${plugindir}/Eclipse SWT Program/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT Theme/gtk/" includes="**/*.java" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="**/*.properties" excludes="" /> -+ <fileset dir="${plugindir}/Eclipse SWT/common/" includes="**/version.txt" excludes="" /> -+ <fileset dir="${basedir}" includes="about.html,about_files/" excludes="" /> -+ </copy> -+ </target> -+ -+ <target name="build.sources" depends="init"> -+ <available property="src.zip" file="${build.result.folder}/src.zip" /> -+ <antcall target="src.zip" /> -+ </target> -+ -+ <target name="build.zips" depends="init"> -+ </target> -+ -+ <target name="gather.sources" depends="init" if="destination.temp.folder"> -+ <mkdir dir="${destination.temp.folder}/${full.name}" /> -+ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/${full.name}/" /> -+ <copy todir="${destination.temp.folder}/${full.name}"> -+ <fileset dir="${basedir}" includes="about.html" /> -+ <fileset dir="${basedir}" includes="about_files/" /> -+ </copy> -+ </target> -+ -+ <target name="gather.individual.sources" depends="init"> -+ <antcall target="copy.src" /> -+ <copy todir="${destination.temp.folder}"> -+ <fileset dir="${basedir}" includes="about.html,about_files/" /> -+ </copy> -+ </target> -+ -+ <target name="gather.logs" depends="init" if="destination.temp.folder"> -+ <mkdir dir="${destination.temp.folder}/${full.name}" /> -+ <copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/${full.name}/" /> -+ </target> ++ <property name="swt.ws" value="gtk" /> ++ <property name="swt.os" value="freebsd" /> ++ <property name="swt.arch" value="x86" /> + -+ <target name="publish.bin.parts" depends="init" if="p2.publish.parts"> -+ <antcall target="gather.bin.parts"> -+ <param name="destination.temp.folder" value="${build.result.folder}" /> -+ </antcall> -+ <eclipse.gatherBundle metadataRepository="${p2.build.repo}" artifactRepository="${p2.build.repo}" buildResultFolder="${build.result.folder}" targetFolder="${build.result.folder}/${full.name}" /> -+ </target> -+ -+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder"> -+ <mkdir dir="${destination.temp.folder}/${full.name}" /> -+ <copy todir="${destination.temp.folder}/${full.name}" failonerror="true"> -+ <fileset dir="${build.result.folder}/@dot" includes="**" /> -+ </copy> -+ <copy todir="${destination.temp.folder}/${full.name}"> -+ <fileset dir="${basedir}" includes="fragment.properties,swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libcairo-swt.so,META-INF/" /> -+ <fileset dir="${basedir}" includes="about.html" /> -+ <fileset dir="${basedir}" includes="about_files/" /> -+ </copy> -+ <chmod perm="755" dir="${destination.temp.folder}/${full.name}" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libcairo-swt.so" /> -+ <eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}" /> -+ <antcall target="apitools.generation"> -+ <param name="target.folder" value="${destination.temp.folder}/${full.name}"/> -+ <param name="projectLocation" value="${basedir}"/> -+ <param name="binary.folders" value="${build.result.folder}/@dot"/> -+ <param name="projectName" value="${full.name}"/> -+ <param name="extraSourceLocations" value="${basedir}/${plugindir}"/> -+ <param name="extraManifests" value="${basedir}/${plugindir}/META-INF/MANIFEST.MF"/> -+ </antcall> -+ </target> -+ -+ <target name="swtdownload" depends="init"> -+ <delete dir="${temp.folder}" /> -+ <delete dir="${build.result.folder}/@dot" /> -+ <!-- ensure entry into @dot target --> -+ <mkdir dir="${temp.folder}/swtdownload/" /> -+ <property name="includetranslationfiles" value="true" /> -+ <antcall target="build.jars"> -+ <param name="debug" value="true" /> -+ <param name="jar.filename" value="swt-debug.jar" /> -+ </antcall> -+ <jar jarfile="${build.result.folder}/swt-debug.jar" basedir="${basedir}" update="true" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2" /> -+ <copy file="${build.result.folder}/swt-debug.jar" todir="${temp.folder}/swtdownload" /> -+ <delete dir="${build.result.folder}/@dot" /> -+ <!-- this is needed to re-enter @dot --> -+ <antcall target="build.jars"> -+ <param name="debug" value="false" /> -+ <param name="jar.filename" value="swt.jar" /> -+ </antcall> -+ <jar jarfile="${build.result.folder}/swt.jar" basedir="${basedir}" update="true" includes="swt*.dll,libswt*.so,libswt*.sl,libswt*.a,libswt*.jnilib,libXm.so.2" /> -+ <copy file="${build.result.folder}/swt.jar" todir="${temp.folder}/swtdownload" /> -+ <antcall target="build.sources" /> -+ <copy file="${build.result.folder}/src.zip" todir="${temp.folder}/swtdownload" /> -+ <copy file="${plugindir}/build/.project" todir="${temp.folder}/swtdownload" /> -+ <copy file="${plugindir}/build/.classpath" todir="${temp.folder}/swtdownload" /> -+ <copy todir="${temp.folder}/swtdownload"> -+ <fileset dir="${basedir}" includes="about.html,about_files/" /> -+ </copy> -+ <zip zipfile="${destination}/swt-${buildid}-${ws}-${os}-${arch}.zip"> -+ <zipfileset dir="${temp.folder}/swtdownload/" /> -+ </zip> -+ <delete dir="${temp.folder}" /> -+ </target> ++ <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> ++ <property name="version.suffix" value="3.6.1" /> + -+ <target name="clean" depends="init"> -+ <delete dir="${build.result.folder}/@dot" /> -+ <delete file="${build.result.folder}/src.zip" /> -+ <delete file="${plugin.destination}/${full.name}.jar" /> -+ <delete file="${plugin.destination}/${full.name}.zip" /> -+ <delete dir="${temp.folder}" /> -+ </target> -+ -+ <target name="refresh" depends="init" if="eclipse.running"> -+ <eclipse.refreshLocal resource="${fragment}" depth="infinite" /> -+ </target> -+ -+ <target name="zip.plugin" depends="init"> -+ <delete dir="${temp.folder}" /> -+ <mkdir dir="${temp.folder}" /> -+ <antcall target="build.jars" /> -+ <antcall target="build.sources" /> -+ <antcall target="gather.bin.parts"> -+ <param name="destination.temp.folder" value="${temp.folder}/" /> -+ </antcall> -+ <antcall target="gather.sources"> -+ <param name="destination.temp.folder" value="${temp.folder}/" /> -+ </antcall> -+ <delete> -+ <fileset dir="${temp.folder}" includes="**/*.bin${logExtension}" /> -+ </delete> -+ <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true" /> -+ <delete dir="${temp.folder}" /> -+ </target> -+ -+ <target name="copy.translationfiles" if="includetranslationfiles"> -+ <copy todir="${temp.folder}/@dot.bin" overwrite="true"> -+ <fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="**/*._properties" excludes="" /> -+ </copy> -+ <move todir="${temp.folder}/@dot.bin" overwrite="true"> -+ <fileset dir="${temp.folder}/@dot.bin/" includes="**/*._properties" excludes="" /> -+ <mapper type="glob" from="*._properties" to="*.properties" /> -+ </move> -+ </target> -+ -+ <target name="jar.plugin" depends="init"> -+ <delete dir="${temp.folder}" /> -+ <mkdir dir="${temp.folder}" /> -+ <antcall target="build.jars" /> -+ <antcall target="gather.bin.parts"> -+ <param name="destination.temp.folder" value="${temp.folder}/" /> -+ </antcall> -+ <jar jarfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="true" /> -+ <delete dir="${temp.folder}" /> -+ </target> -+ -+ <target name="apitools.generation" if="generateAPIDescription"> -+ <apitooling.apigeneration -+ projectName="${projectName}" -+ project="${projectLocation}" -+ binary="${binary.folders}" -+ target="${target.folder}" -+ extraManifests="${extraManifests}" -+ extraSourceLocations="${extraSourceLocations}"/> -+ </target> ++ <import file="../org.eclipse.swt/buildFragment.xml"/> +</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/fragment.properties 2009-12-23 15:14:12.583575548 -0500 @@ -7580,17 +7204,6 @@ +############################################################################### +fragmentName = Standard Widget Toolkit for GTK 2.0 +providerName = Eclipse.org ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java 2006-05-10 13:49:07.000000000 -0400 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.team.cvs.ssh/src/org/eclipse/team/internal/ccvs/ssh/KnownHosts.java 2009-12-23 15:14:12.596627282 -0500 -@@ -38,7 +38,7 @@ - } - - static String defaultFilename() { -- if (!Platform.getOS().equals(Platform.OS_LINUX)) return internalFilename(); -+ if (!Platform.getOS().equals(Platform.OS_LINUX) && !Platform.getOS().equals(Platform.OS_FREEBSD)) return internalFilename(); - String HOME = System.getProperty("user.home"); //$NON-NLS-1$ - if (HOME==null) return internalFilename(); - return HOME+"/.ssh/known_hosts"; //$NON-NLS-1$ --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.ui.intro.universal/plugin.xml 2009-05-26 16:09:14.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.ui.intro.universal/plugin.xml 2009-12-23 15:14:12.604659183 -0500 @@ -45,7 +45,7 @@ @@ -8068,3 +7681,91 @@ + +#endif +#endif +--- build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java~ Fri Feb 19 13:12:49 2010 ++++ build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/CompoundIterator.java Wed Oct 20 15:55:11 2010 +@@ -25,7 +25,7 @@ + private final Iterator<? extends Object> iteratorIterator; + private Iterator<T> currentIterator; + +- private T nextObject = noElement(); ++ private Object nextObject = NO_ELEMENT; + + /** + * Creates a compound iterator that will iterated over the elements +@@ -47,8 +47,9 @@ + if (!positionNext()) + throw new NoSuchElementException(); + +- T nxt = nextObject; +- nextObject = noElement(); ++ @SuppressWarnings("unchecked") ++ T nxt = (T) nextObject; ++ nextObject = NO_ELEMENT; + return nxt; + } + +@@ -76,9 +77,4 @@ + nextObject = currentIterator.next(); + return true; + } +- +- @SuppressWarnings("unchecked") +- private static <T> T noElement() { +- return (T) NO_ELEMENT; +- } +-} +\ No newline at end of file ++} +--- build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java.orig Fri Feb 19 13:12:48 2010 ++++ build/eclipse-3.6.1-src/plugins/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/MatchIteratorFilter.java Wed Oct 20 15:58:15 2010 +@@ -21,7 +21,7 @@ + + private final Iterator<? extends T> innerIterator; + +- private T nextObject = noElement(); ++ private Object nextObject = NO_ELEMENT; + + public MatchIteratorFilter(Iterator<? extends T> iterator) { + this.innerIterator = iterator; +@@ -35,8 +35,9 @@ + if (!positionNext()) + throw new NoSuchElementException(); + +- T nxt = nextObject; +- nextObject = noElement(); ++ @SuppressWarnings("unchecked") ++ T nxt = (T) nextObject; ++ nextObject = NO_ELEMENT; + return nxt; + } + +@@ -63,9 +64,4 @@ + } + return false; + } +- +- @SuppressWarnings("unchecked") +- private static <T> T noElement() { +- return (T) NO_ELEMENT; +- } +-} +\ No newline at end of file ++} +--- build/eclipse-3.6.1-src/pluginVersions.properties~ Fri Oct 1 17:18:03 2010 ++++ build/eclipse-3.6.1-src/pluginVersions.properties Wed Oct 20 20:19:42 2010 +@@ -33,6 +33,7 @@ + org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=R36x_v20100810 + org.eclipse.equinox.http,0.0.0=v20100503 + org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3655c ++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3655c + org.eclipse.swt.photon.qnx.x86,0.0.0=v3655c + org.eclipse.equinox.p2.ui.admin,0.0.0=v20100503 + org.eclipse.equinox.weaving.caching.j9,0.0.0=v20100503 +@@ -244,6 +245,7 @@ + org.eclipse.swt.examples,0.0.0=v3655c + org.eclipse.cvs,0.0.0=v20100414 + org.eclipse.swt.gtk.linux.x86,0.0.0=v3655c ++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3655c + org.eclipse.equinox.log,0.0.0=v20100503 + org.eclipse.equinox.jmx.client,0.0.0=v20100503 + org.eclipse.ui.win32,0.0.0=I20100509-0800 Index: files/patch-eclipse-build =================================================================== RCS file: /home/ncvs/ports/java/eclipse-devel/files/patch-eclipse-build,v retrieving revision 1.1 diff -u -r1.1 patch-eclipse-build --- files/patch-eclipse-build 1 May 2010 17:27:59 -0000 1.1 +++ files/patch-eclipse-build 26 Oct 2010 14:43:44 -0000 @@ -63,7 +63,21 @@ +CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%% --- eclipse-build-0.5.0.orig/build.xml 2009-12-23 16:22:44.090824173 -0500 +++ eclipse-build-0.5.0/build.xml 2009-12-23 16:23:06.357147407 -0500 -@@ -124,8 +124,7 @@ +@@ -117,11 +117,11 @@ + + <target name="setLibDir" depends="setLib64Dir"> + <property name="libDir" value="lib" /> +- <property name="installationDir" value="${destDir}${prefix}/${libDir}/eclipse" /> ++ <property name="installationDir" value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" /> + </target> + + <target name="getInstallationDir" depends="setLibDir"> +- <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}" /> ++ <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}/%%PORTNAME%%" /> + </target> + + <property name="doTests" value="true" /> +@@ -166,8 +166,7 @@ <target name="copySource" unless="sdkSourcePresent"> <echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" /> <exec executable="cp" failonerror="true"> @@ -73,59 +87,73 @@ <arg value="eclipse" /> <arg value="${buildDirectory}" /> </exec> -@@ -243,8 +242,14 @@ +@@ -292,8 +291,10 @@ + <target name="applyPatches" depends="insertBuildId" unless="patch.complete"> <!-- eclipse-build-only patches --> - <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-jdt_launch-customBuild.patch" dir="${buildDirectory}" strip="0" /> -- <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="3" /> -- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library" strip="6" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"> -+ <arg value="-p3" /> -+ <arg value="-i${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" /> -+ </exec> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"> -+ <arg value="-p6" /> -+ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" /> -+ </exec> - <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}/features/org.eclipse.equinox.executable" strip="0" /> -@@ -269,6 +274,10 @@ - <replacefilter token="@build_arch@" value="${buildArch}" /> + <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" /> +- <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" /> +- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-swt.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" /> +@@ -306,9 +307,15 @@ + <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/junit4-nochecksum.patch" dir="${buildDirectory}" strip="0" /> +- <patch patchfile="${basedir}/patches/bz318912.patch" dir="${buildDirectory}" strip="0" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p0" /> ++ <arg value="-i${basedir}/patches/bz318912.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" /> +- <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/eclipse-swt-compile-xpt.patch" /> ++ </exec> + <replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" /> + <chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" /> + <!-- end eclipse-build-only patches --> +@@ -321,6 +328,10 @@ <replacefilter token="@build_os@" value="${buildOs}" /> </replace> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/freebsd-support.patch" /> -+ </exec> + <patch patchfile="${basedir}/patches/java-home.patch" dir="${buildDirectory}" strip="2" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/freebsd-support.patch" /> ++ </exec> <echo file="patch-stamp" /> </target> -@@ -651,7 +660,8 @@ - <format property="timestamp" pattern="yyyyMMddHHmmss" /> - </tstamp> - <chmod perm="ugo+rx" file="${basedir}/runtests.sh" /> +@@ -804,7 +815,8 @@ + <!-- + <echo message="Calling runtests with (debug, verbose) = (${testSwitches})" /> + --> - <exec executable="${basedir}/runtests.sh" dir="${basedir}"> -+ <exec executable="${localbase}/bin/bash" dir="${basedir}"> -+ <arg value="${basedir}/runtests.sh" /> ++ <exec executable="${localbase}/bin/bash" dir="${basedir}"> ++ <arg value="${basedir}/runtests.sh" /> <arg value="-t${timestamp}" /> <arg value="-a${buildArch}" /> <arg value="-o${buildOs}" /> -@@ -755,44 +765,42 @@ - </target> +@@ -906,26 +918,25 @@ - <target name="install" depends="provision.sdk"> -- <mkdir dir="${destDir}${prefix}/${libDir}/eclipse" /> -+ <mkdir dir="${destDir}${prefix}/${libDir}/%%PORTNAME%%" /> - <exec executable="cp" failonerror="true"> + <target name="installIntoDestDir"> + <mkdir dir="${installationDir}" /> +- <exec executable="cp" failonerror="true"> - <arg value="-rd" /> - <arg value="--no-target-directory" /> -- <arg value="${buildDirectory}/installation" /> -- <arg value="${destDir}${prefix}/${libDir}/eclipse" /> -+ <arg value="-R" /> -+ <arg value="${buildDirectory}/installation/" /> -+ <arg value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" /> +- <arg value="${provisionDir}" /> +- <arg value="${installationDir}" /> ++ <exec executable="cp" failonerror="true"> ++ <arg value="-RL" /> ++ <arg value="${provisionDir}/" /> ++ <arg value="${installationDir}" /> </exec> + <!-- install desktop file --> - <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" /> + <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> @@ -139,44 +167,57 @@ <mkdir dir="${destDir}${prefix}/share/pixmaps" /> - <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" /> + <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" /> - <!--shared dropins folder--> + <!--shared dropins folder for architecture-independent plugins--> - <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" /> -- <!-- eclipse binary --> -- <mkdir dir="${destDir}${prefix}/bin" /> -- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" /> + <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" /> + <!-- eclipse binary --> + <mkdir dir="${destDir}${prefix}/bin" /> +- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" /> ++ <symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" /> + <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated --> <!-- Create the "startup.jar" symlink --> -- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" /> -+ <fileset dir="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" /> - <property name="startupjarpath" refid="startupjar" /> -- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/startup.jar" resource="plugins/${startupjarpath}" /> -+ <symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/startup.jar" resource="plugins/${startupjarpath}" /> - <!-- Create the "swt.jar" and friends symlinks --> -- <fileset dir="${destDir}/${prefix}/${libDir}/eclipse/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> -+ <fileset dir="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> - <property name="swtjarpath" refid="swtjar" /> -- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" /> -- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt-gtk.jar" resource="plugins/${swtjarpath}" /> -- <symlink link="${destDir}/${prefix}/${libDir}/eclipse/swt.jar" resource="plugins/${swtjarpath}" /> -- -- <echo append="true" file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" /> -+ <symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" /> -+ <symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt-gtk.jar" resource="plugins/${swtjarpath}" /> -+ <symlink link="${destDir}/${prefix}/${libDir}/%%PORTNAME%%/swt.jar" resource="plugins/${swtjarpath}" /> -+ -+ <echo append="true" file="${destDir}${prefix}/${libDir}/%%PORTNAME%%/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" /> - + <fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" /> +@@ -938,7 +949,7 @@ + <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" /> + <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" /> + +- <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" /> ++ <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" /> + + <!-- Extract SWT JNI .so files --> + <java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}"> +@@ -990,8 +1001,8 @@ + <arg value="s@/@_@g" /> + </exec> + <apply executable="sed" failonerror="true" verbose="true"> +- <arg value="-i" /> +- <arg value="\@${destDir}@d;\@${destDirWithUnderscores}@d;\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" /> ++ <arg value="-i.bak" /> ++ <arg value="\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" /> + <srcfile /> + <fileset dir="${installationDir}"> + <include name="metadata/content.xml" /> +@@ -1012,7 +1023,7 @@ + </fileset> + </apply> + <apply executable="sed" failonerror="true" verbose="true"> +- <arg value="-i" /> ++ <arg value="-i.bak" /> + <arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" /> + <srcfile /> + <fileset dir="${installationDir}/${profileDir}"> +@@ -1027,9 +1038,11 @@ + </apply> + <!-- Move config file to /etc --> + <!-- <mkdir dir="${destDir}/etc" /> - <move file="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" /> - <symlink link="${destDir}${prefix}/${libDir}/eclipse/eclipse.ini" resource="/etc/eclipse.ini" /> -- + <move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" /> + <symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" /> + --> -+ + </target> - <target name="package.extract.swt"> --- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh 2009-11-11 07:59:07.000000000 -0500 +++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh 2009-12-23 16:23:06.357147407 -0500 @@ -230,7 +230,7 @@ @@ -190,16 +231,22 @@ if [ "x$zipDeps" != "x" ]; then --- eclipse-build-0.5.0.orig/pdebuild.properties 2009-10-01 08:58:04.000000000 -0400 +++ eclipse-build-0.5.0/pdebuild.properties 2009-12-23 16:23:06.358151430 -0500 -@@ -5,7 +5,7 @@ +@@ -1,11 +1,11 @@ + buildArch=x86 + ws=gtk +-os=linux ++os=freebsd + buildId=M20100211-1343 buildTag=vM20100211-1343 - label=3.5.2 +-label=3.6.0 -bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar ++label=3.6.1 +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter javacFailOnError=true -@@ -28,21 +28,21 @@ +@@ -29,21 +29,21 @@ CDC-1.1/PersonalBasis-1.1=${bootclasspath} CDC-1.1/PersonalJava-1.1=${bootclasspath} # Somehow bootclasspath isn't expanded when used by antRunner @@ -250,3 +297,15 @@ </java> <taskdef name="eclipse.versionReplacer" classname="org.eclipse.pde.internal.build.tasks.GenericVersionReplacer" +--- eclipse-build-0.6.1/eclipse.desktop.orig Tue Sep 29 23:34:41 2009 ++++ eclipse-build-0.6.1/eclipse.desktop Tue Oct 26 15:24:36 2010 +@@ -2,7 +2,7 @@ + Type=Application + Name=Eclipse + Comment=Eclipse Integrated Development Environment +-Icon=eclipse +-Exec=eclipse ++Icon=%%PORTNAME%% ++Exec=%%PORTNAME%% + Terminal=false + Categories=Development;IDE;Java; cvs diff: Diffing scripts --=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86ocahge29.fsf>