diff options
| author | glewis <glewis@FreeBSD.org> | 2012-09-20 03:58:38 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2012-09-20 03:58:38 +0800 |
| commit | 482c8eb159206f732e7e3569c94ce8606a7e677e (patch) | |
| tree | c8f5bf5b59e738585d13f38044f60afc68a1ec0b /java | |
| parent | 88f332f5470560246f8b018f8700aed610f3c559 (diff) | |
| download | freebsd-ports-gnome-482c8eb159206f732e7e3569c94ce8606a7e677e.tar.gz freebsd-ports-gnome-482c8eb159206f732e7e3569c94ce8606a7e677e.tar.zst freebsd-ports-gnome-482c8eb159206f732e7e3569c94ce8606a7e677e.zip | |
. Update to 4.2.0 and re-enable.
Submitted by: tg@
Diffstat (limited to 'java')
| -rw-r--r-- | java/eclipse-devel/Makefile | 148 | ||||
| -rw-r--r-- | java/eclipse-devel/distinfo | 52 | ||||
| -rw-r--r-- | java/eclipse-devel/files/MANIFEST.MF.junit4 | 64 | ||||
| -rw-r--r-- | java/eclipse-devel/files/eclipse-build-upstream.patch | 95 | ||||
| -rw-r--r-- | java/eclipse-devel/files/freebsd-support.patch | 1611 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-dependencyManifests | 135 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-eclipse-build | 334 | ||||
| -rw-r--r-- | java/eclipse-devel/files/patch-generatedScripts | 80 |
8 files changed, 1185 insertions, 1334 deletions
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile index 1a32a0c1b097..2633ea5a5368 100644 --- a/java/eclipse-devel/Makefile +++ b/java/eclipse-devel/Makefile @@ -6,22 +6,24 @@ # PORTNAME= eclipse-devel -PORTVERSION= 3.7.1 -PORTREVISION= 2 +PORTVERSION= 4.2.0 CATEGORIES= java devel -MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \ - http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \ +MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \ + http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \ - ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%/,junit/junit/${JUNIT3_VERSION}/:5,} \ http://cloud.github.com/downloads/KentBeck/junit/:6 \ ${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/:7,} \ - ${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/extras/:7,} + ${MASTER_SITE_APACHE_TOMCAT:S,%SUBDIR%/,tomcat-7/v${TOMCAT_VERSION}/bin/extras/:7,} \ + http://archive.eclipse.org/jetty/8.1.0.v20120127/dist/:8 \ + http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-annotation_1.1_spec/1.0/:9 \ + http://artfiles.org/apache.org/felix/:10 DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \ ${ECLIPSE_SRCFILE}:1 \ ${ANT_SRCFILE}:4 \ - ${JUNIT3_SRCFILE}:5 \ ${JUNIT4_SRCFILE}:6 \ - ${TOMCAT_SRCFILES:C,(.*),\\1:7,} + ${TOMCAT_SRCFILES:C,(.*),\\1:7,} \ + ${ECLIPSE_JETTY_SRCFILE}:8 \ + ${GERONIMO_ANNOTATION_BUNDLE}:9 DIST_SUBDIR= eclipse EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE} @@ -39,9 +41,8 @@ BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \ zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -IGNORE= is currently older than java/eclipse - -OPTIONS= TESTS "Build SDK test suite" off +OPTIONS_DEFINE= TESTS +TESTS_DESC= "Build SDK test suite" ONLY_FOR_ARCHS= i386 amd64 @@ -61,12 +62,19 @@ JAVA_RUN= yes JAVA_VERSION= 1.6 JAVA_VENDOR= openjdk -ECLIPSE_BUILD_SRCFILE= eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92${EXTRACT_SUFX} -ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-src${BZIP2_SUFX} +ECLIPSE_RELEASE_VERSION=I20120608-1400 +ECLIPSE_BUILD_SRCFILE= eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3${EXTRACT_SUFX} +ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-${ECLIPSE_RELEASE_VERSION}-src${BZIP2_SUFX} ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${BZIP2_SUFX} ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${BZIP2_SUFX} -ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.4.2.v20110208.jar \ - com.jcraft.jsch_0.1.41.v201101211617.jar \ +ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.4.2.v20110823.jar \ + com.ibm.icu.source_4.4.2.v20110823.jar \ + com.jcraft.jsch_0.1.44.v201101211721.jar \ + javax.inject_1.0.0.v20091030.jar \ + javax.xml_1.3.4.v201005080400.jar \ + org.apache.batik.css_1.6.0.v201011041432.jar \ + org.apache.batik.util_1.6.0.v201011041432.jar \ + org.apache.batik.util.gui_1.6.0.v201011041432.jar \ org.apache.commons.codec_1.3.0.v201101211617.jar \ org.apache.commons.el_1.0.0.v201101211617.jar \ org.apache.commons.httpclient_3.1.0.v201012070820.jar \ @@ -76,10 +84,21 @@ ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.4.2.v20110208.jar \ org.hamcrest.core_1.1.0.v20090501071000.jar \ org.mortbay.jetty.util_6.1.23.v201012071420.jar \ org.mortbay.jetty.server_6.1.23.v201012071420.jar \ - org.objectweb.asm_3.3.1.v201105211655.jar + org.objectweb.asm_3.3.1.v201105211655.jar \ + org.w3c.css.sac_1.3.1.v200903091627.jar \ + org.w3c.dom.svg_1.1.0.v201011041433.jar ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.3.0.v20110329.jar \ org.sat4j.pb_2.3.0.v20110329.jar -ANT_VERSION= 1.8.2 +ECLIPSE_JETTY_VERSION= 8.1.0.v20120127 +ECLIPSE_JETTY_SRCFILE= jetty-distribution-${ECLIPSE_JETTY_VERSION}.tar.gz +ECLIPSE_JETTY_BUNDLES= jetty-util-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-server-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-http-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-continuation-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-io-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-security-${ECLIPSE_JETTY_VERSION}.jar \ + jetty-servlet-${ECLIPSE_JETTY_VERSION}.jar +ANT_VERSION= 1.8.3 ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX} ANT_BUNDLES= ant-antlr.jar \ ant-apache-bcel.jar \ @@ -101,9 +120,7 @@ ANT_BUNDLES= ant-antlr.jar \ ant-launcher.jar \ ant-swing.jar \ ant-testutil.jar -JUNIT3_VERSION= 3.8.2 -JUNIT3_SRCFILE= junit${JUNIT3_VERSION}.zip -JUNIT4_VERSION= 4.8.2 +JUNIT4_VERSION= 4.10 JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar TOMCAT_VERSION= 7.0.25 TOMCAT_SRCFILES= apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar @@ -114,35 +131,42 @@ TOMCAT_BUNDLES= el-api.jar \ servlet-api.jar \ tomcat-api.jar \ tomcat-juli.jar +GERONIMO_ANNOTATION_BUNDLE= geronimo-annotation_1.1_spec-1.0.jar +FELIX_BUNDLES= org.apache.felix.gogo.command-0.12.0.jar \ + org.apache.felix.gogo.runtime-0.10.0.jar \ + org.apache.felix.gogo.shell-0.10.0.jar FBSD_SUPPORT_SRCFILE= freebsd-support.patch -ECLIPSE_GENERATED_BUILDSCRIPTS= eclipse-build-generatedScripts.tar.bz2 +BUILD_DEPSDIR= ${BUILD_WRKSRC}/dependencies -ALL_TARGET= provision.cvs +ALL_TARGET= provisionSDKinDropins INSTALL_TARGET= installSDKinDropins -MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION} +MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}-${ECLIPSE_RELEASE_VERSION} MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR} WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//} PATCH_STRIP= -p1 -BOOTCLASSPATH= ${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/jsse.jar +BOOTCLASSPATH= ${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar PORTDESTDIR= ${PREFIX}/lib/${PORTNAME} DROPINS_DIR= share/${PORTNAME}/dropins PLIST_FILES= bin/${PORTNAME} \ share/applications/${PORTNAME}.desktop \ - share/icons/hicolor/16x16/apps/${PORTNAME}.png \ share/icons/hicolor/32x32/apps/${PORTNAME}.png \ share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + share/icons/hicolor/256x256/apps/${PORTNAME}.png \ share/pixmaps/${PORTNAME}.png .for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} DISTFILES+= ${f}:2 .endfor +.for f in ${FELIX_BUNDLES} +DISTFILES+= ${f}:10 +.endfor .include <bsd.port.pre.mk> -.if defined(WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} DISTFILES+= ${ECLIPSE_TEST_SRCFILE}:1 ${ECLIPSE_TEST_SCRIPTFILE}:1 BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ @@ -151,25 +175,21 @@ BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ ALL_TARGET= runTests .endif -# Prepare Eclipse source, Ant, JUnit and Tomcat bundles +# Prepare Eclipse source, Ant, JUnit, Tomcat, Jetty and Geronimo bundles post-extract: @${MKDIR} ${BUILD_WRKSRC}/bundles @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC} @${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/ -.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} +.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} ${FELIX_BUNDLES} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS}) @(cd ${WRKDIR} && ${BZIP2_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ANT_SRCFILE} ${EXTRACT_AFTER_ARGS}) .for f in ${ANT_BUNDLES} @${CP} ${WRKDIR}/apache-ant-${ANT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor - @${MKDIR} ${WRKDIR}/junit - @${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/${JUNIT3_SRCFILE} -d ${WRKDIR}/junit - @${CP} ${WRKDIR}/junit/junit${JUNIT3_VERSION}/junit.jar ${BUILD_WRKSRC}/bundles/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/${JUNIT4_SRCFILE} ${BUILD_WRKSRC}/bundles/junit4.jar @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS}) @@ -178,7 +198,14 @@ post-extract: @${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ .endfor -.if defined(WITH_TESTS) + @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ECLIPSE_JETTY_SRCFILE} ${EXTRACT_AFTER_ARGS}) +.for f in ${ECLIPSE_JETTY_BUNDLES} + @${CP} ${WRKDIR}/jetty-distribution-${ECLIPSE_JETTY_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/ +.endfor + + @${CP} ${DISTDIR}/${DIST_SUBDIR}/${GERONIMO_ANNOTATION_BUNDLE} ${BUILD_WRKSRC}/bundles/ + +.if ${PORT_OPTIONS:MTESTS} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE} ${BUILD_WRKSRC} .endif @@ -190,8 +217,6 @@ pre-patch: # Fixup boot classes path post-patch: - @(cd ${BUILD_WRKSRC}/generatedScripts; tar cjf ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} plugins) - @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/build.properties @${REINPLACE_CMD} -e "s+%%BOOTCLASSPATH%%+${BOOTCLASSPATH}+g" ${BUILD_WRKSRC}/pdebuild.properties @${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/build.xml @@ -200,45 +225,54 @@ post-patch: @(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 + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/jdtdependencies.properties + @${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/sdkdependencies.properties .endfor .for f in ${ECLIPSE_SAT4J_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_DEPSDIR}/dependencies.properties +.endfor +.for f in ${ECLIPSE_JETTY_BUNDLES} + @${REINPLACE_CMD} -e "s+^${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=\(.*\)+${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties .endfor .for f in ${ANT_BUNDLES} - @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties + @${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/nonosgidependencies.properties .endfor - @${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 - @${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_DEPSDIR}/jdtnonosgidependencies.properties + @${JAR} umf ${FILESDIR}/MANIFEST.MF.junit4 ${BUILD_WRKSRC}/bundles/junit4.jar + + @${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.v201108011116.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties + @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar + @${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_DEPSDIR}/dependencies.properties @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.el_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper-el.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_DEPSDIR}/dependencies.properties @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper.jar - @${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar - @${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_WRKSRC}/dependencies.properties - @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.v201112011158.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties + @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar + @${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.v201112011016.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties + @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar + @${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-api.jar - @${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_WRKSRC}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_DEPSDIR}/dependencies.properties @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.juli_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-juli.jar - @${MV} ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v200903070017.jar ${BUILD_WRKSRC}/dependencyManifests/com.jcraft.jsch_0.1.41.v201101211617.jar + @${REINPLACE_CMD} -e "s+^\(org.apache.geronimo.specs.geronimo-annotation_1.1_spec.jar\)=.*+\1=${BUILD_WRKSRC}/bundles/${GERONIMO_ANNOTATION_BUNDLE}+" ${BUILD_DEPSDIR}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.command\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.12.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.runtime\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties + @${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.shell\)\(_0.8.0.v201110170705.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties + + @${MV} ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.0.1.v200903091627.jar ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.3.4.v201005080400.jar @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar @${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA - @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201005080502.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.httpclient_3.1.0.v201012070820.jar @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201012071420.jar @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201012071420.jar @${MV} ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201105211655.jar + @${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA META-INF/MANIFEST.MF + @${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.w3c.dom.svg_1.1.0.v201011041433.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar -.if defined(WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches) .endif @@ -273,7 +307,7 @@ do-install: @${ECHO_CMD} "@exec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${PREFIX}/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${TMPPLIST} -.if defined(WITH_TESTS) +.if ${PORT_OPTIONS:MTESTS} tests: build @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} runTests) .else diff --git a/java/eclipse-devel/distinfo b/java/eclipse-devel/distinfo index 8de808cd22b5..0cdc9ac52bb0 100644 --- a/java/eclipse-devel/distinfo +++ b/java/eclipse-devel/distinfo @@ -1,21 +1,35 @@ -SHA256 (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 07f3d9c564e0c8b5ad8a9cee5645a295913059885290e4e4a77631d17b494265 -SIZE (eclipse/eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92.tar.xz) = 253596 -SHA256 (eclipse/eclipse-3.7.1-src.tar.bz2) = f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6 -SIZE (eclipse/eclipse-3.7.1-src.tar.bz2) = 69243059 -SHA256 (eclipse/apache-ant-1.8.2-bin.tar.bz2) = ecb49f5017807c9320bf19702149328cf4779a01bddca2b6c47e3ebb0e39c9c7 -SIZE (eclipse/apache-ant-1.8.2-bin.tar.bz2) = 6740047 -SHA256 (eclipse/junit3.8.2.zip) = aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a -SIZE (eclipse/junit3.8.2.zip) = 461426 -SHA256 (eclipse/junit-4.8.2.jar) = a2aa2c3bb2b72da76c3e6a71531f1eefdc350494819baf2b1d80d7146e020f9e -SIZE (eclipse/junit-4.8.2.jar) = 237344 +SHA256 (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 182507df10f79d2bf3436aca0f6b4b4c652f76b2f117a0dfa9989dd815bcf5b9 +SIZE (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 304184 +SHA256 (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = c7cf3218e8873e5f8383111c7887636c92d36a847a78ac5adc2687854a21e08d +SIZE (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = 77996040 +SHA256 (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 93238e8861acf0ca0546dc4f7c9256e0bf83effbff4afca0ba0aa024d4abd4d1 +SIZE (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 4254036 +SHA256 (eclipse/junit-4.10.jar) = 5ccbfcf78fb3663d9bed8ce826934231f93ad40e9a4c6796ba4ccf8557a28d69 +SIZE (eclipse/junit-4.10.jar) = 253160 SHA256 (eclipse/apache-tomcat-7.0.25.tar.gz) = 7ba03b6703b43da6868613fd625bfb13a791d57478b4a4e49bdb56f9fc3994b4 SIZE (eclipse/apache-tomcat-7.0.25.tar.gz) = 7527434 SHA256 (eclipse/tomcat-juli.jar) = cafd9cf2e73dd21d3fbe89fc83ae235a588342c11f7b8df7c55573aebc25f0d1 SIZE (eclipse/tomcat-juli.jar) = 78801 -SHA256 (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 432cdb7d9af5f138fbfd1902c197f01a314422a7db760e291cab2c76d8d65be8 -SIZE (eclipse/com.ibm.icu_4.4.2.v20110208.jar) = 6690628 -SHA256 (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 7e916b685794f33f494668f738a5aee51da67af04f0ebfb68048900032e36d1a -SIZE (eclipse/com.jcraft.jsch_0.1.41.v201101211617.jar) = 226770 +SHA256 (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = f3f88abb93f70061d361596c7de5051ae148b01b5897d1b40ab314d6a6e95379 +SIZE (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = 12950131 +SHA256 (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 6d2d296d01540201bca6e7175bf900f6df0be605e29bdaf822df516f40235ff9 +SIZE (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 21584 +SHA256 (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 3b8ba468997fd9ae21cdf3972f1d512cf09c5442dd0334d49ce49328ba34f8e7 +SIZE (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 6701200 +SHA256 (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 6b983efbce0b4fc18de095fdb637f6ead777bf4cf53f51b244d63fb44d43b579 +SIZE (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 1754121 +SHA256 (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = e370a86fae85897c6ba8ed663f20ff9ea2901764226344babb3e93ac418ed227 +SIZE (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = 199127 +SHA256 (eclipse/javax.inject_1.0.0.v20091030.jar) = 42a3f56421d64fed322c66738affd5afa221caf967bbf42d96b7cecc3a598428 +SIZE (eclipse/javax.inject_1.0.0.v20091030.jar) = 12288 +SHA256 (eclipse/javax.xml_1.3.4.v201005080400.jar) = 22d52002b1bab03b51372c197411a7aee2a5d80f8a3f767eeeace71d1e0c4ad2 +SIZE (eclipse/javax.xml_1.3.4.v201005080400.jar) = 237996 +SHA256 (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 330230ef1445f554fef4420a3fa1209048a4896250bf82d36adfe0b6ed142d81 +SIZE (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 265409 +SHA256 (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = bfef3b67286b9f9213e9cb58cec25e5549e4e3db54332951466ae07931672a03 +SIZE (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = 101159 +SHA256 (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 59e05961020cb2de4ea224d48bf6758e74e58af30a4c5c81d9b500f8f4ab6b30 +SIZE (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 164253 SHA256 (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 47dc744368dc7a4cde2be1e9d9e744ec014dca27ff7a23722da12db10e67419e SIZE (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 55011 SHA256 (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 31867a6e2166e744dced07606852ef84e41db24bfd93a3da375ef4454bde13bc @@ -36,7 +50,17 @@ SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 88fcf37ef94 SIZE (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 557887 SHA256 (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 84920bb2d003a88e9a585b7daa2cc163aa6bc5e9efa997f8622436ca3fac3b95 SIZE (eclipse/org.objectweb.asm_3.3.1.v201105211655.jar) = 228617 +SHA256 (eclipse/org.w3c.css.sac_1.3.1.v200903091627.jar) = e75b95da845d2b1db2787799bca3761b018dde48eb052e4c4a810086502d4dae +SIZE (eclipse/org.w3c.css.sac_1.3.1.v200903091627.jar) = 32952 +SHA256 (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 0e23a9b5f8f92b8edff8a443fb27e79411f2474d8f352361a08a280de35dfdd2 +SIZE (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 87897 SHA256 (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 3e6c4a633ede8c24a86559cf9fc2231840dbf032398a38a960677723906728c1 SIZE (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 210700 SHA256 (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = c40ca55dad3a937dc4c4005e5facf11204a61d56824c2b19eac480dfbeeaaafd SIZE (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = 140725 +SHA256 (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 5799c75d81dd5682ff79f3e440b9ba77c5511fe683b5b7d5a322059ce4d39800 +SIZE (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 51746 +SHA256 (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 15e94961ae2d0046278686965fe6a34ad43d8d18719f5bc2304e725cdb57a379 +SIZE (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 66965 +SHA256 (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 5a625f772d7c03443229d9a1e9f9b851892ee363c2e88ef1d5b55ed0979431a2 +SIZE (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 49004 diff --git a/java/eclipse-devel/files/MANIFEST.MF.junit4 b/java/eclipse-devel/files/MANIFEST.MF.junit4 new file mode 100644 index 000000000000..df0e7e827850 --- /dev/null +++ b/java/eclipse-devel/files/MANIFEST.MF.junit4 @@ -0,0 +1,64 @@ +Manifest-Version: 1.0 +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.junit +Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too + ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900 +Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r + eexport +Export-Package: junit.extensions;version="4.10.0",junit.framework;versi + on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0", + org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org. + junit.experimental.categories;version="4.10.0",org.junit.experimental. + max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or + g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t + heories;version="4.10.0",org.junit.experimental.theories.internal;vers + ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier + s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true + ,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun + it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter + nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn + ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model + ;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen + ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0 + ",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or + g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica + tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn + ers.model;version="4.10.0" +Bundle-Version: 4.10.0.v4_10_0_v20120426-0900 +Bundle-ManifestVersion: 2 +Manifest-Version: 1.0 +Bundle-ClassPath: . +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Name: %pluginName +Bundle-SymbolicName: org.junit +Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too + ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900 +Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r + eexport +Export-Package: junit.extensions;version="4.10.0",junit.framework;versi + on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0", + org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org. + junit.experimental.categories;version="4.10.0",org.junit.experimental. + max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or + g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t + heories;version="4.10.0",org.junit.experimental.theories.internal;vers + ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier + s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true + ,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun + it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter + nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn + ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model + ;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen + ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0 + ",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or + g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica + tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn + ers.model;version="4.10.0" +Bundle-Version: 4.10.0.v4_10_0_v20120426-0900 +Bundle-ManifestVersion: 2 diff --git a/java/eclipse-devel/files/eclipse-build-upstream.patch b/java/eclipse-devel/files/eclipse-build-upstream.patch index d4c5991762b7..01f52759e594 100644 --- a/java/eclipse-devel/files/eclipse-build-upstream.patch +++ b/java/eclipse-devel/files/eclipse-build-upstream.patch @@ -17,18 +17,16 @@ Index: build.xml =================================================================== --- build.xml (revision 23733) +++ build.xml (working copy) -@@ -131,7 +131,8 @@ +@@ -137,6 +137,7 @@ <ant inheritall="false" antfile="pdebuild.xml"> <property name="buildId" value="${buildId}" /> <property name="buildArch" value="${buildArch}" /> -- <property name="buildDirectory" value="../../" /> + <property name="buildOs" value="${buildOs}" /> -+ <property name="buildDirectory" value="../../" /> + <property name="buildDirectory" value="../../" /> </ant> </target> - -@@ -312,7 +313,10 @@ - <!-- end eclipse-build-only patches --> +@@ -406,7 +407,10 @@ + <!-- Only build for one target (bug #293952) --> <copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" /> - <replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" /> @@ -36,10 +34,10 @@ Index: build.xml + <replacefilter token="@build_arch@" value="${buildArch}" /> + <replacefilter token="@build_os@" value="${buildOs}" /> + </replace> - <patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" /> - <echo file="patch-stamp" /> -@@ -399,6 +403,7 @@ + + + <!-- This one should be removed when Eclipse bug 369215 is fixed --> +@@ -563,6 +567,7 @@ <!-- <ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}"> <property name="arch" value="${buildArch}"/> @@ -47,9 +45,9 @@ Index: build.xml <property name="builder" value="${buildConfig}" /> </ant> --> -@@ -462,9 +467,9 @@ +@@ -571,9 +576,9 @@ - <target name="compile.libgnomeproxy" if="build.libgnomeproxy"> + <target name="compile.libgnomeproxy"> <!-- build libgnomeproxy --> - <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" /> - <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" /> @@ -60,7 +58,7 @@ Index: build.xml </target> <target name="compilelibs" unless="compilelibs.complete"> -@@ -476,16 +481,16 @@ +@@ -585,16 +590,16 @@ <include name="**/*.so" /> </fileset> </delete> @@ -80,7 +78,7 @@ Index: build.xml <copy todir="${buildDirectory}/plugins/${launcherfragment}"> <fileset dir="${launcherlibs}/library/gtk"> <include name="**/*.so" /> -@@ -493,13 +498,13 @@ +@@ -602,8 +607,8 @@ </copy> <!-- build liblocalfile --> @@ -91,13 +89,7 @@ Index: build.xml </move> <!-- build libgnomeproxy --> <antcall target="compile.libgnomeproxy" /> - <!-- build libupdate --> -- <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" /> -+ <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.${buildOs}/src" antfile="build.xml" /> - - <echo file="compilelibs-stamp" /> - </target> -@@ -593,7 +598,7 @@ +@@ -699,7 +704,7 @@ <arg line="-application org.eclipse.ant.core.antRunner " /> <arg line="-buildfile buildConfiguration.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> @@ -106,7 +98,7 @@ Index: build.xml <arg line="-Dreposource=${reposource} " /> <arg line="-Dbasedir=${productFiles}/rcpConfig" /> <arg line="-DbuildId=${buildId} " /> -@@ -631,6 +636,7 @@ +@@ -743,6 +753,7 @@ <arg line="-buildfile publishProduct.xml" /> <arg line="-propertyfile ${basedir}/build.properties " /> <arg line="-DbuildArch=${buildArch} " /> @@ -114,7 +106,16 @@ Index: build.xml <arg line="-Dreposource=${reposource} " /> <arg line="-DbuildConfig=${buildConfig} " /> <arg line="-DproductFile=${productFile} " /> -@@ -721,7 +727,7 @@ +@@ -756,7 +761,7 @@ + <arg line="-consoleLog" /> + <arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher " /> + <arg line="-flavor tooling" /> +- <arg line="-configs gtk.linux.${buildArch}" /> ++ <arg line="-configs gtk.${buildOs}.${buildArch}" /> + <arg line="-productFile ${productFile}" /> + <arg line="-metadataRepository file:${reposource}" /> + <arg line="-artifactRepository file:${reposource}" /> +@@ -812,7 +817,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" /> @@ -123,7 +124,7 @@ Index: build.xml <param name="p2.ws" value="gtk" /> <param name="p2.arch" value="${buildArch}" /> <param name="p2.repo" value="${reposource}" /> -@@ -750,7 +753,7 @@ +@@ -828,7 +833,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" /> @@ -132,33 +133,24 @@ Index: build.xml <param name="p2.ws" value="gtk" /> <param name="p2.arch" value="${buildArch}" /> <param name="p2.repo" value="${reposource}" /> -@@ -800,6 +806,8 @@ - --> - <exec executable="${basedir}/runtests.sh" dir="${basedir}"> - <arg value="-t${timestamp}" /> -+ <arg value="-a${buildArch}" /> -+ <arg value="-o${buildOs}" /> - <arg value="-b ${testsBuildDirectory}" /> - <arg value="-p ${provisionDir}" /> - <arg value="${testSwitches}" /> -@@ -924,7 +932,7 @@ - <property name="startupjarpath" refid="startupjar" /> - <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" /> +@@ -976,7 +981,7 @@ + <mkdir dir="${destDir}${prefix}/bin" /> + <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/> <!-- Create the "swt.jar" and friends symlinks --> - <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="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" /> - <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" /> -@@ -1061,7 +1074,7 @@ - <param name="p2.director.profile" value="PlatformProfile" /> - <param name="p2.director.install.path" value="${installationDir}" /> - <param name="p2.director.extraArgs" value="-purgeHistory" /> + <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" overwrite="true"/> + <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/> +@@ -995,7 +1000,7 @@ + <param name="p2.director.profile" value="PlatformProfile" /> + <param name="p2.director.install.path" value="${installationDir}" /> + <param name="p2.director.extraArgs" value="-purgeHistory" /> - <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="${installationDir}" /> + <param name="p2.ws" value="gtk" /> + <param name="p2.arch" value="${buildArch}" /> + <param name="p2.repo" value="${installationDir}" /> Index: pdebuild.xml =================================================================== --- pdebuild.xml (revision 23733) @@ -221,6 +213,19 @@ Index: publishProduct.xml <advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" /> <advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" /> </p2.publish.product> +Index: buildTests.xml +=================================================================== +--- buildTests.xml~ Wed Mar 28 11:50:23 2012 ++++ buildTests.xml Fri Jun 22 10:11:05 2012 +@@ -215,6 +215,8 @@ + --> + <exec executable="${basedir}/runtests.sh" dir="${basedir}"> + <arg value="-t${timestamp}" /> ++ <arg value="-a${buildArch}" /> ++ <arg value="-o${buildOs}" /> + <arg value="-b ${testsBuildDirectory}" /> + <arg value="-p ${provisionWithTestsDir}" /> + <arg value="${testSwitches}" /> Index: runtests.sh =================================================================== --- runtests.sh (revision 23733) diff --git a/java/eclipse-devel/files/freebsd-support.patch b/java/eclipse-devel/files/freebsd-support.patch index 90d530fd4805..f48e04b22d9b 100644 --- a/java/eclipse-devel/files/freebsd-support.patch +++ b/java/eclipse-devel/files/freebsd-support.patch @@ -2,7 +2,7 @@ $FreeBSD$ --- build.orig/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/library/gtk/build.sh 2009-12-23 15:12:32.845944760 -0500 +++ build/eclipse-3.5.2-src/features/org.eclipse.equinox.executable/library/gtk/build.sh 2009-12-23 15:14:12.389807302 -0500 -@@ -53,6 +53,7 @@ +@@ -54,6 +54,7 @@ "Linux") makefile="make_linux.mak" defaultOS="linux" @@ -10,15 +10,15 @@ $FreeBSD$ case $MODEL in "x86_64") defaultOSArch="x86_64" -@@ -112,6 +113,7 @@ +@@ -115,6 +116,7 @@ "SunOS") makefile="make_solaris.mak" defaultOS="solaris" + MAKE=make - [ -d /usr/jdk/jdk1.5.0_01 ] && defaultJavaHome="/usr/jdk/jdk1.5.0_01" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" #PATH=/usr/ccs/bin:/opt/SUNWspro/bin:$PATH -@@ -119,6 +121,24 @@ + PATH=/usr/ccs/bin:/export/home/SUNWspro/bin:$PATH +@@ -138,6 +140,24 @@ ;; esac ;; @@ -43,7 +43,7 @@ $FreeBSD$ *) echo "Unknown OS -- build aborted" ;; -@@ -164,13 +184,13 @@ +@@ -203,13 +223,13 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then @@ -184,7 +184,7 @@ $FreeBSD$ +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root --- build.orig/eclipse-3.5.2-src/features/org.eclipse.platform/feature.xml 2009-12-23 15:12:32.396160828 -0500 +++ build/eclipse-3.5.2-src/features/org.eclipse.platform/feature.xml 2009-12-23 15:14:12.390811604 -0500 -@@ -138,6 +138,16 @@ +@@ -167,6 +167,26 @@ unpack="false"/> <plugin @@ -198,10 +198,20 @@ $FreeBSD$ + unpack="false"/> + + <plugin ++ id="org.eclipse.core.net.freebsd.x86_64" ++ os="freebsd" ++ arch="x86_64" ++ download-size="0" ++ install-size="0" ++ version="0.0.0" ++ fragment="true" ++ unpack="false"/> ++ ++ <plugin id="org.eclipse.core.resources" download-size="0" install-size="0" -@@ -572,6 +582,26 @@ +@@ -548,6 +568,26 @@ unpack="false"/> <plugin @@ -228,81 +238,64 @@ $FreeBSD$ id="org.eclipse.core.filesystem.solaris.sparc" os="solaris" arch="sparc" -@@ -657,6 +687,16 @@ - unpack="false"/> - - <plugin -+ id="org.eclipse.update.core.freebsd" -+ os="freebsd" -+ arch="x86" -+ download-size="0" -+ install-size="0" -+ version="0.0.0" -+ fragment="true" -+ unpack="false"/> -+ -+ <plugin - id="org.eclipse.update.core.win32" - os="win32" - download-size="0" ---- build.orig/eclipse-3.5.2-src/features/org.eclipse.rcp/feature.xml 2009-12-23 15:12:32.485514642 -0500 -+++ build/eclipse-3.5.2-src/features/org.eclipse.rcp/feature.xml 2009-12-23 15:14:12.391816744 -0500 -@@ -371,6 +371,28 @@ - unpack="false"/> +--- build/eclipse-4.2.0-I20120608-1400-src/features/org.eclipse.e4.rcp/feature.xml~ Wed Jul 4 15:54:59 2012 ++++ build/eclipse-4.2.0-I20120608-1400-src/features/org.eclipse.e4.rcp/feature.xml Wed Jul 4 19:20:31 2012 +@@ -471,6 +471,26 @@ + fragment="true"/> <plugin -+ id="org.eclipse.swt.gtk.freebsd.x86" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86" + os="freebsd" + ws="gtk" + arch="x86" + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true" -+ unpack="false"/> ++ fragment="true"/> + + <plugin -+ id="org.eclipse.swt.gtk.freebsd.x86_64" ++ id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64" + os="freebsd" + ws="gtk" + arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true" -+ unpack="false"/> ++ fragment="true"/> + + <plugin - id="org.eclipse.swt.gtk.solaris.sparc" - os="solaris" - ws="gtk" -@@ -556,6 +578,26 @@ - fragment="true"/> + id="org.eclipse.equinox.launcher.win32.win32.x86" + os="win32" + ws="win32" +@@ -729,6 +749,28 @@ + unpack="false"/> <plugin -+ id="org.eclipse.equinox.launcher.gtk.freebsd.x86" ++ id="org.eclipse.swt.gtk.freebsd.x86" + os="freebsd" + ws="gtk" + arch="x86" + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true"/> ++ fragment="true" ++ unpack="false"/> + + <plugin -+ id="org.eclipse.equinox.launcher.gtk.freebsd.x86_64" ++ id="org.eclipse.swt.gtk.freebsd.x86_64" + os="freebsd" + ws="gtk" + arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" -+ fragment="true"/> ++ fragment="true" ++ unpack="false"/> + + <plugin - id="org.eclipse.equinox.launcher.gtk.aix.ppc" - os="aix" - ws="gtk" + id="org.eclipse.swt.cocoa.macosx" + os="macosx" + ws="cocoa" --- 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,36 @@ @@ -379,31 +372,6 @@ $FreeBSD$ attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET; else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX)) attributes |= EFS.ATTRIBUTE_EXECUTABLE; ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/.project 2009-12-23 15:14:12.393823113 -0500 -@@ -0,0 +1,22 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.core.filesystem.freebsd.x86</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ </natures> -+</projectDescription> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2009-12-23 15:14:12.393823113 -0500 @@ -0,0 +1,9 @@ @@ -411,11 +379,62 @@ $FreeBSD$ +Bundle-ManifestVersion: 2 +Bundle-Name: %fragmentName +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true -+Bundle-Version: 1.2.0.qualifier ++Bundle-Version: 1.4.0.qualifier +Bundle-Vendor: %providerName -+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)" ++Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" +Bundle-Localization: fragment +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86/pom.xml 1969-12-31 19:00:00.000000000 -0500 ++++ build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2009-12-23 15:14:12.393823113 -0500 +@@ -0,0 +1,48 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" ++ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>eclipse.platform.resources</artifactId> ++ <groupId>eclipse.platform.resources</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../</relativePath> ++ </parent> ++ <groupId>eclipse.platform.resources</groupId> ++ <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId> ++ <version>1.4.0-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <build> ++ <plugins> ++ <!-- tycho is not able to automatically determine os/ws/arch of this bundle --> ++ <plugin> ++ <groupId>org.eclipse.tycho</groupId> ++ <artifactId>target-platform-configuration</artifactId> ++ <version>${tycho.version}</version> ++ <configuration> ++ <resolver>p2</resolver> ++ <environments> ++ <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>x86</arch> ++ </environment> ++ </environments> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/about.html 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86/about.html 2009-12-23 15:14:12.393823113 -0500 @@ -0,0 +1,28 @@ @@ -482,31 +501,6 @@ $FreeBSD$ +############################################################################### +fragmentName = Core File System for FreeBSD +providerName = Eclipse.org ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/.project 2009-12-23 15:14:12.394827136 -0500 -@@ -0,0 +1,22 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.core.filesystem.freebsd.x86_64</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ </natures> -+</projectDescription> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2009-12-23 15:14:12.395831158 -0500 @@ -0,0 +1,9 @@ @@ -514,9 +508,9 @@ $FreeBSD$ +Bundle-ManifestVersion: 2 +Bundle-Name: %fragmentName +Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true -+Bundle-Version: 1.0.100.qualifier ++Bundle-Version: 1.2.0.qualifier +Bundle-Vendor: %providerName -+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)" ++Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)" +Bundle-Localization: fragment +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64)) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/about.html 1969-12-31 19:00:00.000000000 -0500 @@ -585,6 +579,68 @@ $FreeBSD$ +############################################################################### +fragmentName = Core File System for FreeBSD +providerName = Eclipse.org +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 1969-12-31 19:00:00.000000000 -0500 ++++ build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2009-12-23 15:14:12.393823113 -0500 +@@ -0,0 +1,48 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" ++ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>eclipse.platform.resources</artifactId> ++ <groupId>eclipse.platform.resources</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../</relativePath> ++ </parent> ++ <groupId>eclipse.platform.resources</groupId> ++ <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId> ++ <version>1.2.0-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <build> ++ <plugins> ++ <!-- tycho is not able to automatically determine os/ws/arch of this bundle --> ++ <plugin> ++ <groupId>org.eclipse.tycho</groupId> ++ <artifactId>target-platform-configuration</artifactId> ++ <version>${tycho.version}</version> ++ <configuration> ++ <resolver>p2</resolver> ++ <environments> ++ <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>x86_64</arch> ++ </environment> ++ </environments> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++</project> +--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c.orig Wed Jun 27 15:51:34 2012 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c Wed Jul 25 19:28:51 2012 +@@ -13,7 +13,7 @@ + #include <gconf/gconf-value.h> + #include <gconf/gconf-client.h> + +-#ifdef __linux__ ++#ifdef __STDC__ + #include <string.h> + #else + #include <strings.h> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net/natives/unix/freebsd/makefile 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net/natives/unix/freebsd/makefile 2009-12-23 15:22:59.220601471 -0500 @@ -0,0 +1,46 @@ @@ -610,10 +666,10 @@ $FreeBSD$ + +INCLUDE = -I${LOCALBASE}/include/gconf/2/ -I${LOCALBASE}/include/orbit-2.0/ -I${LOCALBASE}/include/glib-2.0/ \ + -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -+COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 ++COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 + +LIBS := -L${LOCALBASE}/lib -lgconf-2 -lORBit-2 -lgthread-2.0 -lgobject-2.0 -lglib-2.0 -+LINKER_FLAGS= -m32 ++LINKER_FLAGS= + +all: link + @@ -634,62 +690,6 @@ $FreeBSD$ +clean: + -$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL) + -@echo " " ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.classpath 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.classpath 2009-12-23 15:14:12.400851271 -0500 -@@ -0,0 +1,7 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<classpath> -+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> -+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> -+ <classpathentry kind="src" path="src"/> -+ <classpathentry kind="output" path="bin"/> -+</classpath> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.project 2009-12-23 15:14:12.400851271 -0500 -@@ -0,0 +1,28 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.core.net.freebsd.x86</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.jdt.core.javabuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ <nature>org.eclipse.jdt.core.javanature</nature> -+ </natures> -+</projectDescription> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.settings/org.eclipse.jdt.core.prefs 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/.settings/org.eclipse.jdt.core.prefs 2009-12-23 15:14:12.401856131 -0500 -@@ -0,0 +1,12 @@ -+#Mon Apr 21 14:24:04 CEST 2008 -+eclipse.preferences.version=1 -+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -+org.eclipse.jdt.core.compiler.compliance=1.4 -+org.eclipse.jdt.core.compiler.debug.lineNumber=generate -+org.eclipse.jdt.core.compiler.debug.localVariable=generate -+org.eclipse.jdt.core.compiler.debug.sourceFile=generate -+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -+org.eclipse.jdt.core.compiler.source=1.3 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2009-12-23 15:14:12.401856131 -0500 @@ -0,0 +1,10 @@ @@ -699,7 +699,7 @@ $FreeBSD$ +Bundle-Vendor: %providerName +Bundle-Localization: fragment +Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true -+Bundle-Version: 1.1.0.qualifier ++Bundle-Version: 1.1.200.qualifier +Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" +Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86)) +Bundle-RequiredExecutionEnvironment: J2SE-1.4 @@ -772,6 +772,54 @@ $FreeBSD$ +############################################################################### +fragmentName = Proxy for FreeBSD +providerName = Eclipse.org +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net.freebsd.x86/pom.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net.freebsd.x86/pom.xml +@@ -0,0 +1,45 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" ++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>eclipse.platform.team</artifactId> ++ <groupId>eclipse.platform.team</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../../../</relativePath> ++ </parent> ++ <groupId>eclipse.platform.team</groupId> ++ <artifactId>org.eclipse.core.net.freebsd.x86</artifactId> ++ <version>1.1.200-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.eclipse.tycho</groupId> ++ <artifactId>target-platform-configuration</artifactId> ++ <configuration> ++ <environments> ++ <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>x86</arch> ++ </environment> ++ </environments> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ ++</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/src/org/eclipse/core/net/ProxyProvider.java 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86/src/org/eclipse/core/net/ProxyProvider.java 2009-12-23 15:14:12.402858757 -0500 @@ -0,0 +1,16 @@ @@ -791,62 +839,6 @@ $FreeBSD$ + +public class ProxyProvider extends UnixProxyProvider { +} ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.classpath 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.classpath 2009-12-23 15:14:12.400851271 -0500 -@@ -0,0 +1,7 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<classpath> -+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> -+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> -+ <classpathentry kind="src" path="src"/> -+ <classpathentry kind="output" path="bin"/> -+</classpath> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.project 2009-12-23 15:14:12.400851271 -0500 -@@ -0,0 +1,28 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.core.net.freebsd.x86_64</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.jdt.core.javabuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ <nature>org.eclipse.jdt.core.javanature</nature> -+ </natures> -+</projectDescription> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.settings/org.eclipse.jdt.core.prefs 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/.settings/org.eclipse.jdt.core.prefs 2009-12-23 15:14:12.401856131 -0500 -@@ -0,0 +1,12 @@ -+#Mon Apr 21 14:24:04 CEST 2008 -+eclipse.preferences.version=1 -+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -+org.eclipse.jdt.core.compiler.compliance=1.4 -+org.eclipse.jdt.core.compiler.debug.lineNumber=generate -+org.eclipse.jdt.core.compiler.debug.localVariable=generate -+org.eclipse.jdt.core.compiler.debug.sourceFile=generate -+org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -+org.eclipse.jdt.core.compiler.source=1.3 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2009-12-23 15:14:12.401856131 -0500 @@ -0,0 +1,10 @@ @@ -929,6 +921,54 @@ $FreeBSD$ +############################################################################### +fragmentName = Proxy for FreeBSD +providerName = Eclipse.org +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net.freebsd.x86/pom.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.net.freebsd.x86/pom.xml +@@ -0,0 +1,45 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" ++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>eclipse.platform.team</artifactId> ++ <groupId>eclipse.platform.team</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../../../</relativePath> ++ </parent> ++ <groupId>eclipse.platform.team</groupId> ++ <artifactId>org.eclipse.core.net.freebsd.x86_64</artifactId> ++ <version>1.1.0-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.eclipse.tycho</groupId> ++ <artifactId>target-platform-configuration</artifactId> ++ <configuration> ++ <environments> ++ <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>x86_64</arch> ++ </environment> ++ </environments> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> ++ ++</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/src/org/eclipse/core/net/ProxyProvider.java 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.core.net.freebsd.x86_64/src/org/eclipse/core/net/ProxyProvider.java 2009-12-23 15:14:12.402858757 -0500 @@ -0,0 +1,16 @@ @@ -979,220 +1019,6 @@ $FreeBSD$ * Constant string (value "unknown") indicating the platform is running on a * machine running an unknown operating system. * <p> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2009-12-23 15:14:12.409887194 -0500 -@@ -0,0 +1,22 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ </natures> -+</projectDescription> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.settings/org.eclipse.pde.core.prefs 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.settings/org.eclipse.pde.core.prefs 2009-12-23 15:14:12.409887194 -0500 -@@ -0,0 +1,4 @@ -+#Wed Dec 06 11:46:47 EST 2006 -+eclipse.preferences.version=1 -+pluginProject.extensions=false -+resolve.requirebundle=false ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2009-12-23 15:14:12.409887194 -0500 -@@ -0,0 +1,10 @@ -+Manifest-Version: 1.0 -+Bundle-ManifestVersion: 2 -+Bundle-Name: %pluginName -+Bundle-Vendor: %providerName -+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true -+Bundle-Version: 1.1.100.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)" -+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) -+Bundle-Localization: launcher.gtk.freebsd.x86_64 -+Eclipse-BundleShape: dir ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/about.html 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/about.html 2009-12-23 15:14:12.410890937 -0500 -@@ -0,0 +1,28 @@ -+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" -+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -+<html xmlns="http://www.w3.org/1999/xhtml"> -+<head> -+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> -+<title>About</title> -+</head> -+<body lang="EN-US"> -+<h2>About This Content</h2> -+ -+<p>June 5, 2006</p> -+<h3>License</h3> -+ -+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). -+Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available -+at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>. -+For purposes of the EPL, "Program" will mean the Content.</p> -+ -+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is -+being redistributed by another party ("Redistributor") and different terms and conditions may -+apply to your use of any object code in the Content. Check the Redistributor’s license -+that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -+indicated below, the terms and conditions of the EPL still apply to any source code in the Content -+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> -+ -+</body> -+</html> -\ No newline at end of file ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2009-12-23 15:14:12.410890937 -0500 -@@ -0,0 +1,7 @@ -+bin.includes = META-INF/,\ -+ eclipse_*.so,\ -+ launcher.gtk.freebsd.x86_64.properties,\ -+ about.html -+ -+customBuildCallbacks=customBuildCallbacks.xml -+generateSourceBundle=false ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/customBuildCallbacks.xml 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/customBuildCallbacks.xml 2009-12-23 15:14:12.410890937 -0500 -@@ -0,0 +1,109 @@ -+<!-- ===================================================================== --> -+<!-- Custom targets called from a project's generated build.xml --> -+<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.--> -+<!-- ===================================================================== --> -+<project name="Build specific targets and properties" default="noDefault"> -+ -+ <!-- ===================================================================== --> -+ <!-- Default target --> -+ <!-- ===================================================================== --> -+ <target name="noDefault"> -+ <echo message="This file must be called with explicit targets" /> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before the target build.jars --> -+ <!-- Available parameters : --> -+ <!-- build.result.folder - folder to contain the build results --> -+ <!-- ===================================================================== --> -+ <target name="pre.build.jars"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target build.jars --> -+ <!-- Available parameters : --> -+ <!-- build.result.folder - folder to contain the build results --> -+ <!-- ===================================================================== --> -+ <target name="post.build.jars"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before the target build.sources --> -+ <!-- Available parameters : --> -+ <!-- build.result.folder - folder to contain the build results --> -+ <!-- ===================================================================== --> -+ <target name="pre.build.sources"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target build.sources --> -+ <!-- Available parameters : --> -+ <!-- build.result.folder - folder to contain the build results --> -+ <!-- ===================================================================== --> -+ <target name="post.build.sources"> -+ </target> -+ -+ <target name="pre.gather.bin.parts"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target gather.bin.parts --> -+ <!-- Available parameters : --> -+ <!-- base.dir - root of the project --> -+ <!-- build.result.folder - folder containing the build results --> -+ <!-- target.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="post.gather.bin.parts"> -+ <chmod perm="755" dir="${target.folder}" includes="eclipse_*" /> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before the target gather.sources --> -+ <!-- Available parameters : --> -+ <!-- destination.temp.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="pre.gather.sources"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target gather.sources --> -+ <!-- Available parameters : --> -+ <!-- destination.temp.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="post.gather.sources"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before the target gather.logs --> -+ <!-- Available parameters : --> -+ <!-- destination.temp.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="pre.gather.logs"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target gather.logs --> -+ <!-- Available parameters : --> -+ <!-- destination.temp.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="post.gather.logs"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do before the target clean --> -+ <!-- Available parameters : --> -+ <!-- destination.temp.folder - destination folder --> -+ <!-- ===================================================================== --> -+ <target name="pre.clean"> -+ </target> -+ -+ <!-- ===================================================================== --> -+ <!-- Steps to do after the target clean --> -+ <!-- Available parameters : --> -+ <!-- plugin.destination - final destination of the build --> -+ <!-- build.result.folder - results of the compilation --> -+ <!-- temp.folder - temporary folder --> -+ <!-- ===================================================================== --> -+ <target name="post.clean"> -+ </target> -+</project> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2009-12-23 15:14:12.411895798 -0500 -@@ -0,0 +1,12 @@ -+############################################################################### -+# Copyright (c) 2007 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 -+# http://www.eclipse.org/legal/epl-v10.html -+# -+# Contributors: -+# IBM Corporation - initial API and implementation -+############################################################################### -+pluginName = Equinox Launcher FreeBSD X86_64 Fragment -+providerName = Eclipse.org - Equinox --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2009-01-27 16:24:13.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java 2009-12-23 15:14:12.419926302 -0500 @@ -26,6 +26,7 @@ @@ -1236,31 +1062,6 @@ $FreeBSD$ return Constants.OS_UNKNOWN; } ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/.project 2009-12-23 15:14:12.422939766 -0500 -@@ -0,0 +1,22 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ </natures> -+</projectDescription> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2009-12-23 15:14:12.422939766 -0500 @@ -0,0 +1,10 @@ @@ -1269,8 +1070,8 @@ $FreeBSD$ +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true -+Bundle-Version: 1.1.100.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)" ++Bundle-Version: 1.1.200.qualifier ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86)) +Bundle-Localization: launcher.gtk.freebsd.x86 +Eclipse-BundleShape: dir @@ -1308,7 +1109,7 @@ $FreeBSD$ \ No newline at end of file --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/build.properties 2009-12-23 15:14:12.423942951 -0500 -@@ -0,0 +1,7 @@ +@@ -0,0 +1,8 @@ +bin.includes = META-INF/,\ + eclipse_*.so,\ + launcher.gtk.freebsd.x86.properties,\ @@ -1316,6 +1117,7 @@ $FreeBSD$ + +customBuildCallbacks=customBuildCallbacks.xml +generateSourceBundle=false ++binaryTag=v20120511-1552 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/customBuildCallbacks.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/customBuildCallbacks.xml 2009-12-23 15:14:12.423942951 -0500 @@ -0,0 +1,109 @@ @@ -1443,38 +1245,40 @@ $FreeBSD$ +############################################################################### +pluginName = Equinox Launcher FreeBSD X86 Fragment +providerName = Eclipse.org - Equinox ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.project 2009-12-23 15:14:12.424946415 -0500 -@@ -0,0 +1,22 @@ +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml +@@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ </natures> -+</projectDescription> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.settings/org.eclipse.pde.core.prefs 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/.settings/org.eclipse.pde.core.prefs 2009-12-23 15:14:12.424946415 -0500 -@@ -0,0 +1,4 @@ -+#Wed Dec 06 11:46:47 EST 2006 -+eclipse.preferences.version=1 -+pluginProject.extensions=false -+resolve.requirebundle=false ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" ++ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>launcher-binary-parent</artifactId> ++ <groupId>org.eclipse.equinox.framework</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../launcher-binary-parent</relativePath> ++ </parent> ++ <groupId>org.eclipse.equinox.framework</groupId> ++ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86</artifactId> ++ <version>1.1.200-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <properties> ++ <launcher-binary.version>1500</launcher-binary.version> ++ </properties> ++</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2009-12-23 15:14:12.425950437 -0500 @@ -0,0 +1,10 @@ @@ -1483,8 +1287,8 @@ $FreeBSD$ +Bundle-Name: %pluginName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true -+Bundle-Version: 1.1.100.qualifier -+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.1.0,1.3.0)" ++Bundle-Version: 1.1.200.qualifier ++Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)" +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64)) +Bundle-Localization: launcher.gtk.freebsd.x86_64 +Eclipse-BundleShape: dir @@ -1522,7 +1326,7 @@ $FreeBSD$ \ No newline at end of file --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/build.properties 2009-12-23 15:14:12.425950437 -0500 -@@ -0,0 +1,7 @@ +@@ -0,0 +1,8 @@ +bin.includes = META-INF/,\ + eclipse_*.so,\ + launcher.gtk.freebsd.x86_64.properties,\ @@ -1530,6 +1334,7 @@ $FreeBSD$ + +customBuildCallbacks=customBuildCallbacks.xml +generateSourceBundle=false ++binaryTag=v20120511-1552 --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/customBuildCallbacks.xml 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/customBuildCallbacks.xml 2009-12-23 15:14:12.426954459 -0500 @@ -0,0 +1,109 @@ @@ -1657,6 +1462,40 @@ $FreeBSD$ +############################################################################### +pluginName = Equinox Launcher FreeBSD X86_64 Fragment +providerName = Eclipse.org - Equinox +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml +@@ -0,0 +1,31 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project ++ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" ++ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>launcher-binary-parent</artifactId> ++ <groupId>org.eclipse.equinox.framework</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../launcher-binary-parent</relativePath> ++ </parent> ++ <groupId>org.eclipse.equinox.framework</groupId> ++ <artifactId>org.eclipse.equinox.launcher.gtk.freebsd.x86_64</artifactId> ++ <version>1.1.200-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <properties> ++ <launcher-binary.version>1500</launcher-binary.version> ++ </properties> ++</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java 2009-05-20 00:10:51.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java 2009-12-23 15:14:12.440005914 -0500 @@ -111,6 +111,8 @@ @@ -1999,169 +1838,6 @@ $FreeBSD$ <property name="assemble.org.eclipse.pde.build.container.feature.group.group.group" value="true" /> <target name="assemble.org.eclipse.pde.build.container.feature.group.group.group"> <ant antfile="${assembleScriptName}" dir="${buildDirectory}"> ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/BrandingIron.java 2009-08-19 15:25:06.000000000 -0400 -+++ 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 -@@ -93,6 +93,8 @@ - brandAIX(); - else if ("hpux".equals(os)) //$NON-NLS-1$ - brandHPUX(); -+ else if ("freebsd".equals(os)) //$NON-NLS-1$ -+ brandFreeBSD(); - else - renameLauncher(); - } -@@ -224,6 +226,12 @@ - } - } - -+ private void brandFreeBSD() throws Exception { -+ renameLauncher(); -+ if (brandIcons) -+ Utils.copy(new File(icons[0]), new File(root, "icon.xpm")); //$NON-NLS-1$ -+ } -+ - private void moveContents(File source, File target) { - if (!source.exists()) - return; ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java 2009-05-06 16:48:13.000000000 -0400 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/ProductFile.java 2009-12-23 15:14:12.472135194 -0500 -@@ -29,11 +29,13 @@ - private final static SAXParserFactory parserFactory = SAXParserFactory.newInstance(); - - private static final String PROGRAM_ARGS = "programArgs"; //$NON-NLS-1$ -+ private static final String PROGRAM_ARGS_FREEBSD = "programArgsFre"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_LINUX = "programArgsLin"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_MAC = "programArgsMac"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_SOLARIS = "programArgsSol"; //$NON-NLS-1$ - private static final String PROGRAM_ARGS_WIN = "programArgsWin"; //$NON-NLS-1$ - private static final String VM_ARGS = "vmArgs"; //$NON-NLS-1$ -+ private static final String VM_ARGS_FREEBSD = "vmArgsFre"; //$NON-NLS-1$ - private static final String VM_ARGS_LINUX = "vmArgsLin"; //$NON-NLS-1$ - private static final String VM_ARGS_MAC = "vmArgsMac"; //$NON-NLS-1$ - private static final String VM_ARGS_SOLARIS = "vmArgsSol"; //$NON-NLS-1$ -@@ -73,17 +75,19 @@ - private static final int STATE_PLUGINS = 4; - private static final int STATE_FEATURES = 5; - private static final int STATE_PROGRAM_ARGS = 6; -- private static final int STATE_PROGRAM_ARGS_LINUX = 7; -- private static final int STATE_PROGRAM_ARGS_MAC = 8; -- private static final int STATE_PROGRAM_ARGS_SOLARIS = 9; -- private static final int STATE_PROGRAM_ARGS_WIN = 10; -- private static final int STATE_VM_ARGS = 11; -- private static final int STATE_VM_ARGS_LINUX = 12; -- private static final int STATE_VM_ARGS_MAC = 13; -- private static final int STATE_VM_ARGS_SOLARIS = 14; -- private static final int STATE_VM_ARGS_WIN = 15; -- private static final int STATE_CONFIG_INI = 16; -- private static final int STATE_CONFIGURATIONS = 17; -+ private static final int STATE_PROGRAM_ARGS_FREEBSD = 7; -+ private static final int STATE_PROGRAM_ARGS_LINUX = 8; -+ private static final int STATE_PROGRAM_ARGS_MAC = 9; -+ private static final int STATE_PROGRAM_ARGS_SOLARIS = 10; -+ private static final int STATE_PROGRAM_ARGS_WIN = 11; -+ private static final int STATE_VM_ARGS = 12; -+ private static final int STATE_VM_ARGS_FREEBSD = 13; -+ private static final int STATE_VM_ARGS_LINUX = 14; -+ private static final int STATE_VM_ARGS_MAC = 15; -+ private static final int STATE_VM_ARGS_SOLARIS = 16; -+ private static final int STATE_VM_ARGS_WIN = 17; -+ private static final int STATE_CONFIG_INI = 18; -+ private static final int STATE_CONFIGURATIONS = 19; - - private int state = STATE_START; - -@@ -304,6 +308,8 @@ - key = VM_ARGS_MAC; - } else if (os.equals(Platform.OS_SOLARIS)) { - key = VM_ARGS_SOLARIS; -+ } else if (os.equals(Platform.OS_FREEBSD)) { -+ key = VM_ARGS_FREEBSD; - } - - String prefix = launcherArgs.getProperty(VM_ARGS); -@@ -327,6 +333,8 @@ - key = PROGRAM_ARGS_MAC; - } else if (os.equals(Platform.OS_SOLARIS)) { - key = PROGRAM_ARGS_SOLARIS; -+ } else if (os.equals(Platform.OS_FREEBSD)) { -+ key = PROGRAM_ARGS_FREEBSD; - } - - String prefix = launcherArgs.getProperty(PROGRAM_ARGS); -@@ -382,6 +390,8 @@ - processLinux(attributes); - } else if (Platform.OS_MACOSX.equals(localName)) { - processMac(attributes); -+ } else if (Platform.OS_FREEBSD.equals(localName)) { -+ processFreeBSD(attributes); - } - if ("ico".equals(localName)) { //$NON-NLS-1$ - processIco(attributes); -@@ -393,6 +403,8 @@ - case STATE_LAUNCHER_ARGS : - if (PROGRAM_ARGS.equals(localName)) { - state = STATE_PROGRAM_ARGS; -+ } else if (PROGRAM_ARGS_FREEBSD.equals(localName)) { -+ state = STATE_PROGRAM_ARGS_FREEBSD; - } else if (PROGRAM_ARGS_LINUX.equals(localName)) { - state = STATE_PROGRAM_ARGS_LINUX; - } else if (PROGRAM_ARGS_MAC.equals(localName)) { -@@ -403,6 +415,8 @@ - state = STATE_PROGRAM_ARGS_WIN; - } else if (VM_ARGS.equals(localName)) { - state = STATE_VM_ARGS; -+ } else if (VM_ARGS.equals(localName)) { -+ state = STATE_VM_ARGS_FREEBSD; - } else if (VM_ARGS_LINUX.equals(localName)) { - state = STATE_VM_ARGS_LINUX; - } else if (VM_ARGS_MAC.equals(localName)) { -@@ -455,11 +469,13 @@ - break; - - case STATE_PROGRAM_ARGS : -+ case STATE_PROGRAM_ARGS_FREEBSD : - case STATE_PROGRAM_ARGS_LINUX : - case STATE_PROGRAM_ARGS_MAC : - case STATE_PROGRAM_ARGS_SOLARIS : - case STATE_PROGRAM_ARGS_WIN : - case STATE_VM_ARGS : -+ case STATE_VM_ARGS_FREEBSD : - case STATE_VM_ARGS_LINUX : - case STATE_VM_ARGS_MAC : - case STATE_VM_ARGS_SOLARIS : -@@ -481,6 +497,9 @@ - case STATE_PROGRAM_ARGS : - addLaunchArgumentToMap(PROGRAM_ARGS, String.valueOf(ch, start, length)); - break; -+ case STATE_PROGRAM_ARGS_FREEBSD : -+ addLaunchArgumentToMap(PROGRAM_ARGS_FREEBSD, String.valueOf(ch, start, length)); -+ break; - case STATE_PROGRAM_ARGS_LINUX : - addLaunchArgumentToMap(PROGRAM_ARGS_LINUX, String.valueOf(ch, start, length)); - break; -@@ -496,6 +515,9 @@ - case STATE_VM_ARGS : - addLaunchArgumentToMap(VM_ARGS, String.valueOf(ch, start, length)); - break; -+ case STATE_VM_ARGS_FREEBSD : -+ addLaunchArgumentToMap(VM_ARGS_FREEBSD, String.valueOf(ch, start, length)); -+ break; - case STATE_VM_ARGS_LINUX : - addLaunchArgumentToMap(VM_ARGS_LINUX, String.valueOf(ch, start, length)); - break; -@@ -622,6 +644,12 @@ - iconsMap.put(Platform.OS_WIN32, toArrayRemoveNulls(result)); - } - -+ private void processFreeBSD(Attributes attributes) { -+ String value = attributes.getValue("icon"); //$NON-NLS-1$ -+ if (value != null) -+ iconsMap.put(Platform.OS_FREEBSD, new String[] {value}); -+ } -+ - private void processLinux(Attributes attributes) { - String value = attributes.getValue("icon"); //$NON-NLS-1$ - if (value != null) --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 2009-05-25 11:45:35.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 2009-12-23 15:14:12.473137540 -0500 @@ -708,7 +708,7 @@ @@ -2368,6 +2044,66 @@ $FreeBSD$ void setProgramArguments(String args, int platform); +--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java~ Fri Aug 24 14:45:20 2012 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/ArgumentsInfo.java Tue Aug 28 11:12:30 2012 +@@ -201,12 +201,14 @@ + } + + public void parse(Node node) { ++ (new Throwable()).printStackTrace(); + NodeList list = node.getChildNodes(); + for (int i = 0; i < list.getLength(); i++) { + Node child = list.item(i); + if (child.getNodeType() == Node.ELEMENT_NODE) { + if (child.getNodeName().equals(P_PROG_ARGS)) { + fProgramArgs = getText(child); ++ System.err.println(this.getClass().getName() + "#parse: fProgramArgs = " + fProgramArgs); + } else if (child.getNodeName().equals(P_PROG_ARGS_LIN)) { + fProgramArgsLin = getText(child); + } else if (child.getNodeName().equals(P_PROG_ARGS_MAC)) { +@@ -215,8 +217,12 @@ + fProgramArgsSol = getText(child); + } else if (child.getNodeName().equals(P_PROG_ARGS_WIN)) { + fProgramArgsWin = getText(child); ++ } else if (child.getNodeName().equals(P_PROG_ARGS_FRE)) { ++ fProgramArgsFre = getText(child); ++ System.err.println(this.getClass().getName() + "#parse: fProgramArgsFre = " + fProgramArgsFre); + } else if (child.getNodeName().equals(P_VM_ARGS)) { + fVMArgs = getText(child); ++ System.err.println(this.getClass().getName() + "#parse: fVMArgs = " + fVMArgs); + } else if (child.getNodeName().equals(P_VM_ARGS_LIN)) { + fVMArgsLin = getText(child); + } else if (child.getNodeName().equals(P_VM_ARGS_MAC)) { +@@ -225,6 +231,9 @@ + fVMArgsSol = getText(child); + } else if (child.getNodeName().equals(P_VM_ARGS_WIN)) { + fVMArgsWin = getText(child); ++ } else if (child.getNodeName().equals(P_VM_ARGS_FRE)) { ++ fVMArgsFre = getText(child); ++ System.err.println(this.getClass().getName() + "#parse: fVMArgsFre = " + fVMArgsFre); + } + } + } +@@ -256,6 +260,9 @@ + if (fProgramArgsWin.length() > 0) { + writer.println(indent + " " + "<" + P_PROG_ARGS_WIN + ">" + getWritableString(fProgramArgsWin) + "</" + P_PROG_ARGS_WIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } ++ if (fProgramArgsFre.length() > 0) { ++ writer.println(indent + " " + "<" + P_PROG_ARGS_FRE + ">" + getWritableString(fProgramArgsFre) + "</" + P_PROG_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ ++ } + if (fVMArgs.length() > 0) { + writer.println(indent + " " + "<" + P_VM_ARGS + ">" + getWritableString(fVMArgs) + "</" + P_VM_ARGS + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } +@@ -271,6 +278,9 @@ + if (fVMArgsWin.length() > 0) { + writer.println(indent + " " + "<" + P_VM_ARGS_WIN + ">" + getWritableString(fVMArgsWin) + "</" + P_VM_ARGS_WIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + } ++ if (fVMArgsFre.length() > 0) { ++ writer.println(indent + " " + "<" + P_VM_ARGS_FRE + ">" + getWritableString(fVMArgsFre) + "</" + P_VM_ARGS_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ ++ } + writer.println(indent + "</launcherArgs>"); //$NON-NLS-1$ + } + --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/ILauncherInfo.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/ILauncherInfo.java 2009-12-23 15:14:12.493217711 -0500 @@ -12,6 +12,8 @@ @@ -2474,6 +2210,41 @@ $FreeBSD$ private String fLinPath, fLinUse; private String fMacPath, fMacUse; private String fSolPath, fSolUse; +@@ -81,6 +81,9 @@ + } else if (child.getNodeName().equals(WIN)) { + fWinPath = getText(child); + fWinUse = fWinPath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ ++ } else if (child.getNodeName().equals(FRE)) { ++ fFrePath = getText(child); ++ fFreUse = fFrePath == null ? "default" : "custom"; //$NON-NLS-1$ //$NON-NLS-2$ + } + } + } +@@ -103,6 +106,10 @@ + fWinPath = fWinPath == null ? fPath : null; + fWinUse = "custom"; //$NON-NLS-1$ + } ++ if (fFreUse == null) { ++ fFrePath = fFrePath == null ? fPath : null; ++ fFreUse = "custom"; //$NON-NLS-1$ ++ } + // null out things + fPath = null; + fUse = "default"; //$NON-NLS-1$ +@@ -162,6 +169,13 @@ + writer.println("</" + WIN + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + } + ++ if (fFrePath != null) { ++ writer.print(indent); ++ writer.print(" <" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ writer.print(getWritableString(fFrePath.trim())); ++ writer.println("</" + FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ } ++ + writer.print(indent + "</configIni>"); //$NON-NLS-1$ + writer.println(); + } @@ -192,6 +194,11 @@ fSolUse = use; if (isEditable()) @@ -2516,9 +2287,9 @@ $FreeBSD$ } return null; } ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java 2008-03-08 16:54:45.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java 2009-12-23 15:14:12.495225197 -0500 -@@ -22,12 +22,14 @@ +--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java.orig Wed Jun 27 15:39:37 2012 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/JREInfo.java Fri Aug 17 15:20:49 2012 +@@ -22,17 +22,20 @@ public class JREInfo extends ProductObject implements IJREInfo { @@ -2533,7 +2304,13 @@ $FreeBSD$ private IPath fJVMLin; private IPath fJVMMac; private IPath fJVMSol; -@@ -49,6 +51,8 @@ + private IPath fJVMWin; + ++ private boolean bIncludeFre; + private boolean bIncludeLin; + private boolean bIncludeMac; + private boolean bIncludeSol; +@@ -54,6 +57,8 @@ return fJVMMac; } else if (Platform.OS_SOLARIS.equals(os)) { return fJVMSol; @@ -2542,7 +2319,7 @@ $FreeBSD$ } return null; } -@@ -77,6 +81,11 @@ +@@ -82,6 +87,11 @@ fJVMSol = jreContainerPath; if (isEditable()) firePropertyChanged(JRE_SOL, old, fJVMSol); @@ -2554,6 +2331,66 @@ $FreeBSD$ } } +@@ -118,6 +128,9 @@ + } else if (child.getNodeName().equals(JRE_SOL)) { + fJVMSol = getPath(child); + bIncludeSol = include; ++ } else if (child.getNodeName().equals(JRE_FRE)) { ++ fJVMFre = getPath(child); ++ bIncludeFre = include; + } else if (child.getNodeName().equals(JRE_WIN)) { + fJVMWin = getPath(child); + bIncludeWin = include; +@@ -166,6 +179,12 @@ + writer.print(fJVMSol.toPortableString()); + writer.println("</" + JRE_SOL + ">"); //$NON-NLS-1$ //$NON-NLS-2$ + } ++ if (fJVMFre != null) { ++ writer.print(indent); ++ writer.print(" <" + JRE_FRE + " include=\"" + String.valueOf(bIncludeFre) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ ++ writer.print(fJVMFre.toPortableString()); ++ writer.println("</" + JRE_FRE + ">"); //$NON-NLS-1$ //$NON-NLS-2$ ++ } + if (fJVMWin != null) { + writer.print(indent); + writer.print(" <" + JRE_WIN + " include=\"" + String.valueOf(bIncludeWin) + "\">"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ +@@ -184,6 +203,8 @@ + return bIncludeMac; + } else if (Platform.OS_SOLARIS.equals(os)) { + return bIncludeSol; ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ return bIncludeFre; + } + return false; + } +@@ -209,6 +230,11 @@ + bIncludeSol = includeJRE; + if (isEditable()) + firePropertyChanged(JRE_SOL, old, Boolean.valueOf(bIncludeSol)); ++ } else if (Platform.OS_FREEBSD.equals(os)) { ++ Boolean old = Boolean.valueOf(bIncludeFre); ++ bIncludeFre = includeJRE; ++ if (isEditable()) ++ firePropertyChanged(JRE_FRE, old, Boolean.valueOf(bIncludeFre)); + } + } + +--- build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java~ 2012-06-27 15:21:36.000000000 +0200 ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.core.runtime.compatibility/src-boot/org/eclipse/core/boot/BootLoader.java 2012-08-17 15:26:06.000000000 +0200 +@@ -94,6 +94,13 @@ + public static final String OS_HPUX = "hpux";//$NON-NLS-1$ + + /** ++ * Constant string (value "freebsd") indicating the platform is running on an ++ * FreeBSD-based operating system. ++ * @deprecated Replaced by {@link Platform#OS_FREEBSD}. ++ */ ++ public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ ++ ++ /** + * Constant string (value "qnx") indicating the platform is running on a + * QNX-based operating system. + * @deprecated Replaced by {@link Platform#OS_QNX}. --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java 2009-05-27 16:25:26.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/product/LauncherInfo.java 2009-12-23 15:14:12.496229220 -0500 @@ -74,7 +74,9 @@ @@ -2598,21 +2435,14 @@ $FreeBSD$ } --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java 2009-05-11 17:05:18.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java 2009-12-23 15:14:12.508277211 -0500 -@@ -921,6 +921,7 @@ - public static String LauncherSection_32High; - public static String LauncherSection_48Low; +@@ -1002,6 +1002,7 @@ public static String LauncherSection_48High; -+ public static String LauncherSection_freebsdLabel; + public static String LauncherSection_256High; public static String LauncherSection_linuxLabel; ++ public static String LauncherSection_freebsdLabel; public static String LauncherSection_large; public static String LauncherSection_medium; -@@ -2817,4 +2818,4 @@ - - public static String VersionDialog_text; - --} -\ No newline at end of file -+} + public static String LauncherSection_small; --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java 2009-05-27 16:38:19.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ArgumentsSection.java 2009-12-23 15:14:12.515304810 -0500 @@ -34,6 +34,7 @@ @@ -2747,14 +2577,14 @@ $FreeBSD$ } --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties 2009-07-14 17:13:10.000000000 -0400 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties 2009-12-23 15:14:12.520324922 -0500 -@@ -582,6 +582,7 @@ - LauncherSection_32High=32x32 (32-bit): - LauncherSection_48Low=48x48 (8-bit): +@@ -621,6 +621,7 @@ LauncherSection_48High=48x48 (32-bit): -+LauncherSection_freebsdLabel=A single XPM icon is required: + LauncherSection_256High=256x256 (32-bit): LauncherSection_linuxLabel=A single XPM icon is required: ++LauncherSection_freebsdLabel=A single XPM icon is required: LauncherSection_large=Large: LauncherSection_medium=Medium: + LauncherSection_small=Small: --- 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 @@ @@ -3003,8 +2833,8 @@ $FreeBSD$ } /** OS Constants */ -- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX; -+ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD; +- public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, BIG_ENDIAN; ++ public static final boolean IsAIX, IsSunOS, IsLinux, IsHPUX, IsFreeBSD, BIG_ENDIAN; static { /* Initialize the OS flags and locale constants */ @@ -3019,40 +2849,9 @@ $FreeBSD$ - IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; + if (osName.equals ("FreeBSD")) isFreeBSD = true; + IsAIX = isAIX; IsSunOS = isSunOS; IsLinux = isLinux; IsHPUX = isHPUX; IsFreeBSD = isFreeBSD; - } - - /** Constants */ ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/.project 2009-12-23 15:14:12.578555994 -0500 -@@ -0,0 +1,28 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.swt.gtk.freebsd.x86</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> -+ </natures> -+</projectDescription> + + byte[] buffer = new byte[4]; + int /*long*/ ptr = OS.malloc(4); --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2009-12-23 15:14:12.578555994 -0500 @@ -0,0 +1,19 @@ @@ -3061,7 +2860,7 @@ $FreeBSD$ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true -+Bundle-Version: 3.7.1.qualifier ++Bundle-Version: 3.100.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -4885,7 +4684,7 @@ $FreeBSD$ + <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/> + + <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -+ <property name="version.suffix" value="3.7.1" /> ++ <property name="version.suffix" value="3.100.0" /> + + <condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt"> + <available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/> @@ -4908,37 +4707,6 @@ $FreeBSD$ +############################################################################### +fragmentName = Standard Widget Toolkit for GTK 2.0 +providerName = Eclipse.org ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/.project 2009-12-23 15:14:12.578555994 -0500 -@@ -0,0 +1,28 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>org.eclipse.swt.gtk.freebsd.x86_64</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ <buildCommand> -+ <name>org.eclipse.pde.ManifestBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.SchemaBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ <buildCommand> -+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> -+ <arguments> -+ </arguments> -+ </buildCommand> -+ </buildSpec> -+ <natures> -+ <nature>org.eclipse.pde.PluginNature</nature> -+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> -+ </natures> -+</projectDescription> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2009-12-23 15:14:12.584579570 -0500 @@ -0,0 +1,19 @@ @@ -4947,7 +4715,7 @@ $FreeBSD$ +Bundle-Name: %fragmentName +Bundle-Vendor: %providerName +Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true -+Bundle-Version: 3.7.1.qualifier ++Bundle-Version: 3.100.0.qualifier +Bundle-ManifestVersion: 2 +Bundle-Localization: fragment +Export-Package: @@ -6771,7 +6539,7 @@ $FreeBSD$ + <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/> + + <!-- These properties are used by eclipse when exporting as Deployable plugin and fragments --> -+ <property name="version.suffix" value="3.7.1" /> ++ <property name="version.suffix" value="3.100.0" /> + + <condition property="plugindir" value="../../../eclipse.platform.swt/bundles/org.eclipse.swt" else="${buildDirectory}/plugins/org.eclipse.swt"> + <available file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/> @@ -6837,57 +6605,6 @@ $FreeBSD$ .equals(Platform.getOS()); private static FragmentEntry[] noFragments = new FragmentEntry[0]; private static Map table; ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.classpath 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.classpath 2009-12-23 15:14:12.607671250 -0500 -@@ -0,0 +1,7 @@ -+<?xml version="1.0" encoding="UTF-8"?>
-+<classpath>
-+ <classpathentry kind="src" path="src"/>
-+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+ <classpathentry kind="output" path="bin"/>
-+</classpath>
---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.cvsignore 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.cvsignore 2009-12-23 15:14:12.607671250 -0500 -@@ -0,0 +1 @@ -+bin -\ No newline at end of file ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.project 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/.project 2009-12-23 15:14:12.608675273 -0500 -@@ -0,0 +1,33 @@ -+<?xml version="1.0" encoding="UTF-8"?>
-+<projectDescription>
-+ <name>org.eclipse.update.core.linux</name>
-+ <comment></comment>
-+ <projects>
-+ <project>org.eclipse.core.boot</project>
-+ <project>org.eclipse.core.runtime</project>
-+ <project>org.eclipse.core.runtime.compatibility</project>
-+ <project>org.eclipse.update.configurator</project>
-+ <project>org.eclipse.update.core</project>
-+ </projects>
-+ <buildSpec>
-+ <buildCommand>
-+ <name>org.eclipse.jdt.core.javabuilder</name>
-+ <arguments>
-+ </arguments>
-+ </buildCommand>
-+ <buildCommand>
-+ <name>org.eclipse.pde.ManifestBuilder</name>
-+ <arguments>
-+ </arguments>
-+ </buildCommand>
-+ <buildCommand>
-+ <name>org.eclipse.pde.SchemaBuilder</name>
-+ <arguments>
-+ </arguments>
-+ </buildCommand>
-+ </buildSpec>
-+ <natures>
-+ <nature>org.eclipse.jdt.core.javanature</nature>
-+ <nature>org.eclipse.pde.PluginNature</nature>
-+ </natures>
-+</projectDescription>
--- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/META-INF/MANIFEST.MF 2009-12-23 15:14:12.608675273 -0500 @@ -0,0 +1,9 @@ @@ -6895,7 +6612,7 @@ $FreeBSD$ +Bundle-ManifestVersion: 2 +Bundle-Name: %fragmentNameFreeBSD +Bundle-SymbolicName: org.eclipse.update.core.freebsd -+Bundle-Version: 3.2.100.qualifier ++Bundle-Version: 3.2.300.qualifier +Bundle-Vendor: %providerName +Fragment-Host: org.eclipse.update.core;bundle-version="[3.0.0,4.0.0)" +Bundle-Localization: plugin @@ -6951,78 +6668,55 @@ $FreeBSD$ + META-INF/ +src.includes = src/,\ + about.html ---- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/src/build.xml 1969-12-31 19:00:00.000000000 -0500 -+++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/src/build.xml 2009-12-23 15:14:12.609679016 -0500 -@@ -0,0 +1,70 @@ +--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.update.core.freebsd/pom.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.update.core.freebsd/pom.xml +@@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> -+<project name="buildlibrary" default="run" basedir="."> -+ -+ <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script --> -+ <!-- Set a meaningful default value for when it is not. --> -+ <property name="eclipse-home" value="${basedir}/../.."/> -+ <property name="jdk-path" value="${java.home}"/> -+ <property name="installArch" value="x86" /> -+ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.freebsd/os/freebsd/${installArch}/"/> -+ <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> -+ <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> -+ -+ <!-- sets the properties --> -+ <property name="library-name" value="libupdate"/> -+ <property name="library-platform" value="so"/> -+ <property name="library-file" value="${library-name}.${library-platform}"/> -+ -+ <!-- This target holds all initialization code that needs to be done for --> -+ <!-- all tests that are to be run. Initialization for individual tests --> -+ <!-- should be done within the body of the suite target. --> -+ <target name="init"> -+ <tstamp/> -+ <delete> -+ <fileset dir="${obj-path}" includes="${library-file}"/> -+ <fileset dir="${obj-path}" includes="${library-name}.o"/> -+ </delete> -+ </target> -+ -+ <!-- This target holds code to cleanup the testing environment after --> -+ <!-- after all of the tests have been run. You can use this target to --> -+ <!-- delete temporary files that have been created. --> -+ <target name="cleanup"> -+ <delete> -+ <fileset dir="${obj-path}" includes="${library-file}"/> -+ <fileset dir="${obj-path}" includes="${library-name}.o"/> -+ </delete> -+ </target> -+ -+ -+ <!-- This target runs the build. --> -+ <target name="run" depends="init,build,cleanup"> -+ </target> -+ -+ <!-- This target build the library --> -+ <target name="build"> -+ <echo message="Building ${library-file}"/> -+ -+ <property name="header-path" value="${jdk-path}/../include"/> -+ <property name="header-freebsd-path" value="${header-path}/freebsd" /> -+ -+ <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-freebsd-path} -fPIC ${library-file}"/> -+ -+ <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> -+ <arg value="-o"/> -+ <arg value="${library-file}"/> -+ <arg value="-shared"/> -+ <arg value="-I${src-path}"/> -+ <arg value="-I${header-path}"/> -+ <arg value="-I${header-freebsd-path}"/> -+ <arg value="-fPIC"/> -+ <srcfile/> -+ <fileset dir="${src-path}" includes="*.c"/> -+ <mapper type="glob" from="*.c" to="*.o"/> -+ </apply> -+ -+ <move file="${library-file}" todir="${destination}"/> -+ </target> -+ -+ ++<!-- ++ Copyright (c) 2012 Eclipse Foundation. ++ All rights reserved. This program and the accompanying materials ++ are made available under the terms of the Eclipse Distribution License v1.0 ++ which accompanies this distribution, and is available at ++ http://www.eclipse.org/org/documents/edl-v10.php ++ ++ Contributors: ++ Igor Fedorenko - initial implementation ++--> ++ ++<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" ++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> ++ <modelVersion>4.0.0</modelVersion> ++ <parent> ++ <artifactId>eclipse.platform</artifactId> ++ <groupId>org.eclipse.platform</groupId> ++ <version>3.8.0-SNAPSHOT</version> ++ <relativePath>../../</relativePath> ++ </parent> ++ <groupId>org.eclipse.platform</groupId> ++ <artifactId>org.eclipse.update.core.freebsd</artifactId> ++ <version>3.2.300-SNAPSHOT</version> ++ <packaging>eclipse-plugin</packaging> ++ ++ <build> ++ <plugins> ++ <!-- tycho is not able to automatically determine os/ws/arch of this bundle --> ++ <plugin> ++ <groupId>org.eclipse.tycho</groupId> ++ <artifactId>target-platform-configuration</artifactId> ++ <version>${tycho.version}</version> ++ <configuration> ++ <resolver>p2</resolver> ++ <environments> ++ <environment> ++ <os>freebsd</os> ++ <ws>gtk</ws> ++ <arch>x86</arch> ++ </environment> ++ </environments> ++ </configuration> ++ </plugin> ++ </plugins> ++ </build> +</project> --- build.orig/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/src/update.c 1969-12-31 19:00:00.000000000 -0500 +++ build/eclipse-3.5.2-src/plugins/org.eclipse.update.core.freebsd/src/update.c 2009-12-23 15:14:12.610683039 -0500 @@ -7271,6 +6965,79 @@ $FreeBSD$ +
+#endif
+#endif
+--- build.orig/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.update.core.freebsd/src/build.xml ++++ build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.update.core.freebsd/src/build.xml +@@ -0,0 +25,70 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<project name="buildlibrary" default="run" basedir="."> ++ ++ <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script --> ++ <!-- Set a meaningful default value for when it is not. --> ++ <property name="eclipse-home" value="${basedir}/../.."/> ++ <property name="jdk-path" value="${java.home}"/> ++ <property name="installArch" value="x86" /> ++ <property name="destination" value="${eclipse-home}/org.eclipse.update.core.freebsd/os/freebsd/${installArch}/"/> ++ <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> ++ <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> ++ ++ <!-- sets the properties --> ++ <property name="library-name" value="libupdate"/> ++ <property name="library-platform" value="so"/> ++ <property name="library-file" value="${library-name}.${library-platform}"/> ++ ++ <!-- This target holds all initialization code that needs to be done for --> ++ <!-- all tests that are to be run. Initialization for individual tests --> ++ <!-- should be done within the body of the suite target. --> ++ <target name="init"> ++ <tstamp/> ++ <delete> ++ <fileset dir="${obj-path}" includes="${library-file}"/> ++ <fileset dir="${obj-path}" includes="${library-name}.o"/> ++ </delete> ++ </target> ++ ++ <!-- This target holds code to cleanup the testing environment after --> ++ <!-- after all of the tests have been run. You can use this target to --> ++ <!-- delete temporary files that have been created. --> ++ <target name="cleanup"> ++ <delete> ++ <fileset dir="${obj-path}" includes="${library-file}"/> ++ <fileset dir="${obj-path}" includes="${library-name}.o"/> ++ </delete> ++ </target> ++ ++ ++ <!-- This target runs the build. --> ++ <target name="run" depends="init,build,cleanup"> ++ </target> ++ ++ <!-- This target build the library --> ++ <target name="build"> ++ <echo message="Building ${library-file}"/> ++ ++ <property name="header-path" value="${jdk-path}/../include"/> ++ <property name="header-freebsd-path" value="${header-path}/freebsd" /> ++ ++ <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-freebsd-path} -fPIC ${library-file}"/> ++ ++ <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> ++ <arg value="-o"/> ++ <arg value="${library-file}"/> ++ <arg value="-shared"/> ++ <arg value="-I${src-path}"/> ++ <arg value="-I${header-path}"/> ++ <arg value="-I${header-freebsd-path}"/> ++ <arg value="-fPIC"/> ++ <srcfile/> ++ <fileset dir="${src-path}" includes="*.c"/> ++ <mapper type="glob" from="*.c" to="*.o"/> ++ </apply> ++ ++ <move file="${library-file}" todir="${destination}"/> ++ </target> ++ ++ ++</project> --- 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 @@ @@ -7343,70 +7110,50 @@ $FreeBSD$ +} --- 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 -@@ -34,6 +34,7 @@ - org.eclipse.equinox.launcher.motif.hpux.ia64_32,0.0.0=v20110502 - org.eclipse.equinox.http,0.0.0=v20110413 - org.eclipse.swt.gtk.linux.x86_64,0.0.0=v3738a -+org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v3738a - org.eclipse.equinox.p2.ui.admin,0.0.0=v20110502-1955 - org.eclipse.equinox.p2.publisher.eclipse,0.0.0=v20110511 - org.eclipse.equinox.weaving.caching.j9,0.0.0=v20110502 -@@ -52,6 +52,7 @@ - org.eclipse.ui.workbench.texteditor,0.0.0=v20110505-0800 - org.eclipse.ui.examples.multipageeditor,0.0.0=I20110413-1600 - org.eclipse.core.filesystem.linux.x86,0.0.0=v20110423-0524 -+org.eclipse.core.filesystem.freebsd.x86,0.0.0=v20110423-0524 - org.eclipse.equinox.p2.ui.discovery,0.0.0=v20110502-1955 - org.eclipse.ui.examples.javaeditor,0.0.0=v20110524-0800 - org.eclipse.ant.core,0.0.0=v20110511 -@@ -93,6 +94,7 @@ - org.eclipse.core.runtime,0.0.0=v20110110 - org.eclipse.core.resources.win32.x86,0.0.0=v20110423-0524 - org.eclipse.equinox.launcher.gtk.linux.x86_64,0.0.0=v20110505 -+org.eclipse.equinox.launcher.gtk.freebsd.x86_64,0.0.0=v20110505 - org.eclipse.help,0.0.0=v20110426 - org.eclipse.pde.api.tools.ee.j2se15,0.0.0=v20110401-1030 - org.junit4,0.0.0=v20100525 -@@ -135,6 +137,7 @@ - org.eclipse.equinox.p2.ui.importexport,0.0.0=v20110511 - org.eclipse.pde.api.tools.ee.jre11,0.0.0=v20110401-1030 - org.eclipse.core.net.linux.x86_64,0.0.0=I20110331-0827 -+org.eclipse.core.net.freebsd.x86_64,0.0.0=I20110331-0827 - org.eclipse.equinox.jsp.jasper,0.0.0=v20110502 - org.eclipse.pde.api.tools.ee.j2se14,0.0.0=v20110401-1030 - org.eclipse.equinox.p2.ui,0.0.0=v20110601 -@@ -158,6 +161,7 @@ - org.eclipse.swt.gtk.solaris.x86,0.0.0=v3738a - org.eclipse.pde.ds.ui,0.0.0=v20110516 - org.eclipse.core.net.linux.x86,0.0.0=I20110419-0800 -+org.eclipse.core.net.freebsd.x86,0.0.0=I20110419-0800 - org.eclipse.equinox.p2.console,0.0.0=v20110502-1955 - org.eclipse.equinox.http.jetty,0.0.0=v20110502 - org.eclipse.swt.examples.browser.demos,0.0.0=v3738a -@@ -175,6 +179,7 @@ - org.eclipse.equinox.launcher.win32.win32.ia64,0.0.0=v20110502 - org.eclipse.swt.examples.browser,0.0.0=v3738a - org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20110423-0524 -+org.eclipse.core.filesystem.freebsd.x86_64,0.0.0=v20110423-0524 - org.eclipse.equinox.event,0.0.0=v20110502 - org.eclipse.ui.ide,0.0.0=v20110809-1737 - org.eclipse.ui.views.log,0.0.0=v20110404 -@@ -185,6 +190,7 @@ - org.eclipse.equinox.ds,0.0.0=R37x_v20110701 - org.eclipse.equinox.launcher.win32.win32.x86_64,0.0.0=v20110502 - org.eclipse.equinox.launcher.gtk.linux.x86,0.0.0=v20110505 -+org.eclipse.equinox.launcher.gtk.freebsd.x86,0.0.0=v20110505 - org.eclipse.update.core.linux,0.0.0=v20100512 - org.eclipse.core.databinding.property,0.0.0=I20110222-0800 - org.eclipse.ui.examples.propertysheet,0.0.0=I20110413-1600 -@@ -246,6 +247,7 @@ - org.eclipse.swt.examples,0.0.0=v3738a - org.eclipse.cvs,0.0.0=v20110505-0800 - org.eclipse.swt.gtk.linux.x86,0.0.0=v3738a -+org.eclipse.swt.gtk.freebsd.x86,0.0.0=v3738a - org.eclipse.equinox.log,0.0.0=v20110502 - org.eclipse.equinox.jmx.client,0.0.0=v20100503 - org.eclipse.ui.win32,0.0.0=I20100509-0800 +@@ -106,6 +106,8 @@ + org.eclipse.equinox.launcher.gtk.linux.s390x,0.0.0=v20120522-1822 + org.eclipse.equinox.launcher.gtk.solaris.x86,0.0.0=v20120522-1813 + org.eclipse.equinox.launcher.motif.solaris.sparc,0.0.0=v20120522-1813 ++org.eclipse.equinox.launcher.gtk.freebsd.x86,0.0.0=v20120522-1813 ++org.eclipse.equinox.launcher.gtk.freebsd.x86_64,0.0.0=v20120522-1813 + org.eclipse.core.runtime,0.0.0=v20120521-2346 + org.eclipse.core.contenttype,0.0.0=v20120523-2004 + org.eclipse.core.jobs,0.0.0=v20120521-2346 +@@ -122,6 +124,8 @@ + org.eclipse.core.filesystem.linux.x86_64,0.0.0=v20120522-1137 + org.eclipse.core.filesystem.solaris.sparc,0.0.0=v20120522-1137 + org.eclipse.core.filesystem.aix.ppc,0.0.0=v20110423-0524 ++org.eclipse.core.filesystem.freebsd.x86,0.0.0=v20120522-1137 ++org.eclipse.core.filesystem.freebsd.x86_64,0.0.0=v20120522-1137 + org.eclipse.core.boot,0.0.0=v20120523-2004 + org.eclipse.core.runtime.compatibility,0.0.0=v20120521-2346 + org.eclipse.core.runtime.compatibility.auth,0.0.0=v20120523-2004 +@@ -306,6 +310,8 @@ + org.eclipse.swt.win32.win32.ia64,0.0.0=v4233d + org.eclipse.swt.gtk.linux.s390,0.0.0=v4233d + org.eclipse.swt.gtk.linux.s390x,0.0.0=v4233d ++org.eclipse.swt.gtk.freebsd.x86,0.0.0=v4233d ++org.eclipse.swt.gtk.freebsd.x86_64,0.0.0=v4233d + org.eclipse.swt.examples,0.0.0=v4233d + org.eclipse.swt.examples.browser,0.0.0=v4233d + org.eclipse.swt.examples.browser.demos,0.0.0=v4233d +@@ -330,6 +336,8 @@ + org.eclipse.core.net.linux.x86,0.0.0=v20120522-1148 + org.eclipse.core.net.linux.x86_64,0.0.0=v20120522-1148 + org.eclipse.core.net.win32.x86_64,0.0.0=v20120522-1148 ++org.eclipse.core.net.freebsd.x86,0.0.0=v20120522-1148 ++org.eclipse.core.net.freebsd.x86_64,0.0.0=v20120522-1148 + org.eclipse.ant.optional.junit,0.0.0=v20120530-1214 + org.eclipse.text,0.0.0=v20120523-1310 + org.eclipse.jface.text,0.0.0=v20120531-0600 +@@ -372,6 +380,7 @@ + org.eclipse.update.ui,0.0.0=v20120523-1752 + org.eclipse.update.core.win32,0.0.0=v20120530-1204 + org.eclipse.update.core.linux,0.0.0=v20120530-1204 ++org.eclipse.update.core.freebsd,0.0.0=v20120530-1204 + org.eclipse.help,0.0.0=v20120521-2344 + org.eclipse.help.appserver,0.0.0=v20120521-2344 + org.eclipse.help.base,0.0.0=v20120521-2344 --- build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml~ Fri Feb 18 17:56:16 2011 +++ build/eclipse-3.7.0-src/features/org.eclipse.equinox.executable/feature.xml Thu Sep 15 11:03:18 2011 @@ -131,6 +131,26 @@ diff --git a/java/eclipse-devel/files/patch-dependencyManifests b/java/eclipse-devel/files/patch-dependencyManifests index ae57d2b77415..6bb9d257056c 100644 --- a/java/eclipse-devel/files/patch-dependencyManifests +++ b/java/eclipse-devel/files/patch-dependencyManifests @@ -1,88 +1,71 @@ ---- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF~ 2012-01-26 18:03:49.377369870 +0100 -+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet_3.0.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:18:27.055000978 +0100 -@@ -6,6 +6,6 @@ - Bundle-Localization: plugin
--Bundle-Version: 2.5.0.v200806031605
-+Bundle-Version: 3.0.0.v201103241727
- Bundle-Vendor: %bundleProvider
--Export-Package: javax.servlet;version="2.5",javax.servlet.http;version
-- ="2.5",javax.servlet.resources;version="2.5"
-+Export-Package: javax.servlet;version="3.0",javax.servlet.http;version
-+ ="3.0",javax.servlet.resources;version="3.0"
-
---- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100 -+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/javax.servlet.jsp_2.2.0.jar/META-INF/MANIFEST.MF 2012-01-26 18:43:30.749772042 +0100 -@@ -4,10 +4,10 @@ - Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
- Bundle-Name: %bundleName
- Bundle-SymbolicName: javax.servlet.jsp
--Export-Package: javax.servlet.jsp; version=2.0,javax.servlet.jsp.el; v
-- ersion=2.0,javax.servlet.jsp.resources; version=2.0,javax.servlet.jsp
-- .tagext; version=2.0
--Bundle-Version: 2.0.0.v200806031607
-+Export-Package: javax.servlet.jsp; version=2.2,javax.servlet.jsp.el; v
-+ ersion=2.2,javax.servlet.jsp.resources; version=2.2,javax.servlet.jsp
-+ .tagext; version=2.2
-+Bundle-Version: 2.2.0.v200806031607
- Bundle-ManifestVersion: 2
--Import-Package: javax.servlet; version=2.4,javax.servlet.http; version
-- =2.4,javax.servlet.resources; version=2.4
-+Import-Package: javax.servlet; version=3.0,javax.servlet.http; version
-+ =3.0,javax.servlet.resources; version=3.0
---- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF~ 2011-12-19 16:40:57.000000000 +0100 -+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF 2012-01-26 18:36:42.891544584 +0100 -@@ -6,21 +6,21 @@ - 2SE-1.3
- Bundle-Name: %bundleName
- Bundle-SymbolicName: org.apache.jasper
--Export-Package: org.apache.jasper;version="5.5.17",org.apache.jasper.c
-- ompiler;version="5.5.17",org.apache.jasper.compiler.tagplugin;version
-- ="5.5.17",org.apache.jasper.resources;version="5.5.17",org.apache.jas
-- per.runtime;version="5.5.17",org.apache.jasper.security;version="5.5.
-- 17",org.apache.jasper.servlet;version="5.5.17",org.apache.jasper.tagp
-- lugins.jstl;version="5.5.17",org.apache.jasper.tagplugins.jstl.core;v
-- ersion="5.5.17",org.apache.jasper.util;version="5.5.17",org.apache.ja
-- sper.xmlparser;version="5.5.17"
--Bundle-Version: 5.5.17.v201004212143
-+Export-Package: org.apache.jasper;version="7.0.21",org.apache.jasper.c
-+ ompiler;version="7.0.21",org.apache.jasper.compiler.tagplugin;version
-+ ="7.0.21",org.apache.jasper.resources;version="7.0.21",org.apache.jas
-+ per.runtime;version="7.0.21",org.apache.jasper.security;version="5.5.
-+ 17",org.apache.jasper.servlet;version="7.0.21",org.apache.jasper.tagp
-+ lugins.jstl;version="7.0.21",org.apache.jasper.tagplugins.jstl.core;v
-+ ersion="7.0.21",org.apache.jasper.util;version="7.0.21",org.apache.ja
-+ sper.xmlparser;version="7.0.21"
-+Bundle-Version: 7.0.21.v201004212143
- Bundle-ManifestVersion: 2
--Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
-- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
-- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
-- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
-- let.resources;version="[2.4, 3.0)",javax.xml.parsers,org.apache.commo
-+Import-Package: javax.servlet;version="3.0",javax.servlet.http;
-+ version="3.0",javax.servlet.jsp;version="2.2",javax.ser
-+ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
-+ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
-+ let.resources;version="3.0",javax.xml.parsers,org.apache.commo
- ns.el;version="[1.0.0,2.0.0)",org.apache.commons.logging;version="[1.
- 0.0,2.0.0)",org.apache.tools.ant;resolution:=optional,org.apache.tool
- s.ant.taskdefs;resolution:=optional,org.apache.tools.ant.types;resolu
+$FreeBSD$ + --- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF~ Mon Dec 19 16:40:57 2011 +++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF Wed Feb 29 16:33:20 2012 -@@ -8,11 +8,11 @@ +@@ -6,13 +6,13 @@ + Bundle-SymbolicName: org.apache.commons.el
+ Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
ns.el.parser;version="1.0.0"
- Bundle-Version: 1.0.0.v201004212143
+-Bundle-Version: 1.0.0.v201004212143
++Bundle-Version: 1.0.0.v201101211617
Bundle-ManifestVersion: 2
-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
- let.resources;version="[2.4, 3.0)"
-+Import-Package: javax.servlet;version="[2.5, 3.0]",javax.servlet.http;
-+ version="[2.5, 3.0]",javax.servlet.jsp;version="2.2",javax.ser
-+ vlet.jsp.el;version="2.2",javax.servlet.jsp.resources;version=
-+ "2.2",javax.servlet.jsp.tagext;version="2.2",javax.serv
-+ let.resources;version="[2.5, 3.0]"
++Import-Package: javax.servlet;version="2.4",javax.servlet.http;
++ version="2.4",javax.servlet.jsp;version="2.0",javax.ser
++ vlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version=
++ "2.0",javax.servlet.jsp.tagext;version="2.0",javax.serv
++ let.resources;version="2.4"
Name: org/apache/commons/el/ImplicitObjects$6.class
SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
+--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF Tue Aug 7 14:18:09 2012 +@@ -9,7 +9,6 @@ + Export-Package: javax.el;version="2.2.0"
+ Bundle-Version: 2.2.0.v201108011116
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.servlet;version="2.5.0",javax.servlet.http;versi
+- on="2.5.0"
++DynamicImport-Package: org.apache.el
+
+
+--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF Tue Aug 7 14:20:50 2012 +@@ -11,7 +11,7 @@ + rvlet.jsp.tagext;version="2.2.0"
+ Bundle-Version: 2.2.0.v201112011158
+ Bundle-ManifestVersion: 2
+-Import-Package: javax.el;version="2.2.0",javax.servlet;version="2.6.0"
+- ,javax.servlet.http;version="2.6.0"
++Import-Package: javax.el;version="2.2.0",javax.servlet;version="3.0"
++ ,javax.servlet.http;version="3.0",javax.servlet.resources;version="3.0"
+
+
+--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF Tue Aug 7 17:18:42 2012 +@@ -7,12 +7,14 @@ + Bundle-SymbolicName: javax.servlet
+ Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
+ ls:org.eclipse.orbit/javax.servlet;tag=v201112011016
+-Export-Package: javax.servlet;version="2.6.0";uses:="javax.servlet.ann
+- otation,javax.servlet.descriptor",javax.servlet.annotation;version="2
+- .6.0";uses:="javax.servlet",javax.servlet.descriptor;version="2.6.0",
+- javax.servlet.http;version="2.6.0";uses:="javax.servlet",javax.servle
+- t.resources;version="2.6.0"
+ Bundle-Version: 3.0.0.v201112011016
+ Bundle-ManifestVersion: 2
+-
+-
++Export-Package: javax.servlet;version="3.0",
++ javax.servlet;version="2.6",
++ javax.servlet.http;version="3.0",
++ javax.servlet.http;version="2.6",
++ javax.servlet.annotation;version="2.6",
++ javax.servlet.descriptor;version="3.0",
++ javax.servlet.descriptor;version="2.6",
++ javax.servlet.resources;version="3.0",
++ javax.servlet.resources;version="2.6"
diff --git a/java/eclipse-devel/files/patch-eclipse-build b/java/eclipse-devel/files/patch-eclipse-build index fd225a9ce180..f72b2b4d1b91 100644 --- a/java/eclipse-devel/files/patch-eclipse-build +++ b/java/eclipse-devel/files/patch-eclipse-build @@ -2,7 +2,16 @@ $FreeBSD$ --- eclipse-build-0.5.0.orig/build.properties 2009-09-30 14:07:21.000000000 -0400 +++ eclipse-build-0.5.0/build.properties 2009-12-23 16:23:06.355139641 -0500 -@@ -28,7 +28,7 @@ +@@ -11,7 +11,7 @@ + skipFetch=true + individualSourceBundles=true + ws=gtk +-os=linux ++os=freebsd + includeLaunchers=true + runPackager=true + groupConfigurations=true +@@ -27,7 +27,7 @@ collectingFolder=eclipse archivePrefix=eclipse generateFeatureVersionSuffix=true @@ -53,7 +62,7 @@ $FreeBSD$ +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 -@@ -118,11 +118,11 @@ +@@ -121,11 +121,11 @@ <target name="setLibDir" depends="setLib64Dir"> <property name="libDir" value="lib" /> @@ -66,8 +75,8 @@ $FreeBSD$ + <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}/%%PORTNAME%%" /> </target> - <property name="doTests" value="true" /> -@@ -167,8 +167,7 @@ + <target name="bootstrap" unless="bootstrapped"> +@@ -180,8 +180,7 @@ <target name="copySource" unless="sdkSourcePresent"> <echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" /> <exec executable="cp" failonerror="true"> @@ -77,111 +86,107 @@ $FreeBSD$ <arg value="eclipse" /> <arg value="${buildDirectory}" /> </exec> -@@ -309,12 +308,18 @@ - <!-- - <patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" /> - --> +@@ -365,32 +364,38 @@ + + <target name="applyPatches" depends="insertBuildId" unless="patch.complete"> + +- <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/> +- <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/> +- <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/> +- <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/> +- <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/> ++ <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1"/> ++ <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1"/> ++ <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1"/> ++ <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2"/> ++ <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2"/> + + <!-- eclipse-build-only patches --> + + <patch patchfile="${basedir}/patches/e4-remove-w3c-smil-and-use-geronimo.patch" dir="${buildDirectory}" strip="0" reverse="false"/> +- <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" backups="true" /> ++ <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" /> + +- <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" backups="true"/> - <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-addArchesAnd64bitSWT.patch" /> -+ </exec> ++ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1"/> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.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/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2" backups="true"/> ++ <patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2"/> <patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/s390-correctly-build-executable.patch" dir="${buildDirectory}" strip="1"/> + <patch patchfile="${basedir}/patches/eclipse-add-archs-net.patch" dir="${buildDirectory}" strip="1" /> <patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" /> + + <patch patchfile="${basedir}/patches/fix-gnomeproxy-includes.patch" dir="${buildDirectory}" strip="1" /> - <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p1" /> -+ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" /> -+ </exec> - <patch patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch" dir="${buildDirectory}" strip="1" /> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p1" /> ++ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" /> ++ </exec> + <patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" /> - <patch patchfile="${basedir}/patches/gnomeproxy-makefile.patch" dir="${buildDirectory}" strip="1" /> -@@ -337,20 +342,30 @@ - </replace> - <patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" /> -- <patch patchfile="${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" dir="${buildDirectory}/plugins" strip="2" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}/plugins"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/0001-Fix-Program.launch-for-remote-uri-in-the-pure-gio-en.patch" /> -+ </exec> - <patch patchfile="${basedir}/patches/remove-lucene-dependency.patch" dir="${buildDirectory}" strip="1" /> - <patch patchfile="${basedir}/patches/eclipse-equinox-jsp-jasper.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-equinox-http-jetty.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-equinox-http-servlet.patch" dir="${buildDirectory}" strip="0" /> - <patch patchfile="${basedir}/patches/eclipse-help-feature.patch" dir="${buildDirectory}" strip="0" /> + +- <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2" backups="true"/> ++ <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2"/> + + <patch patchfile="${basedir}/patches/eclipse-help-feature-adjust-dependencies.patch" dir="${buildDirectory}" strip="1" /> + <patch patchfile="${basedir}/patches/eclipse-help-fix-webapp-jsp-compilation.patch" dir="${buildDirectory}/plugins" strip="1"/> +@@ -424,11 +429,16 @@ + <!-- Point (2) implies that you cannot use PDE build.xml, because there is no source folder, so nothing will be compiled --> + <!-- Point (1) implies that developers will not create a source folder, because they want to ship binaries --> + <!-- So we have to live with those two patches --> +- <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0" backups="true"/> ++ <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0"/> + <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="0" /> + <patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> -+ <arg value="-p2" /> -+ <arg value="-i${basedir}/patches/freebsd-support.patch" /> -+ </exec> - <echo file="patch-stamp" /> - </target> - <target name="applyTestPatches" depends="unpackTests" unless="testspatch.complete"> - <patch patchfile="${basedir}/patches/tests-noapttests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> - <patch patchfile="${basedir}/patches/tests-noequinoxregiontests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> -- <patch patchfile="${basedir}/patches/tests-BZ295666.patch" dir="${testsBuildDirectory}" strip="0" /> -+ <exec executable="${localbase}/bin/gpatch" dir="${testsBuildDirectory}"> -+ <arg value="-p0" /> -+ <arg value="-i${basedir}/patches/tests-BZ295666.patch" /> -+ </exec> - <patch patchfile="${basedir}/patches/tests-org.eclipse.pde.ui.tests-LocalTargetDefinitionTests.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.pde.ui.tests" strip="0" /> - <patch patchfile="${basedir}/patches/tests-nop2discoverytests.patch" dir="${testsBuildDirectory}/features/org.eclipse.sdk.tests" strip="0" /> - <patch patchfile="${basedir}/patches/tests-org.eclipse.ant.tests.core.patch" dir="${testsBuildDirectory}/plugins/org.eclipse.ant.tests.core" strip="0" /> -@@ -725,7 +729,7 @@ - <target name="provision.sdk" depends="p2prep" unless="provision.sdk.complete"> - <echo message="Installing into: ${provisionDir}" /> - <antcall target="provision"> -- <param name="p2.director.installIU" value="org.eclipse.sdk.ide" /> -+ <param name="p2.director.installIU" value="org.eclipse.sdk.ide,org.eclipse.equinox.initializer" /> - <param name="profileName" value="SDKProfile" /> - </antcall> ++ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}"> ++ <arg value="-p2" /> ++ <arg value="-i${basedir}/patches/freebsd-support.patch" /> ++ </exec> ++ + <!-- jsr14 is practically unusable with java7 --> + <antcall target="jsr14To15" /> -@@ -850,7 +854,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" /> - <arg value="-t${timestamp}" /> - <arg value="-a${buildArch}" /> - <arg value="-o${buildOs}" /> -@@ -1014,33 +1030,29 @@ +@@ -952,34 +962,29 @@ <target name="installIntoDestDir"> <mkdir dir="${installationDir}" /> - <exec executable="rsync" failonerror="true"> -- <arg value="-vrpl" /> -+ <arg value="-vrpL" /> - <arg value="--exclude=dropins" /> - <arg value="${provisionDir}/" /> - <arg value="${installationDir}/" /> - </exec> + <exec executable="rsync" failonerror="true"> +- <arg value="-vrpl" /> ++ <arg value="-vrpL" /> + <arg value="--exclude=dropins" /> + <arg value="${provisionDir}/" /> + <arg value="${installationDir}/" /> + </exec> <!-- install desktop file --> - <copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" /> - <!-- install Eclipse Java code formatter launcher --> - <property name="efj" value="${destDir}${prefix}/bin/efj"/> - <copy file="efj.sh" tofile="${efj}" /> -+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> - <fileset id="equinoxLauncher" dir="${installationDir}/plugins"> - <include name="org.eclipse.equinox.launcher_*.jar" /> - </fileset> - <property name="launcherJar" refid="equinoxLauncher"/> +- <chmod file="${efj}" perm="ugo+rx"/> ++ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" /> + <fileset id="equinoxLauncher" dir="${installationDir}/plugins"> + <include name="org.eclipse.equinox.launcher_*.jar" /> + </fileset> + <property name="launcherJar" refid="equinoxLauncher"/> - <replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/> <!-- install icons --> -- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" /> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" /> - <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/eclipse.png" /> -+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/%%PORTNAME%%.png" /> +- <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/eclipse.png" /> + <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/%%PORTNAME%%.png" /> + <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/%%PORTNAME%%.png" /> ++ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/%%PORTNAME%%.png" /> <mkdir dir="${destDir}${prefix}/share/pixmaps" /> -- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/48x48/apps/eclipse.png" overwrite="true"/> -+ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/48x48/apps/%%PORTNAME%%.png" overwrite="true"/> +- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/256x256/apps/eclipse.png" overwrite="true"/> ++ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/256x256/apps/%%PORTNAME%%.png" overwrite="true"/> <!--shared dropins folder for architecture-independent plugins--> - <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" /> + <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" /> @@ -192,7 +197,7 @@ $FreeBSD$ <!-- Create the "swt.jar" and friends symlinks --> <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" /> <property name="swtjarpath" refid="swtjar" /> -@@ -1013,7 +1015,7 @@ +@@ -987,7 +992,7 @@ <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/> <symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/> @@ -200,17 +205,17 @@ $FreeBSD$ + <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}"> -@@ -1039,7 +1041,7 @@ + <antcall target="extractSos"> +@@ -1008,7 +1013,7 @@ <!-- copy PDE and JDT to dropins --> - <exec executable="rsync" failonerror="true"> -- <arg value="-vrpl" /> -+ <arg value="-vrpL" /> - <arg value="${provisionDir}/dropins/" /> - <arg value="${installationDir}/dropins/" /> - </exec> -@@ -1072,8 +1074,8 @@ + <exec executable="rsync" failonerror="true"> +- <arg value="-vrpl" /> ++ <arg value="-vrpL" /> + <arg value="${provisionDir}/dropins/" /> + <arg value="${installationDir}/dropins/" /> + </exec> +@@ -1041,8 +1046,8 @@ <arg value="s@/@_@g" /> </exec> <apply executable="sed" failonerror="true" verbose="true"> @@ -221,7 +226,7 @@ $FreeBSD$ <srcfile /> <fileset dir="${installationDir}"> <include name="metadata/content.xml" /> -@@ -1094,7 +1096,7 @@ +@@ -1063,7 +1068,7 @@ </fileset> </apply> <apply executable="sed" failonerror="true" verbose="true"> @@ -230,9 +235,9 @@ $FreeBSD$ <arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" /> <srcfile /> <fileset dir="${installationDir}/${profileDir}"> -@@ -1109,9 +1111,11 @@ +@@ -1078,9 +1083,11 @@ </apply> - + <!-- Move config file to /etc --> + <!-- <mkdir dir="${destDir}/etc" /> @@ -242,7 +247,7 @@ $FreeBSD$ </target> -@@ -1156,8 +1164,7 @@ +@@ -1095,8 +1102,7 @@ <!-- make a copy of the clean platform+CVS installation --> <exec executable="cp" failonerror="true"> @@ -252,7 +257,7 @@ $FreeBSD$ <arg value="${provisionDir}" /> <arg value="${platformAndCVSInstallation}" /> </exec> -@@ -1173,16 +1180,14 @@ +@@ -1112,16 +1118,14 @@ tofile="${jdtInstallation}"/> <!-- make a second copy of the clean JDT installation --> <exec executable="cp" failonerror="true"> @@ -262,7 +267,7 @@ $FreeBSD$ <arg value="${jdtInstallation}" /> <arg value="${jdtInstallation}.orig" /> </exec> - + <!-- restore clean platform+CVS installation --> <exec executable="cp" failonerror="true"> - <arg value="-rd" /> @@ -271,8 +276,8 @@ $FreeBSD$ <arg value="${platformAndCVSInstallation}" /> <arg value="${provisionDir}" /> </exec> -@@ -1199,8 +1204,7 @@ - +@@ -1138,8 +1142,7 @@ + <!-- restore clean platform+CVS installation --> <exec executable="cp" failonerror="true"> - <arg value="-rd" /> @@ -294,15 +299,14 @@ $FreeBSD$ 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 -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ buildArch=x86 ws=gtk -os=linux +os=freebsd - buildId=R3_7_1 - buildTag=R3_7_1 - label=3.7.1 + buildId=I20120608-1400 + label=4.2.0-I20120608-1400 -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:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar +bootclasspath=%%BOOTCLASSPATH%% #build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter @@ -370,35 +374,41 @@ $FreeBSD$ +Exec=%%PORTNAME%% Terminal=false Categories=Development;IDE;Java; ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties.orig Thu Jun 30 16:45:54 2011 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies.properties Thu Jun 30 16:46:18 2011 -@@ -1,5 +1,5 @@ - com.ibm.icu_4.4.2.v20110208.jar=/usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/lib64/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar:/usr/share/java/com.ibm.icu-4.4.jar:/usr/share/java/com.ibm.icu.jar:/usr/share/java/icu4j.jar --com.jcraft.jsch_0.1.41.v200903070017.jar=/usr/share/java/jsch.jar -+com.jcraft.jsch_0.1.41.v201101211617.jar=/usr/share/java/jsch.jar - javax.servlet_3.0.0.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar - javax.servlet.jsp_2.2.0.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar - javax.el_2.2.0.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar -@@ -7,13 +7,13 @@ +--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties.orig Thu Jun 30 16:45:54 2011 ++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties Thu Jun 30 16:46:18 2011 +@@ -10,7 +10,7 @@ + javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar + javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar + javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar +-javax.xml_1.0.1.v200903091627.jar=/usr/share/java/xml-commons-apis.jar ++javax.xml_1.3.4.v201005080400.jar=/usr/share/java/xml-commons-apis.jar + org.apache.batik.css_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-css.jar + org.apache.batik.util_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-util.jar + org.apache.batik.util.gui_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-gui-util.jar +@@ -18,7 +18,7 @@ org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar -org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar --org.apache.commons.httpclient_3.1.0.v201005080502.jar=/usr/share/java/commons-httpclient.jar +org.apache.commons.el_1.0.0.v201101211617.jar=/usr/share/java/commons-el.jar -+org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar + org.apache.commons.httpclient_3.1.0.v201012070820.jar=/usr/share/java/commons-httpclient.jar org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-logging.jar - org.apache.jasper_7.0.21.jar=/usr/share/java/tomcat/jasper.jar - org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar - org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar --org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar --org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar -+org.mortbay.jetty.util_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar -+org.mortbay.jetty.server_6.1.23.v201012071420.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar - org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar - org.sat4j.pb_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.pb.jar:/usr/share/sat4j/org.sat4j.pb.jar ---- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011 -+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/sdkdependencies.properties Fri Jul 1 20:16:04 2011 + org.apache.felix.gogo.command_0.8.0.v201108120515.jar=/usr/share/java/felix/org.apache.felix.gogo.command.jar +--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties Wed Jul 25 18:03:02 2012 +@@ -20,10 +20,3 @@ + org.apache.ant_1.8.3.v20120321-1730/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar + org.apache.ant_1.8.3.v20120321-1730/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar + org.apache.ant_1.8.3.v20120321-1730/lib/ant.jar=/usr/share/java/ant.jar +-#bin folder +-org.apache.ant_1.8.3.v20120321-1730/bin/ant=/usr/bin/ant +-org.apache.ant_1.8.3.v20120321-1730/bin/antRun=/usr/bin/antRun +-org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl=/usr/bin/antRun.pl +-org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl=/usr/bin/runant.pl +-org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py +-org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl +--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011 ++++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties Fri Jul 1 20:16:04 2011 @@ -1,1 +1,1 @@ -org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar +org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar @@ -417,3 +427,67 @@ $FreeBSD$ + sed -i .orig 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f} + sed -i .orig 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f} done +--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh Fri Jun 29 15:04:36 2012 +@@ -4,13 +4,13 @@ + newArch=$2 + + moves(){ +-for f in $(find -type d); do ++for f in $(find . -type d); do + tofile=$(echo $f | sed "s/$baseArch/$newArch/") + if [ $tofile != $f ]; then + cp -pfr $f $tofile + fi + done +-for f in $(find -type f); do ++for f in $(find . -type f); do + tofile=$(echo $f | sed "s/$baseArch/$newArch/") + if [ $tofile != $f ]; then + cp -pfr $f $tofile +--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf Wed Aug 8 13:48:10 2012 +@@ -56,3 +56,20 @@ + units.3.touchpoint.version=1.0.0 + units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ ++requires.4.namespace=org.eclipse.equinox.p2.iu ++requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk)) ++requires.4.range=[1.0.0,1.0.0] ++requires.4.greedy=true ++ ++units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++units.4.version=1.0.0 ++units.4.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++units.4.provides.1.version=1.0.0 ++units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk)) ++units.4.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.4.touchpoint.version=1.0.0 ++units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); +--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf~ Thu Jun 28 12:02:14 2012 ++++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf Wed Aug 8 13:55:04 2012 +@@ -56,3 +56,20 @@ + units.3.touchpoint.version=1.0.0 + units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); + units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); ++ ++requires.4.namespace=org.eclipse.equinox.p2.iu ++requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk)) ++requires.4.range=[1.0.0,1.0.0] ++requires.4.greedy=true ++ ++units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++units.4.version=1.0.0 ++units.4.provides.1.namespace=org.eclipse.equinox.p2.iu ++units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64 ++units.4.provides.1.version=1.0.0 ++units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk)) ++units.4.touchpoint.id=org.eclipse.equinox.p2.osgi ++units.4.touchpoint.version=1.0.0 ++units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true); ++units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo); diff --git a/java/eclipse-devel/files/patch-generatedScripts b/java/eclipse-devel/files/patch-generatedScripts deleted file mode 100644 index 02d05aae06d7..000000000000 --- a/java/eclipse-devel/files/patch-generatedScripts +++ /dev/null @@ -1,80 +0,0 @@ -$FreeBSD$ - -diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml ---- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2011-09-09 09:31:10.000000000 +0200 -+++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml 2012-01-19 16:07:46.000000000 +0100 -@@ -105,7 +105,7 @@ - <delete dir="${build.result.folder}/@dot"/> - <mkdir dir="${build.result.folder}/@dot"/> - <path id="@dot.classpath"> -- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/> -+ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> - <pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/> - <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> - <pathelement path="../org.eclipse.core.jobs/bin/"/> -diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml ---- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2011-09-09 09:31:10.000000000 +0200 -+++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml 2012-01-19 16:07:59.000000000 +0100 -@@ -107,7 +107,7 @@ - <path id="@dot.classpath"> - <pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/> - <pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/> -- <pathelement path="../org.apache.commons.httpclient_3.1.0.v201005080502.jar"/> -+ <pathelement path="../org.apache.commons.httpclient_3.1.0.v201012070820.jar"/> - <pathelement path="../org.apache.commons.codec_1.3.0.v201101211617.jar"/> - <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> - <pathelement path="../org.eclipse.core.jobs/bin/"/> -diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml ---- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2011-09-09 09:31:10.000000000 +0200 -+++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml 2012-01-19 16:11:35.000000000 +0100 -@@ -99,11 +99,11 @@ - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> -+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> - <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> -- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> -+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> - <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> -diff -urN eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml ---- eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts.orig/plugins/org.eclipse.help.base/build.xml 2011-09-09 09:31:10.000000000 +0200 -+++ eclipse-build-ac26b7b28f77d35c40527bd48b5bb5293369e89c/generatedScripts/plugins/org.eclipse.help.base/build.xml 2012-01-19 16:12:03.000000000 +0100 -@@ -107,11 +107,11 @@ - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> -+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> - <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> -- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> -+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> - <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> -@@ -238,11 +238,11 @@ - <pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/> - <pathelement path="../org.eclipse.osgi.services"/> - <pathelement path="../org.eclipse.osgi.services/@dot"/> -- <pathelement path="../org.mortbay.jetty.util_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.mortbay.jetty.server_6.1.23.v201004211559.jar"/> -- <pathelement path="../org.apache.jasper_5.5.17.v200903231320.jar"/> -+ <pathelement path="../org.mortbay.jetty.util_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.mortbay.jetty.server_6.1.23.v201012071420.jar"/> -+ <pathelement path="../org.apache.jasper_5.5.17.v201101211617.jar"/> - <pathelement path="../javax.servlet.jsp_2.0.0.v201101211617.jar"/> -- <pathelement path="../org.apache.commons.el_1.0.0.v200806031608.jar"/> -+ <pathelement path="../org.apache.commons.el_1.0.0.v201101211617.jar"/> - <pathelement path="../org.apache.commons.logging_1.0.4.v201101211617.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/> - <pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/> |