mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
java/eclipse: Update version 3.7.1 => 4.3.2 and assign maintainer
At long last, eclipse has been updated to the latest release and is now under the stewardship of Jimmy Kelly. This version supports OpenJDK8 runtime environments. A special thanks to Jonathan Chen for getting the ball rolling after the PR stalled. PR: 188659 Submitted by: Jimmy Kelly Distfiles by: Jonathan Chen Verified by: F10/amd64 poudriere
This commit is contained in:
John Marino
parent
c0ef6553ab
commit
7a492ac2b5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359322
@ -1,247 +1,100 @@
|
||||
# Created by: Jimmy Kelley <ljboiler@gmail.com>
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= eclipse
|
||||
PORTVERSION= 3.7.1
|
||||
PORTREVISION= 4
|
||||
PORTVERSION= 4.3.2
|
||||
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_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,}
|
||||
DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \
|
||||
${ECLIPSE_SRCFILE}:1 \
|
||||
${ANT_SRCFILE}:4 \
|
||||
${JUNIT3_SRCFILE}:5 \
|
||||
${JUNIT4_SRCFILE}:6 \
|
||||
${TOMCAT_SRCFILES:C,(.*),\\1:7,}
|
||||
MASTER_SITES= https://googledrive.com/host/0B2kYpXHnC5LpSk01bU1ud0N5bXc/
|
||||
DISTFILES= eclipse.platform.releng.aggregator-${PORTVERSION}.xz \
|
||||
${PORTNAME}-maven-repo-${PORTVERSION}.xz
|
||||
DIST_SUBDIR= eclipse
|
||||
EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= Open extensible IDE for anything and nothing in particular
|
||||
MAINTAINER= ljboiler@gmail.com
|
||||
COMMENT= Eclipse Kepler SR-2
|
||||
|
||||
EXTRACT_DEPENDS=${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
|
||||
PATCH_DEPENDS= ant:${PORTSDIR}/devel/apache-ant \
|
||||
gpatch:${PORTSDIR}/devel/patch \
|
||||
zip:${PORTSDIR}/archivers/zip \
|
||||
${DEPEND_JAVA}
|
||||
BUILD_DEPENDS= gpatch:${PORTSDIR}/devel/patch \
|
||||
rsync:${PORTSDIR}/net/rsync \
|
||||
${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
|
||||
zip:${PORTSDIR}/archivers/zip
|
||||
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
|
||||
webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
|
||||
LICENSE= EPL
|
||||
|
||||
OPTIONS_DEFINE= TESTS
|
||||
TESTS_DESC= Build SDK test suite
|
||||
BUILD_DEPENDS= ${LOCALBASE}/share/java/maven31/bin/mvn:${PORTSDIR}/devel/maven31
|
||||
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
|
||||
libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
|
||||
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
CONFLICTS_INSTALL= eclipse
|
||||
|
||||
USES= pkgconfig gmake tar:xz
|
||||
USE_ANT= yes
|
||||
USES= gmake pkgconfig tar:xz
|
||||
USE_GL= glu
|
||||
USE_GNOME= desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui
|
||||
USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui
|
||||
USE_JAVA= yes
|
||||
BZIP2_SUFX= .tar.bz2
|
||||
ZIP_CMD?= ${LOCALBASE}/bin/zip
|
||||
|
||||
JAVA_BUILD= yes
|
||||
JAVA_OS= native
|
||||
JAVA_RUN= yes
|
||||
JAVA_VERSION= 1.6
|
||||
JAVA_VERSION= 1.7
|
||||
JAVA_VENDOR= openjdk
|
||||
JAVA_BUILD= yes
|
||||
JAVA_RUN= yes
|
||||
|
||||
ECLIPSE_BUILD_SRCFILE= eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92${EXTRACT_SUFX}
|
||||
ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-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 \
|
||||
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 \
|
||||
org.apache.commons.logging_1.0.4.v201101211617.jar \
|
||||
org.apache.lucene.core_2.9.1.v201101211721.jar \
|
||||
org.apache.lucene.analysis_2.9.1.v201101211721.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
|
||||
ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.3.0.v20110329.jar \
|
||||
org.sat4j.pb_2.3.0.v20110329.jar
|
||||
ANT_VERSION= 1.8.2
|
||||
ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX}
|
||||
ANT_BUNDLES= ant-antlr.jar \
|
||||
ant-apache-bcel.jar \
|
||||
ant-apache-bsf.jar \
|
||||
ant-apache-log4j.jar \
|
||||
ant-apache-oro.jar \
|
||||
ant-apache-regexp.jar \
|
||||
ant-apache-resolver.jar \
|
||||
ant-apache-xalan2.jar \
|
||||
ant-commons-logging.jar \
|
||||
ant-commons-net.jar \
|
||||
ant.jar \
|
||||
ant-javamail.jar \
|
||||
ant-jdepend.jar \
|
||||
ant-jmf.jar \
|
||||
ant-jsch.jar \
|
||||
ant-junit.jar \
|
||||
ant-junit4.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_SRCFILE= junit-${JUNIT4_VERSION}.jar
|
||||
TOMCAT_VERSION= 7.0.25
|
||||
TOMCAT_SRCFILES= apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar
|
||||
TOMCAT_BUNDLES= el-api.jar \
|
||||
jasper-el.jar \
|
||||
jasper.jar \
|
||||
jsp-api.jar \
|
||||
servlet-api.jar \
|
||||
tomcat-api.jar \
|
||||
tomcat-juli.jar
|
||||
FBSD_SUPPORT_SRCFILE= freebsd-support.patch
|
||||
ECLIPSE_GENERATED_BUILDSCRIPTS= eclipse-build-generatedScripts.tar.bz2
|
||||
OPTIONS_SINGLE= INSTALLPKG
|
||||
OPTIONS_SINGLE_INSTALLPKG= FULL_SDK PLATFORM_SDK PLATFORM
|
||||
FULL_SDK_DESC= Full SDK (JDT, PDE, source, API docs)
|
||||
PLATFORM_SDK_DESC= Platform with source, API Docs (no Java tools)
|
||||
PLATFORM_DESC= Platform only (no Java tools, no source or docs)
|
||||
|
||||
ALL_TARGET= provision.cvs
|
||||
INSTALL_TARGET= installSDKinDropins
|
||||
MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
|
||||
MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
|
||||
OPTIONS_DEFAULT= FULL_SDK
|
||||
|
||||
WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//}
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
|
||||
PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel/patch
|
||||
PATCH= gpatch
|
||||
.endif
|
||||
PATCH_STRIP= -p1
|
||||
|
||||
BOOTCLASSPATH= ${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/jsse.jar
|
||||
PORTDESTDIR= ${PREFIX}/lib/${PORTNAME}
|
||||
DROPINS_DIR= share/${PORTNAME}/dropins
|
||||
WRKSRC=${WRKDIR}/eclipse.platform.releng.aggregator-${PORTVERSION}
|
||||
GITCLONE=${DISTDIR}/eclipse/eclipse-gitclone/eclipse.platform.releng.aggregator
|
||||
|
||||
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/pixmaps/${PORTNAME}.png
|
||||
MVN_LOCAL_REPO= -Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION}/repository
|
||||
MVN_TEST_FLAG= -Dmaven.test.skip=true
|
||||
MVN_OPTS+= # a placeholder for MAVEN_OPTS environment variable
|
||||
#in the following format: MAVEN_OPTS='-Xmx1792m'
|
||||
MVN_SETTINGS+= --offline
|
||||
ECLIPSE_WS= gtk
|
||||
ECLIPSE_ARCH= x86${ARCH:C/^i.86//:C/^amd/_/}
|
||||
E_SHORTARCH= ${ARCH:C/^i.86//:C/^amd//}
|
||||
ECLIPSE_BUILDID=M20140224-0627
|
||||
SCRIPTS_ENV+= ECLIPSE_ARCH=${ECLIPSE_ARCH} \
|
||||
E_SHORTARCH=${E_SHORTARCH}
|
||||
PORTDESTDIR= ${PREFIX}/lib/eclipse
|
||||
|
||||
.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES}
|
||||
DISTFILES+= ${f}:2
|
||||
.endfor
|
||||
|
||||
NO_STAGE= yes
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
.if ${PORT_OPTIONS:MTESTS}
|
||||
DISTFILES+= ${ECLIPSE_TEST_SRCFILE}:1 ${ECLIPSE_TEST_SCRIPTFILE}:1
|
||||
|
||||
BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \
|
||||
Xvnc:${PORTSDIR}/net/tightvnc
|
||||
|
||||
ALL_TARGET= runTests
|
||||
# Someday it would be nice to see about moving the product selection into the patch phase (and only build the
|
||||
# product the user wants), but that may prove to be difficult if not impossible with the way the eclipse tycho
|
||||
# builder is a "all-or-nothing" thing right now.
|
||||
.if ${PORT_OPTIONS:MFULL_SDK}
|
||||
PRODUCT_TARFILE= \
|
||||
${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/org.eclipse.sdk.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz
|
||||
.endif
|
||||
.if ${PORT_OPTIONS:MPLATFORM_SDK}
|
||||
PRODUCT_TARFILE= \
|
||||
${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/target/products/org.eclipse.platform.sdk-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz
|
||||
.endif
|
||||
.if ${PORT_OPTIONS:MPLATFORM}
|
||||
PRODUCT_TARFILE= \
|
||||
${WRKSRC}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.eclipse.platform.ide-freebsd.${ECLIPSE_WS}.${ECLIPSE_ARCH}.tar.gz
|
||||
.endif
|
||||
|
||||
# Prepare Eclipse source, Ant, JUnit and Tomcat 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}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/
|
||||
.endfor
|
||||
@(${MKDIR} ${BUILD_WRKSRC}/generatedScripts && cd ${BUILD_WRKSRC}/generatedScripts && ${TAR} ${EXTRACT_BEFORE_ARGS} ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} ${EXTRACT_AFTER_ARGS})
|
||||
|
||||
@(cd ${WRKDIR} && ${TAR} ${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} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${TOMCAT_SRCFILES:Mapache-tomcat*.tar.gz} ${EXTRACT_AFTER_ARGS})
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOMCAT_SRCFILES:M*.jar} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/
|
||||
.for f in ${TOMCAT_BUNDLES}
|
||||
@${CP} ${WRKDIR}/apache-tomcat-${TOMCAT_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/
|
||||
.endfor
|
||||
|
||||
.if ${PORT_OPTIONS:MTESTS}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE} ${BUILD_WRKSRC}
|
||||
.endif
|
||||
|
||||
# Apply patches that have been pushed upstream
|
||||
pre-patch:
|
||||
@${PATCH} -d ${BUILD_WRKSRC} --forward --quiet --suffix .orig -E -p0 -i ${PATCHDIR}/eclipse-build-upstream.patch
|
||||
@${PATCH} -d ${BUILD_WRKSRC}/eclipse-build-config --forward --quiet --suffix .orig -E -p0 -i ${PATCHDIR}/eclipse-build-config-upstream.patch
|
||||
|
||||
# Fixup boot classes path
|
||||
post-patch:
|
||||
@(cd ${BUILD_WRKSRC}/generatedScripts; tar cjf ${BUILD_WRKSRC}/${ECLIPSE_GENERATED_BUILDSCRIPTS} plugins)
|
||||
@(for f in `${GREP} -hE '(\-\-\-|%%ECLIPSE_ARCH%%)' ${FILESDIR}/patch-* | ${GREP} -B1 'ECLIPSE_ARCH' | ${GREP} '^\-\-\-' | ${SED} -e 's/^\-\-\- .\///'` ; \
|
||||
do \
|
||||
${ECHO_MSG} "Updating ECLIPSE_ARCH in file $$f"; \
|
||||
${REINPLACE_CMD} -e "s|%%ECLIPSE_ARCH%%|${ECLIPSE_ARCH}|g" ${WRKSRC}/$$f; \
|
||||
done)
|
||||
|
||||
@${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
|
||||
@${REINPLACE_CMD} -e "s+%%PORTNAME%%+${PORTNAME}+g" ${BUILD_WRKSRC}/eclipse.desktop
|
||||
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyPatches)
|
||||
|
||||
.for f in ${ECLIPSE_JAR_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/jdtdependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/sdkdependencies.properties
|
||||
.endfor
|
||||
.for f in ${ECLIPSE_SAT4J_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/dependencies.properties
|
||||
.endfor
|
||||
.for f in ${ANT_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_WRKSRC}/nonosgidependencies.properties
|
||||
.endfor
|
||||
@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit.jar+" ${BUILD_WRKSRC}/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
|
||||
@${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
|
||||
@${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
|
||||
@${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
|
||||
@${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
|
||||
@${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
|
||||
|
||||
.if defined(WITH_TESTS)
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
|
||||
.endif
|
||||
do-build:
|
||||
@(cd ${WRKSRC}; ${SETENV} JAVA_HOME=${JAVA_HOME} M2_HOME=${LOCALBASE}/share/java/maven31 ${MVN_OPTS} \
|
||||
mvn ${MVN_SETTINGS} ${MVN_TEST_FLAG} ${MVN_LOCAL_REPO} clean verify -Dnative=${ECLIPSE_WS}.freebsd.${ECLIPSE_ARCH} \
|
||||
-DbuildId=${ECLIPSE_BUILDID} -Pupdate-branding-plugins)
|
||||
|
||||
do-install:
|
||||
@${RM} -rf ${PORTDESTDIR}
|
||||
@${MKDIR} ${PORTDESTDIR}
|
||||
@${MKDIR} ${PREFIX}/${DROPINS_DIR}
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
|
||||
@${FIND} ${PORTDESTDIR}/plugins -type f -perm 600 -print0 | ${XARGS} -0 ${CHMOD} 644
|
||||
@${RM} -rf ${STAGEDIR}${PORTDESTDIR}
|
||||
@( cd ${STAGEDIR}${PREFIX}/lib; ${TAR} xfz ${PRODUCT_TARFILE} )
|
||||
@${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name \*.orig -delete
|
||||
@${SED} \
|
||||
-e "s+%%BROWSER%%+${GECKO:S/19//}+g" \
|
||||
-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
|
||||
@ -257,23 +110,19 @@ do-install:
|
||||
@${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%++g" \
|
||||
${BUILD_WRKSRC}/eclipse.tmp
|
||||
.endif
|
||||
@${INSTALL_SCRIPT} ${WRKSRC}/eclipse.tmp ${PREFIX}/bin/${PORTNAME}
|
||||
@${PREFIX}/bin/${PORTNAME} -initialize -consolelog
|
||||
-@update-desktop-database
|
||||
@(cd ${PREFIX}; ${FIND} -s lib/${PORTNAME} -not -type d) >> ${TMPPLIST}
|
||||
@(cd ${PREFIX}; ${FIND} -s -d lib/${PORTNAME} -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@exec ${MKDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME}/dropins 2>/dev/null || true " >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@unexec ${RMDIR} %D/share/${PORTNAME} 2>/dev/null || true " >> ${TMPPLIST}
|
||||
@${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}
|
||||
${INSTALL_SCRIPT} ${BUILD_WRKSRC}/eclipse.tmp ${STAGEDIR}${PREFIX}/bin/eclipse
|
||||
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s lib/eclipse -not -type d) >> ${TMPPLIST}
|
||||
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s bin/eclipse -not -type d) >> ${TMPPLIST}
|
||||
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d lib/eclipse -type d) | ${SED} -ne "s,^,@dirrm ,p" >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@exec ${MKDIR} %D/lib/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins > /dev/null || ${TRUE}" >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@dirrm share/eclipse/dropins" >> ${TMPPLIST}
|
||||
@${ECHO_CMD} "@dirrm share/eclipse" >> ${TMPPLIST}
|
||||
|
||||
.if ${PORT_OPTIONS:MTESTS}
|
||||
tests: build
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} runTests)
|
||||
.else
|
||||
tests:
|
||||
@${ECHO_CMD} "Tests are not enabled!"
|
||||
.endif
|
||||
post-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins
|
||||
|
||||
.include <bsd.port.mk>
|
||||
distclean:
|
||||
${RM} -rf ${DISTDIR}/eclipse
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
NO_BUILD= yes
|
||||
USE_JAVA= yes
|
||||
JAVA_VERSION= 1.6
|
||||
JAVA_OS= native
|
||||
|
||||
REPO_DIRS?= features plugins
|
||||
|
||||
do-install:
|
||||
@${MKDIR} ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse
|
||||
@(cd ${WRKSRC}; ${COPYTREE_SHARE} "${REPO_DIRS}" ${STAGEDIR}${PREFIX}/share/eclipse/dropins/${PORTNAME}/eclipse/)
|
||||
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s share/eclipse/dropins/${PORTNAME} -not -type d) >> ${TMPPLIST}
|
||||
@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d share/eclipse/dropins/${PORTNAME} -type d) \
|
||||
| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
|
||||
@ -1,44 +1,4 @@
|
||||
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/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/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
|
||||
SIZE (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 128684
|
||||
SHA256 (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 606861c12a82c8336bfd38e9f1e80d105a9cdebd87e4fbd88bc4203f21441402
|
||||
SIZE (eclipse/org.apache.commons.httpclient_3.1.0.v201012070820.jar) = 321633
|
||||
SHA256 (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 453d6f5e9d3f1682ed0eb86110231b6182f1d6d2a95fd2c528496818a01383ac
|
||||
SIZE (eclipse/org.apache.commons.logging_1.0.4.v201101211617.jar) = 45405
|
||||
SHA256 (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 87215c54c69432935278f72fe5594500cc076630018dee21646131b4d678bd51
|
||||
SIZE (eclipse/org.apache.lucene.core_2.9.1.v201101211721.jar) = 1168475
|
||||
SHA256 (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = cc5dde23abac55f232543732ab2f97131c058295e4e33e60872234cef73c405a
|
||||
SIZE (eclipse/org.apache.lucene.analysis_2.9.1.v201101211721.jar) = 216089
|
||||
SHA256 (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 3990293a31c98e079be5c24410fcaefb06f2770547879b27796651f8df092a0e
|
||||
SIZE (eclipse/org.hamcrest.core_1.1.0.v20090501071000.jar) = 27827
|
||||
SHA256 (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = b41cf1845a7b05dbdcc57a4631367f4ba94fea2a2a7145797167533cb73edbdd
|
||||
SIZE (eclipse/org.mortbay.jetty.util_6.1.23.v201012071420.jar) = 193298
|
||||
SHA256 (eclipse/org.mortbay.jetty.server_6.1.23.v201012071420.jar) = 88fcf37ef94f63d920a1ca438cf17a79f19900da95ba27c6374440d9388ecaeb
|
||||
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.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/eclipse-sdktests-3.7.1-src.tar.bz2) = 584a95a956c92bcf812563404da1e232a6cbd50cbe9757ab471b0d95f283a20f
|
||||
SIZE (eclipse/eclipse-sdktests-3.7.1-src.tar.bz2) = 123690224
|
||||
SHA256 (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 2453b2f8e12c7cd90f15dc34519e785befb69ef014e07cd2b180f8a4d7b557cd
|
||||
SIZE (eclipse/eclipse.platform.releng.aggregator-4.3.2.xz) = 196545676
|
||||
SHA256 (eclipse/eclipse-maven-repo-4.3.2.xz) = f5288a26d9bdb22f5a455bba52f73589918c9bcff65bb667ae6d246467a61ca8
|
||||
SIZE (eclipse/eclipse-maven-repo-4.3.2.xz) = 185972692
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
### Eclipse Workspace Patch 1.0
|
||||
#P eclipse-build-config
|
||||
Index: build.properties.in
|
||||
===================================================================
|
||||
--- build.properties.in (revision 23752)
|
||||
+++ build.properties.in (working copy)
|
||||
@@ -34,7 +34,7 @@
|
||||
collPlace=eclipse
|
||||
collBase=.
|
||||
configs=\
|
||||
- linux, gtk, @build_arch@
|
||||
+ @build_os@, gtk, @build_arch@
|
||||
|
||||
archivesFormat =group,group,group-zip
|
||||
javacFailOnError=false
|
||||
Index: productFiles/rcpConfig/build.properties
|
||||
===================================================================
|
||||
--- productFiles/rcpConfig/build.properties (revision 23752)
|
||||
+++ productFiles/rcpConfig/build.properties (working copy)
|
||||
@@ -65,8 +65,8 @@
|
||||
root.macosx.cocoa.x86_64.folder.Eclipse.app/Contents=absolute:file:${buildDirectory}/features/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/Info.plist
|
||||
root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt
|
||||
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
+root.freebsd.gtk.x86=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86
|
||||
+root.freebsd.gtk.x86.permissions.755=*.so*
|
||||
+root.freebsd.gtk.x86_64=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86_64,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64
|
||||
+root.freebsd.gtk.x86_64.permissions.755=*.so*
|
||||
|
||||
Index: customTargets.xml
|
||||
===================================================================
|
||||
--- customTargets.xml (revision 23752)
|
||||
+++ customTargets.xml (working copy)
|
||||
@@ -129,6 +129,24 @@
|
||||
<copy todir="${linux.gtk.ppc64.rootfiles}">
|
||||
<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.ppc64" includes="about_files/**" />
|
||||
</copy>
|
||||
+
|
||||
+ <!--copy freebsd gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
|
||||
+ <property name="freebsd.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86" />
|
||||
+ <mkdir dir="${freebsd.gtk.x86.rootfiles}" />
|
||||
+ <copy tofile="${freebsd.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86/about.html" />
|
||||
+
|
||||
+ <copy todir="${freebsd.gtk.x86.rootfiles}">
|
||||
+ <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86" includes="about_files/**" />
|
||||
+ </copy>
|
||||
+
|
||||
+ <!--copy freebsd gtk x86_64 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
|
||||
+ <property name="freebsd.gtk.x86_64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/freebsd.gtk.x86_64" />
|
||||
+ <mkdir dir="${freebsd.gtk.x86_64.rootfiles}" />
|
||||
+ <copy tofile="${freebsd.gtk.x86_64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86_64/about.html" />
|
||||
+
|
||||
+ <copy todir="${freebsd.gtk.x86_64.rootfiles}">
|
||||
+ <fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.freebsd.x86_64" includes="about_files/**" />
|
||||
+ </copy>
|
||||
</target>
|
||||
|
||||
<!-- ===================================================================== -->
|
||||
@@ -201,7 +219,7 @@
|
||||
<!-- ===================================================================== -->
|
||||
<target name="postPackage">
|
||||
<exec executable="zip" dir="${buildDirectory}/${buildLabel}">
|
||||
- <arg line="-d ${archiveName} win32** wce** linux** solaris** aix** hpux** macosx** qnx**" />
|
||||
+ <arg line="-d ${archiveName} win32** wce** linux** solaris** aix** hpux** macosx** qnx** freebsd**" />
|
||||
</exec>
|
||||
<exec dir="${buildDirectory}/buildRepo" executable="zip">
|
||||
<arg line="-r ${archiveFullPath} ." />
|
||||
@ -1,357 +0,0 @@
|
||||
### Eclipse Workspace Patch 1.0
|
||||
#P eclipse-build
|
||||
Index: generatebuild.xml
|
||||
===================================================================
|
||||
--- generatebuild.xml (revision 23733)
|
||||
+++ generatebuild.xml (working copy)
|
||||
@@ -5,7 +5,7 @@
|
||||
<target name="genBuild">
|
||||
<echo message="About to generate source bundles and build.xml files" />
|
||||
<eclipse.buildScript elements="feature@${featureToBuild}"
|
||||
- configInfo="linux,gtk,${buildArch}"
|
||||
+ configInfo="${buildOs},gtk,${buildArch}"
|
||||
buildingosgi="true"
|
||||
recursivegeneration="true"
|
||||
builddirectory="${buildDirectory}"
|
||||
Index: build.xml
|
||||
===================================================================
|
||||
--- build.xml (revision 23733)
|
||||
+++ build.xml (working copy)
|
||||
@@ -131,7 +131,8 @@
|
||||
<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="../../" />
|
||||
</ant>
|
||||
</target>
|
||||
|
||||
@@ -312,7 +313,10 @@
|
||||
<!-- end eclipse-build-only patches -->
|
||||
<!-- 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}" />
|
||||
+ <replace file="${buildConfigs}/eclipse-build-config/build.properties">
|
||||
+ <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 @@
|
||||
<!--
|
||||
<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
|
||||
<property name="arch" value="${buildArch}"/>
|
||||
+ <property os="os" value="${buildOs}"/>
|
||||
<property name="builder" value="${buildConfig}" />
|
||||
</ant>
|
||||
-->
|
||||
@@ -462,9 +467,9 @@
|
||||
|
||||
<target name="compile.libgnomeproxy" if="build.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}/" />
|
||||
- <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
|
||||
+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}" executable="make" failonerror="true" />
|
||||
+ <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.${buildOs}.${buildArch}/" />
|
||||
+ <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.${buildOs}.${buildArch}/" />
|
||||
</target>
|
||||
|
||||
<target name="compilelibs" unless="compilelibs.complete">
|
||||
@@ -476,16 +481,16 @@
|
||||
<include name="**/*.so" />
|
||||
</fileset>
|
||||
</delete>
|
||||
- <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
|
||||
+ <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.${buildOs}.${buildArch}" />
|
||||
|
||||
<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
|
||||
<exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true">
|
||||
<arg line="build.sh" />
|
||||
</exec>
|
||||
|
||||
- <property name="launcherfragment" value="org.eclipse.equinox.launcher.gtk.linux.${buildArch}" />
|
||||
+ <property name="launcherfragment" value="org.eclipse.equinox.launcher.gtk.${buildOs}.${buildArch}" />
|
||||
|
||||
- <copy file="${launcherlibs}/library/gtk/eclipse" todir="${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/${buildArch}/" />
|
||||
+ <copy file="${launcherlibs}/library/gtk/eclipse" todir="${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/${buildOs}/${buildArch}/" />
|
||||
<copy todir="${buildDirectory}/plugins/${launcherfragment}">
|
||||
<fileset dir="${launcherlibs}/library/gtk">
|
||||
<include name="**/*.so" />
|
||||
@@ -493,13 +498,13 @@
|
||||
</copy>
|
||||
|
||||
<!-- build liblocalfile -->
|
||||
- <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
|
||||
- <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
|
||||
+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}" executable="make" failonerror="true" />
|
||||
+ <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}">
|
||||
</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 @@
|
||||
<arg line="-application org.eclipse.ant.core.antRunner " />
|
||||
<arg line="-buildfile buildConfiguration.xml" />
|
||||
<arg line="-propertyfile ${basedir}/build.properties " />
|
||||
- <arg line="-Dconfigs=linux,gtk,${buildArch} " />
|
||||
+ <arg line="-Dconfigs=${buildOs},gtk,${buildArch} " />
|
||||
<arg line="-Dreposource=${reposource} " />
|
||||
<arg line="-Dbasedir=${productFiles}/rcpConfig" />
|
||||
<arg line="-DbuildId=${buildId} " />
|
||||
@@ -631,6 +636,7 @@
|
||||
<arg line="-buildfile publishProduct.xml" />
|
||||
<arg line="-propertyfile ${basedir}/build.properties " />
|
||||
<arg line="-DbuildArch=${buildArch} " />
|
||||
+ <arg line="-DbuildOs=${buildOs} " />
|
||||
<arg line="-Dreposource=${reposource} " />
|
||||
<arg line="-DbuildConfig=${buildConfig} " />
|
||||
<arg line="-DproductFile=${productFile} " />
|
||||
@@ -721,7 +727,7 @@
|
||||
<param name="p2.director.profile" value="${profileName}" />
|
||||
<param name="p2.director.install.path" value="${provisionDir}" />
|
||||
<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
|
||||
- <param name="p2.os" value="linux" />
|
||||
+ <param name="p2.os" value="${buildOs}" />
|
||||
<param name="p2.ws" value="gtk" />
|
||||
<param name="p2.arch" value="${buildArch}" />
|
||||
<param name="p2.repo" value="${reposource}" />
|
||||
@@ -750,7 +753,7 @@
|
||||
<param name="p2.director.profile" value="${profileName}" />
|
||||
<param name="p2.director.install.path" value="${provisionDir}" />
|
||||
<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
|
||||
- <param name="p2.os" value="linux" />
|
||||
+ <param name="p2.os" value="${buildOs}" />
|
||||
<param name="p2.ws" value="gtk" />
|
||||
<param name="p2.arch" value="${buildArch}" />
|
||||
<param name="p2.repo" value="${reposource}" />
|
||||
@@ -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}" />
|
||||
<!-- 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" />
|
||||
- <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}" />
|
||||
Index: pdebuild.xml
|
||||
===================================================================
|
||||
--- pdebuild.xml (revision 23733)
|
||||
+++ pdebuild.xml (working copy)
|
||||
@@ -88,7 +88,7 @@
|
||||
<filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
|
||||
|
||||
<property name="depsDirs2Property"
|
||||
- value="org.eclipse.swt.gtk.linux.${buildArch}
|
||||
+ value="org.eclipse.swt.gtk.${buildOs}.${buildArch}
|
||||
org.eclipse.core.filesystem
|
||||
org.eclipse.core.resources
|
||||
org.eclipse.core.commands
|
||||
@@ -214,12 +214,14 @@
|
||||
<subant>
|
||||
<property name="buildId" value="${buildId}" />
|
||||
<property name="buildArch" value="${buildArch}" />
|
||||
+ <property name="buildOs" value="${buildOs}" />
|
||||
<property file="pdebuild.properties" />
|
||||
<filelist refid="depsDirs" />
|
||||
</subant>
|
||||
<subant>
|
||||
<property name="buildId" value="${buildId}" />
|
||||
<property name="buildArch" value="${buildArch}" />
|
||||
+ <property name="buildOs" value="${buildOs}" />
|
||||
<property file="pdebuild.properties" />
|
||||
<filelist refid="helpDirs" />
|
||||
</subant>
|
||||
@@ -245,6 +247,7 @@
|
||||
<arg line="-application org.eclipse.ant.core.antRunner " />
|
||||
<arg line="-buildfile ../pdebuild.xml generateScripts2" />
|
||||
<arg line="-DbuildArch=${buildArch} " />
|
||||
+ <arg line="-DbuildOs=${buildOs} " />
|
||||
<arg line="-DbuildId=${buildId} " />
|
||||
<arg line="-debug -consolelog" />
|
||||
</java>
|
||||
@@ -287,10 +288,10 @@
|
||||
<target name="removeGeneratedBuildXMLs" depends="zipPlugins2">
|
||||
<fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins"
|
||||
excludes="**/org.eclipse.swt.gtk.*/*,
|
||||
- **/org.eclipse.update.core.linux/**/*,
|
||||
+ **/org.eclipse.update.core.${buildOs}/**/*,
|
||||
**/org.eclipse.pde.build/scripts/*,
|
||||
**/org.eclipse.jdt.core/scripts/*,
|
||||
- **/org.eclipse.update.core.linux/src/*,
|
||||
+ **/org.eclipse.update.core.${buildOs}/src/*,
|
||||
**/org.eclipse.jdt.doc.isv/*,
|
||||
**/org.eclipse.swt/*,
|
||||
**/org.eclipse.jdt.doc.user/*"
|
||||
Index: publishProduct.xml
|
||||
===================================================================
|
||||
--- publishProduct.xml (revision 23733)
|
||||
+++ publishProduct.xml (working copy)
|
||||
@@ -1,7 +1,7 @@
|
||||
<project name="Eclipse SDK build" default="publish" basedir=".">
|
||||
<target name="publish">
|
||||
<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFile}" compress="true">
|
||||
- <config os="linux" ws="gtk" arch="${buildArch}" />
|
||||
+ <config os="${buildOs}" ws="gtk" arch="${buildArch}" />
|
||||
<advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
|
||||
<advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" />
|
||||
</p2.publish.product>
|
||||
Index: runtests.sh
|
||||
===================================================================
|
||||
--- runtests.sh (revision 23733)
|
||||
+++ runtests.sh (working copy)
|
||||
@@ -16,6 +16,8 @@
|
||||
-b Tests build directory
|
||||
-p Clean installation directory to copy for running test suites
|
||||
-t Timestamp string with which to tag the results
|
||||
+ -a Architecture to run the tests on
|
||||
+ -o OS to run the tests on
|
||||
-v Make test runs output to the console
|
||||
_EOF_
|
||||
}
|
||||
@@ -83,6 +85,8 @@
|
||||
headless=1
|
||||
fi
|
||||
|
||||
+ buildOs=linux
|
||||
+
|
||||
label=$(grep label build.properties | sed s/label=//)
|
||||
testframework=$(grep ^testframework build.properties | sed s/testframework=//)
|
||||
|
||||
@@ -142,21 +146,16 @@
|
||||
if [ ${headless} == 1 ]; then
|
||||
# Try to find Xvnc
|
||||
xvnc=
|
||||
- if [ -a /usr/bin/Xvnc ]
|
||||
- then
|
||||
- xvnc=/usr/bin/Xvnc
|
||||
- setupXvnc
|
||||
- else
|
||||
- if [ -a /usr/X11/bin/Xvnc ]
|
||||
- then
|
||||
- xvnc=/usr/X11/bin/Xvnc
|
||||
+ for _xvnc in /usr/bin/Xvnc /usr/X11/bin/Xvnc /usr/local/bin/Xvnc; do
|
||||
+ if [ -a $_xvnc ]; then
|
||||
+ xvnc=$_xvnc
|
||||
setupXvnc
|
||||
- else
|
||||
- echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
|
||||
- DISPLAY=`$HOST`:0.0
|
||||
+ break
|
||||
fi
|
||||
+ done
|
||||
+ if [ "x$xvnc" = "x" ]; then
|
||||
+ echo "Couldn't find Xvnc. Using default DISPLAY from environment"
|
||||
fi
|
||||
- export DISPLAY
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -165,9 +164,11 @@
|
||||
port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
|
||||
echo localhost > Xvnc.cfg
|
||||
echo "Setting up Xvnc on port ${port} with password VNCpassword1"
|
||||
- $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
|
||||
+ $xvnc :$port -geometry 1024x768 -depth 24 -auth Xvnc.cfg -localhost -rfbauth eclipse-tests-vncpwd &> Xvnc.log &
|
||||
Xvncpid=$!
|
||||
- DISPLAY=`$HOST`:$port
|
||||
+ DISPLAY=$HOST:$port
|
||||
+ export DISPLAY
|
||||
+
|
||||
}
|
||||
|
||||
function setArch() {
|
||||
@@ -186,13 +187,15 @@
|
||||
arch=ia64 ;;
|
||||
ppc)
|
||||
arch=ppc ;;
|
||||
- x86_64)
|
||||
+ x86_64|amd64)
|
||||
arch=x86_64 ;;
|
||||
*)
|
||||
echo "Unrecognized architecture: $arch" 1>&2
|
||||
exit 1 ;;
|
||||
esac
|
||||
echo >&2 "Architecture not specified. Assuming host architecture: $arch"
|
||||
+ else
|
||||
+ arch=$buildArch
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -206,7 +209,7 @@
|
||||
-application org.eclipse.ant.core.antRunner \
|
||||
-file $testDriver \
|
||||
-Declipse-home=${eclipseHome} \
|
||||
- -Dos=linux \
|
||||
+ -Dos=${buildOs} \
|
||||
-Dws=gtk \
|
||||
-Darch=${arch} \
|
||||
-Dlibrary-file=$libraryXml \
|
||||
@@ -214,7 +217,7 @@
|
||||
-logger org.apache.tools.ant.DefaultLogger \
|
||||
-vmargs \
|
||||
-Duser.home=${homedir} \
|
||||
- -Dosgi.os=linux \
|
||||
+ -Dosgi.os=${buildOs} \
|
||||
-Dosgi.ws=gtk \
|
||||
-Dosgi.arch=${arch}
|
||||
else
|
||||
@@ -348,7 +351,7 @@
|
||||
}
|
||||
|
||||
# Command-line arguments
|
||||
-while getopts "vde:gb:p:t:h" OPTION
|
||||
+while getopts "vde:gb:p:t:a:o:h" OPTION
|
||||
do
|
||||
case $OPTION in
|
||||
d)
|
||||
@@ -366,6 +369,12 @@
|
||||
p)
|
||||
provisionDir=$OPTARG
|
||||
;;
|
||||
+ a)
|
||||
+ buildArch=$OPTARG
|
||||
+ ;;
|
||||
+ o)
|
||||
+ buildOs=$OPTARG
|
||||
+ ;;
|
||||
h)
|
||||
usage
|
||||
exit 1
|
||||
--- task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java~ Thu Feb 25 21:14:10 2010
|
||||
+++ task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java Fri Nov 5 11:39:46 2010
|
||||
@@ -36,8 +36,8 @@
|
||||
for (Iterator<Object> jarIter = jarLocations.iterator(); jarIter.hasNext();) {
|
||||
|
||||
String origLocation = (String) jarIter.next();
|
||||
|
||||
- String systemLocations = (String) dependencies.get(origLocation);
|
||||
+ String systemLocations = getProject().replaceProperties((String) dependencies.get(origLocation));
|
||||
String[] systemLocationList = systemLocations.split(":");
|
||||
String attemptedLocations = "";
|
||||
for (int j = 0; j < systemLocationList.length; j++) {
|
||||
File diff suppressed because it is too large
Load Diff
385
java/eclipse/files/patch-aggregator
Normal file
385
java/eclipse/files/patch-aggregator
Normal file
@ -0,0 +1,385 @@
|
||||
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
|
||||
index ce98be7..fa2d1e1 100644
|
||||
--- a/eclipse-platform-parent/pom.xml
|
||||
+++ b/eclipse-platform-parent/pom.xml
|
||||
@@ -155,6 +155,12 @@
|
||||
</target>
|
||||
<environments>
|
||||
<environment>
|
||||
+ <os>freebsd</os>
|
||||
+ <ws>gtk</ws>
|
||||
+ <arch>%%ECLIPSE_ARCH%%</arch>
|
||||
+ </environment>
|
||||
+<!--
|
||||
+ <environment>
|
||||
<os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
@@ -229,6 +235,7 @@
|
||||
<ws>gtk</ws>
|
||||
<arch>ppc64</arch>
|
||||
</environment>
|
||||
+-->
|
||||
</environments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
@@ -308,11 +315,11 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
<dependencies>
|
||||
- <dependency>
|
||||
+ <!--dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
- </dependency>
|
||||
+ </dependency-->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
@@ -322,14 +329,14 @@
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>'v'yyyyMMdd-HHmm</format>
|
||||
- <timestampProvider>jgit</timestampProvider>
|
||||
+ <!--timestampProvider>jgit</timestampProvider-->
|
||||
<jgit.ignore>
|
||||
pom.xml
|
||||
</jgit.ignore>
|
||||
<jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree}</jgit.dirtyWorkingTree>
|
||||
- <sourceReferences>
|
||||
+ <!--sourceReferences>
|
||||
<generate>true</generate>
|
||||
- </sourceReferences>
|
||||
+ </sourceReferences-->
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
|
||||
index 81a82e1..dc2fdd9 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
|
||||
@@ -121,6 +121,12 @@
|
||||
<resolver>p2</resolver>
|
||||
<environments>
|
||||
<environment>
|
||||
+ <os>freebsd</os>
|
||||
+ <ws>gtk</ws>
|
||||
+ <arch>%%ECLIPSE_ARCH%%</arch>
|
||||
+ </environment>
|
||||
+<!--
|
||||
+ <environment>
|
||||
<os>linux</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
@@ -145,6 +156,7 @@
|
||||
<ws>cocoa</ws>
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
+-->
|
||||
</environments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
|
||||
index 60e4299..4c9106e 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
|
||||
@@ -112,6 +112,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
|
||||
index 14b8336..0b97442 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
|
||||
@@ -15,6 +15,8 @@
|
||||
<property name="archiveRoot" value="launchers" />
|
||||
<buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" />
|
||||
<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
|
||||
+ <buildRepos os="freebsd" ws="gtk" arch="x86" archiveName="${archiveRoot}-freebsd.gtk.x86.${buildId}.tar.gz" />
|
||||
+ <buildRepos os="freebsd" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-freebsd.gtk.x86_64.${buildId}.tar.gz" />
|
||||
<buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
|
||||
<buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
|
||||
<buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" />
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
|
||||
index 129d0a6..a8f76b6 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
|
||||
@@ -278,6 +278,16 @@
|
||||
fileName="launchers-win32.win32.x86_64.${BUILD_ID}.zip" />
|
||||
<platform
|
||||
format="equinox"
|
||||
+ id="SFG2"
|
||||
+ name="FreeBSD (x86/GTK 2)"
|
||||
+ fileName="launchers-freebsd.gtk.x86.${BUILD_ID}.tar.gz" />
|
||||
+ <platform
|
||||
+ format="equinox"
|
||||
+ id="SFG264"
|
||||
+ name="FreeBSD (x86_64/GTK 2)"
|
||||
+ fileName="launchers-freebsd.gtk.x86_64.${BUILD_ID}.tar.gz" />
|
||||
+ <platform
|
||||
+ format="equinox"
|
||||
id="SLG2"
|
||||
name="Linux (x86/GTK 2)"
|
||||
fileName="launchers-linux.gtk.x86.${BUILD_ID}.tar.gz" />
|
||||
@@ -346,6 +356,16 @@
|
||||
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip" />
|
||||
<platform
|
||||
format="equinox"
|
||||
+ id="ESFG2"
|
||||
+ name="FreeBSD (x86/GTK 2)"
|
||||
+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86.tar.gz" />
|
||||
+ <platform
|
||||
+ format="equinox"
|
||||
+ id="ESFG264"
|
||||
+ name="FreeBSD (x86_64/GTK 2)"
|
||||
+ fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-freebsd-gtk-x86_64.tar.gz" />
|
||||
+ <platform
|
||||
+ format="equinox"
|
||||
id="ESLG2"
|
||||
name="Linux (x86/GTK 2)"
|
||||
fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz" />
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
|
||||
index 80a32e4..fcb7ed5 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
|
||||
@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse
|
||||
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
|
||||
root.solaris.gtk.x86.permissions.755=eclipse
|
||||
|
||||
+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86
|
||||
+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64
|
||||
+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse
|
||||
+
|
||||
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
|
||||
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
|
||||
@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
|
||||
root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
|
||||
|
||||
bin.includes = feature.properties
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
|
||||
index 2c342a3..5e27062 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/pom.xml
|
||||
@@ -20,6 +20,25 @@
|
||||
<version>2.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
+ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id>
|
||||
+ <phase>validate</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-resources</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory>
|
||||
+ <resources>
|
||||
+ <resource>
|
||||
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory>
|
||||
+ <includes>
|
||||
+ <include>about_files/*</include>
|
||||
+ <include>about.html</include>
|
||||
+ </includes>
|
||||
+ </resource>
|
||||
+ </resources>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
+ <execution>
|
||||
<id>copy-resources-gtk.linux.x86</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
|
||||
index bc261f9..88e8522 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
|
||||
@@ -91,6 +91,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
|
||||
index c2f679b..742fe0b 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
|
||||
@@ -55,6 +55,23 @@ 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.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
|
||||
+requires.4.range=[1.0.0,1.0.0]
|
||||
+requires.4.greedy=true
|
||||
+
|
||||
+units.4.id=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+units.4.version=1.0.0
|
||||
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
|
||||
+units.4.provides.1.name=toolingorg.eclipse.platform.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+units.4.provides.1.version=1.0.0
|
||||
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (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);
|
||||
+
|
||||
# Restrict range so we are not an automatic update for 3.x.
|
||||
update.id = org.eclipse.platform.ide
|
||||
update.range = [4.0,$version$)
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
|
||||
index d8468e6..b6c77d5 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
|
||||
@@ -92,6 +92,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
index 80a32e4..fcb7ed5 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
@@ -27,6 +27,11 @@ root.solaris.gtk.sparc.permissions.755=eclipse
|
||||
root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
|
||||
root.solaris.gtk.x86.permissions.755=eclipse
|
||||
|
||||
+root.freebsd.gtk.x86=rootfiles/freebsd.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86
|
||||
+root.freebsd.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
+root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64
|
||||
+root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so,eclipse
|
||||
+
|
||||
root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
|
||||
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
|
||||
root.linux.gtk.ppc=rootfiles/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
|
||||
@@ -69,10 +74,3 @@ root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
|
||||
root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
|
||||
|
||||
bin.includes = feature.properties
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
-
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
index bb03da8..75632a0 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
|
||||
@@ -20,6 +20,25 @@
|
||||
<version>2.6</version>
|
||||
<executions>
|
||||
<execution>
|
||||
+ <id>copy-resources-gtk.freebsd.%%ECLIPSE_ARCH%%</id>
|
||||
+ <phase>validate</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy-resources</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <outputDirectory>${basedir}/rootfiles/freebsd.gtk.%%ECLIPSE_ARCH%%</outputDirectory>
|
||||
+ <resources>
|
||||
+ <resource>
|
||||
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.%%ECLIPSE_ARCH%%</directory>
|
||||
+ <includes>
|
||||
+ <include>about_files/*</include>
|
||||
+ <include>about.html</include>
|
||||
+ </includes>
|
||||
+ </resource>
|
||||
+ </resources>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
+ <execution>
|
||||
<id>copy-resources-gtk.linux.x86</id>
|
||||
<phase>validate</phase>
|
||||
<goals>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
|
||||
index 0ea4fd3..5bd93db 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/pom.xml
|
||||
@@ -91,6 +91,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
|
||||
index ce76451..3b40705 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/pom.xml
|
||||
@@ -91,6 +91,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
|
||||
index bf2f66a..5a37141 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/pom.xml
|
||||
@@ -91,6 +91,7 @@
|
||||
<configuration>
|
||||
<formats>
|
||||
<win32>zip</win32>
|
||||
+ <freebsd>tar.gz</freebsd>
|
||||
<linux>tar.gz</linux>
|
||||
<macosx>tar.gz</macosx>
|
||||
</formats>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
|
||||
index 6b59ed2..64975ba 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
|
||||
@@ -89,6 +89,23 @@ units.5.touchpoint.version=1.0.0
|
||||
units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
||||
|
||||
+requires.6.namespace=org.eclipse.equinox.p2.iu
|
||||
+requires.6.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+requires.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
|
||||
+requires.6.range=[1.0.0,1.0.0]
|
||||
+requires.6.greedy=true
|
||||
+
|
||||
+units.6.id=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+units.6.version=1.0.0
|
||||
+units.6.provides.1.namespace=org.eclipse.equinox.p2.iu
|
||||
+units.6.provides.1.name=toolingorg.eclipse.sdk.configuration.gtk.freebsd.%%ECLIPSE_ARCH%%
|
||||
+units.6.provides.1.version=1.0.0
|
||||
+units.6.filter=(&(osgi.os=freebsd) (osgi.arch=%%ECLIPSE_ARCH%%) (osgi.ws=gtk))
|
||||
+units.6.touchpoint.id=org.eclipse.equinox.p2.osgi
|
||||
+units.6.touchpoint.version=1.0.0
|
||||
+units.6.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
+units.6.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
||||
+
|
||||
# Restrict range so we are not an automatic update for 3.x.
|
||||
update.id= org.eclipse.sdk.ide
|
||||
update.range = [4.0,$version$)
|
||||
--- a/pom.xml.orig 2014-06-05 16:00:15.000000000 -0500
|
||||
+++ a/pom.xml 2014-06-19 18:03:47.000000000 -0500
|
||||
@@ -50,6 +50,6 @@
|
||||
|
||||
<module>eclipse.platform.releng</module>
|
||||
<module>eclipse.platform.releng.tychoeclipsebuilder</module>
|
||||
- <module>eclipse.platform.repository</module>
|
||||
+<!-- <module>eclipse.platform.repository</module> -->
|
||||
</modules>
|
||||
</project>
|
||||
@ -1,90 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- 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
|
||||
--- 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 @@
|
||||
ns.el.parser;version="1.0.0"
|
||||
Bundle-Version: 1.0.0.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)"
|
||||
+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]"
|
||||
|
||||
Name: org/apache/commons/el/ImplicitObjects$6.class
|
||||
SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
|
||||
@ -1,419 +0,0 @@
|
||||
$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 @@
|
||||
collectingFolder=eclipse
|
||||
archivePrefix=eclipse
|
||||
generateFeatureVersionSuffix=true
|
||||
-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
|
||||
JavaSE-1.6=${bootclasspath}
|
||||
CDC-1.0/Foundation-1.0=${bootclasspath}
|
||||
@@ -49,21 +49,21 @@
|
||||
CDC-1.1/PersonalBasis-1.1=${bootclasspath}
|
||||
CDC-1.1/PersonalJava-1.1=${bootclasspath}
|
||||
# Somehow bootclasspath isn't expanded when used by antRunner
|
||||
-JavaSE-1.6=/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
|
||||
-CDC-1.0/Foundation-1.0=/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
|
||||
-CDC-1.1/Foundation-1.1=/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
|
||||
-OSGi/Minimum-1.0=/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
|
||||
-OSGi/Minimum-1.1=/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
|
||||
-OSGi/Minimum-1.2=/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
|
||||
-JRE-1.1=/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
|
||||
-J2SE-1.2=/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
|
||||
-J2SE-1.3=/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
|
||||
-J2SE-1.4=/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
|
||||
-J2SE-1.5=/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
|
||||
-JavaSE-1.6=/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
|
||||
-PersonalJava-1.1=/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
|
||||
-PersonalJava-1.2=/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
|
||||
-CDC-1.0/PersonalBasis-1.0=/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
|
||||
-CDC-1.0/PersonalJava-1.0=/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
|
||||
-CDC-1.1/PersonalBasis-1.1=/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
|
||||
-CDC-1.1/PersonalJava-1.1=/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
|
||||
+JavaSE-1.6=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.0=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.1=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.2=%%BOOTCLASSPATH%%
|
||||
+JRE-1.1=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.2=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.3=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.4=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.5=%%BOOTCLASSPATH%%
|
||||
+JavaSE-1.6=%%BOOTCLASSPATH%%
|
||||
+PersonalJava-1.1=%%BOOTCLASSPATH%%
|
||||
+PersonalJava-1.2=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/PersonalBasis-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/PersonalJava-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.1/PersonalBasis-1.1=%%BOOTCLASSPATH%%
|
||||
+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 @@
|
||||
|
||||
<target name="setLibDir" depends="setLib64Dir">
|
||||
<property name="libDir" value="lib" />
|
||||
- <property name="installationDir" value="${destDir}${prefix}/${libDir}/eclipse" />
|
||||
+ <property name="installationDir" value="${destDir}${prefix}/${libDir}/%%PORTNAME%%" />
|
||||
</target>
|
||||
|
||||
<target name="getInstallationDir" depends="setLibDir">
|
||||
- <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}" />
|
||||
+ <echo message="Installation directory will be ${destDir}/${prefix}/${libDir}/%%PORTNAME%%" />
|
||||
</target>
|
||||
|
||||
<property name="doTests" value="true" />
|
||||
@@ -167,8 +167,7 @@
|
||||
<target name="copySource" unless="sdkSourcePresent">
|
||||
<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="eclipse" />
|
||||
<arg value="${buildDirectory}" />
|
||||
</exec>
|
||||
@@ -309,12 +308,18 @@
|
||||
<!--
|
||||
<patch patchfile="${basedir}/patches/eclipse-swt-buildagainstxulrunner.patch" dir="${buildDirectory}" strip="1" />
|
||||
-->
|
||||
- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
|
||||
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
|
||||
+ <arg value="-p1" />
|
||||
+ <arg value="-i${basedir}/patches/eclipse-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/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
|
||||
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.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" />
|
||||
<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/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>
|
||||
|
||||
@@ -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 @@
|
||||
<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>
|
||||
|
||||
<!-- 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"/>
|
||||
- <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/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" />
|
||||
<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"/>
|
||||
<!--shared dropins folder for architecture-independent plugins-->
|
||||
- <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
|
||||
+ <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" />
|
||||
<!-- eclipse binary -->
|
||||
<mkdir dir="${destDir}${prefix}/bin" />
|
||||
- <symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
|
||||
+ <symlink link="${destDir}${prefix}/bin/%%PORTNAME%%" resource="../${libDir}/%%PORTNAME%%/eclipse" overwrite="true"/>
|
||||
<!-- 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 @@
|
||||
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
|
||||
- <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
|
||||
+ <echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/%%PORTNAME%%/dropins" />
|
||||
|
||||
<!-- Extract SWT JNI .so files -->
|
||||
<java classname="org.eclipse.core.launcher.Main" fork="true" failonerror="true" dir="${destDir}">
|
||||
@@ -1039,7 +1041,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 @@
|
||||
<arg value="s@/@_@g" />
|
||||
</exec>
|
||||
<apply executable="sed" failonerror="true" verbose="true">
|
||||
- <arg value="-i" />
|
||||
- <arg value="\@${destDir}@d;\@${destDirWithUnderscores}@d;\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" />
|
||||
+ <arg value="-i.bak" />
|
||||
+ <arg value="\@${reposourceWithUnderscores}@d;\@${provisionDirWithUnderscores}@d" />
|
||||
<srcfile />
|
||||
<fileset dir="${installationDir}">
|
||||
<include name="metadata/content.xml" />
|
||||
@@ -1094,7 +1096,7 @@
|
||||
</fileset>
|
||||
</apply>
|
||||
<apply executable="sed" failonerror="true" verbose="true">
|
||||
- <arg value="-i" />
|
||||
+ <arg value="-i.bak" />
|
||||
<arg value="s@${provisionDir}@${installationDir}@g;s@${installationDir}@${prefix}/${libDir}/eclipse@g" />
|
||||
<srcfile />
|
||||
<fileset dir="${installationDir}/${profileDir}">
|
||||
@@ -1109,9 +1111,11 @@
|
||||
</apply>
|
||||
|
||||
<!-- Move config file to /etc -->
|
||||
+ <!--
|
||||
<mkdir dir="${destDir}/etc" />
|
||||
<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
|
||||
<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" overwrite="true"/>
|
||||
+ -->
|
||||
|
||||
</target>
|
||||
|
||||
@@ -1156,8 +1164,7 @@
|
||||
|
||||
<!-- make a copy of the clean platform+CVS installation -->
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="${provisionDir}" />
|
||||
<arg value="${platformAndCVSInstallation}" />
|
||||
</exec>
|
||||
@@ -1173,16 +1180,14 @@
|
||||
tofile="${jdtInstallation}"/>
|
||||
<!-- make a second copy of the clean JDT installation -->
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="${jdtInstallation}" />
|
||||
<arg value="${jdtInstallation}.orig" />
|
||||
</exec>
|
||||
|
||||
<!-- restore clean platform+CVS installation -->
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="${platformAndCVSInstallation}" />
|
||||
<arg value="${provisionDir}" />
|
||||
</exec>
|
||||
@@ -1199,8 +1204,7 @@
|
||||
|
||||
<!-- restore clean platform+CVS installation -->
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="${platformAndCVSInstallation}" />
|
||||
<arg value="${provisionDir}" />
|
||||
</exec>
|
||||
--- eclipse-build-0.5.0.orig/pdebuild/eclipse-pdebuild.sh 2009-11-11 07:59:07.000000000 -0500
|
||||
+++ eclipse-build-0.5.0/pdebuild/eclipse-pdebuild.sh 2009-12-23 16:23:06.357147407 -0500
|
||||
@@ -230,7 +230,7 @@
|
||||
fi
|
||||
|
||||
if [ "x$orbitDepsDir" != "x" ]; then
|
||||
- orbitDeps="-DorbitDepsDir=$orbitDepsDir"
|
||||
+ orbitDeps="-DorbitDepsDir=\"$orbitDepsDir\""
|
||||
fi
|
||||
|
||||
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 @@
|
||||
buildArch=x86
|
||||
ws=gtk
|
||||
-os=linux
|
||||
+os=freebsd
|
||||
|
||||
buildId=R3_7_1
|
||||
buildTag=R3_7_1
|
||||
label=3.7.1
|
||||
-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
|
||||
|
||||
javacFailOnError=true
|
||||
@@ -29,21 +29,21 @@
|
||||
CDC-1.1/PersonalBasis-1.1=${bootclasspath}
|
||||
CDC-1.1/PersonalJava-1.1=${bootclasspath}
|
||||
# Somehow bootclasspath isn't expanded when used by antRunner
|
||||
-JavaSE-1.6=/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
|
||||
-CDC-1.0/Foundation-1.0=/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
|
||||
-CDC-1.1/Foundation-1.1=/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
|
||||
-OSGi/Minimum-1.0=/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
|
||||
-OSGi/Minimum-1.1=/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
|
||||
-OSGi/Minimum-1.2=/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
|
||||
-JRE-1.1=/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
|
||||
-J2SE-1.2=/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
|
||||
-J2SE-1.3=/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
|
||||
-J2SE-1.4=/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
|
||||
-J2SE-1.5=/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
|
||||
-JavaSE-1.6=/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
|
||||
-PersonalJava-1.1=/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
|
||||
-PersonalJava-1.2=/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
|
||||
-CDC-1.0/PersonalBasis-1.0=/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
|
||||
-CDC-1.0/PersonalJava-1.0=/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
|
||||
-CDC-1.1/PersonalBasis-1.1=/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
|
||||
-CDC-1.1/PersonalJava-1.1=/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
|
||||
+JavaSE-1.6=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/Foundation-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.1/Foundation-1.1=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.0=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.1=%%BOOTCLASSPATH%%
|
||||
+OSGi/Minimum-1.2=%%BOOTCLASSPATH%%
|
||||
+JRE-1.1=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.2=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.3=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.4=%%BOOTCLASSPATH%%
|
||||
+J2SE-1.5=%%BOOTCLASSPATH%%
|
||||
+JavaSE-1.6=%%BOOTCLASSPATH%%
|
||||
+PersonalJava-1.1=%%BOOTCLASSPATH%%
|
||||
+PersonalJava-1.2=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/PersonalBasis-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.0/PersonalJava-1.0=%%BOOTCLASSPATH%%
|
||||
+CDC-1.1/PersonalBasis-1.1=%%BOOTCLASSPATH%%
|
||||
+CDC-1.1/PersonalJava-1.1=%%BOOTCLASSPATH%%
|
||||
--- eclipse-build-0.5.0.orig/pdebuild.xml 2009-12-23 16:22:44.090824173 -0500
|
||||
+++ eclipse-build-0.5.0/pdebuild.xml 2009-12-23 16:24:47.491322864 -0500
|
||||
@@ -206,6 +206,7 @@
|
||||
<arg line="-DbuildOs=${buildOs} " />
|
||||
<arg line="-DbuildId=${buildId} " />
|
||||
<arg line="-debug -consolelog" />
|
||||
+ <arg line="-vmargs -Xmx1024 " />
|
||||
</java>
|
||||
<taskdef name="eclipse.versionReplacer"
|
||||
classname="org.eclipse.pde.internal.build.tasks.GenericVersionReplacer"
|
||||
--- eclipse-build-0.6.1/eclipse.desktop.orig Tue Sep 29 23:34:41 2009
|
||||
+++ eclipse-build-0.6.1/eclipse.desktop Tue Oct 26 15:24:36 2010
|
||||
@@ -2,7 +2,7 @@
|
||||
Type=Application
|
||||
Name=Eclipse
|
||||
Comment=Eclipse Integrated Development Environment
|
||||
-Icon=eclipse
|
||||
-Exec=eclipse
|
||||
+Icon=%%PORTNAME%%
|
||||
+Exec=%%PORTNAME%%
|
||||
Terminal=false
|
||||
Categories=Development;IDE;Java;
|
||||
--- 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 @@
|
||||
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.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
|
||||
@@ -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
|
||||
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh~ Mon Dec 19 16:40:57 2011
|
||||
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/jasper7.sh Wed Feb 29 14:54:42 2012
|
||||
@@ -1,8 +1,8 @@
|
||||
-#! /bin/bash
|
||||
+#! /bin/sh
|
||||
label=$1
|
||||
|
||||
for f in `find ./build/eclipse-${label}-src/plugins -name build.xml`; do
|
||||
- sed -i 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
|
||||
- sed -i 's/javax\.servlet\.jsp_2\.0\.0\.v[0-9]\{12\}/javax\.servlet\.jsp_2\.2\.0/g' ${f}
|
||||
- sed -i 's/org\.apache\.jasper_5\.5\.17\.v[0-9]\{12\}/org\.apache\.jasper_7\.0\.21/g' ${f}
|
||||
+ sed -i .orig 's/javax\.servlet_2\.5\.0\.v[0-9]\{12\}/javax\.servlet_3\.0\.0/g' ${f}
|
||||
+ 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
|
||||
577
java/eclipse/files/patch-freebsd_natives
Normal file
577
java/eclipse/files/patch-freebsd_natives
Normal file
@ -0,0 +1,577 @@
|
||||
--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile.orig 2014-03-30 18:38:29.000000000 -0500
|
||||
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/freebsd/Makefile 2014-03-30 19:41:07.000000000 -0500
|
||||
@@ -17,7 +17,7 @@
|
||||
LIB_NAME_FULL = libunixfile_1_0_0.so
|
||||
|
||||
#Set this to be your OS type
|
||||
-OS_TYPE = linux
|
||||
+OS_TYPE = freebsd
|
||||
|
||||
#Set this to be the location of your JRE
|
||||
ifeq (${JAVA_HOME},)
|
||||
@@ -25,15 +25,11 @@
|
||||
endif
|
||||
|
||||
JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
|
||||
-OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
+OPT_FLAGS=-O -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
|
||||
core:
|
||||
- gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
|
||||
- gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
|
||||
+ $(CC) $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) -o $(CORE.O) $(CORE.C)
|
||||
+ $(CC) $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc
|
||||
|
||||
clean:
|
||||
rm -f $(CORE.O) $(LIB_NAME_FULL)
|
||||
-
|
||||
-install: core
|
||||
- rm -f ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/libunixfile_1_0_0.so
|
||||
- mv libunixfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86/os/linux/x86/
|
||||
--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500
|
||||
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:32:26.000000000 -0500
|
||||
@@ -1,9 +1,9 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %fragmentName
|
||||
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86; singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86; singleton:=true
|
||||
Bundle-Version: 1.4.100.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
|
||||
Bundle-Localization: fragment
|
||||
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
|
||||
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
|
||||
--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500
|
||||
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86/pom.xml 2014-03-30 19:37:41.000000000 -0500
|
||||
@@ -18,7 +18,7 @@
|
||||
<relativePath>../../</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.core</groupId>
|
||||
- <artifactId>org.eclipse.core.filesystem.linux.x86</artifactId>
|
||||
+ <artifactId>org.eclipse.core.filesystem.freebsd.x86</artifactId>
|
||||
<version>1.4.100-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<resolver>p2</resolver>
|
||||
<environments>
|
||||
<environment>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
</environment>
|
||||
@@ -50,7 +50,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86</value>
|
||||
+ <value>gtk.freebsd.x86</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
@@ -64,12 +64,13 @@
|
||||
<phase>process-resources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
|
||||
- <copy todir="os/linux/x86" >
|
||||
- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
|
||||
- <include name="libunixfile_*.so"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
+ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/>
|
||||
+ <mkdir dir="os/freebsd/x86"/>
|
||||
+ <copy todir="os/freebsd/x86" >
|
||||
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/">
|
||||
+ <include name="libunixfile_*.so"/>
|
||||
+ </fileset>
|
||||
+ </copy>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:38:29.000000000 -0500
|
||||
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:33:50.000000000 -0500
|
||||
@@ -1,9 +1,9 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %fragmentName
|
||||
-Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.core.filesystem.freebsd.x86_64; singleton:=true
|
||||
Bundle-Version: 1.2.100.qualifier
|
||||
Bundle-Vendor: %providerName
|
||||
Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.3.0,2.0.0)"
|
||||
Bundle-Localization: fragment
|
||||
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
|
||||
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
|
||||
--- ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml.orig 2014-03-30 18:38:29.000000000 -0500
|
||||
+++ ./eclipse.platform.resources/bundles/org.eclipse.core.filesystem.freebsd.x86_64/pom.xml 2014-03-30 19:36:09.000000000 -0500
|
||||
@@ -18,7 +18,7 @@
|
||||
<relativePath>../../</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.core</groupId>
|
||||
- <artifactId>org.eclipse.core.filesystem.linux.x86_64</artifactId>
|
||||
+ <artifactId>org.eclipse.core.filesystem.freebsd.x86_64</artifactId>
|
||||
<version>1.2.100-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<resolver>p2</resolver>
|
||||
<environments>
|
||||
<environment>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
@@ -50,7 +50,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86_64</value>
|
||||
+ <value>gtk.freebsd.x86_64</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
@@ -64,13 +64,13 @@
|
||||
<phase>process-resources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
- <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
|
||||
- <mkdir dir="os/linux/x86_64/"/>
|
||||
- <copy todir="os/linux/x86_64/" >
|
||||
- <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
|
||||
- <include name="libunixfile_*.so"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
+ <exec executable="gmake" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/freebsd/"/>
|
||||
+ <mkdir dir="os/freebsd/x86_64/"/>
|
||||
+ <copy todir="os/freebsd/x86_64/" >
|
||||
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/freebsd/">
|
||||
+ <include name="libunixfile_*.so"/>
|
||||
+ </fileset>
|
||||
+ </copy>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:50:51.000000000 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
|
||||
Bundle-Name: %fragmentName
|
||||
Bundle-Vendor: %providerName
|
||||
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86; singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86; singleton:=true
|
||||
Bundle-Version: 3.102.1.qualifier
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Localization: fragment
|
||||
@@ -30,6 +30,6 @@
|
||||
org.eclipse.swt.internal.gtk; x-internal:=true,
|
||||
org.eclipse.swt.internal.mozilla; x-internal:=true,
|
||||
org.eclipse.swt.internal.opengl.glx; x-internal:=true
|
||||
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))
|
||||
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
|
||||
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
|
||||
J2SE-1.3
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/pom.xml 2014-03-30 19:49:19.000000000 -0500
|
||||
@@ -20,12 +20,12 @@
|
||||
<relativePath>../binaries-parent/</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.swt</groupId>
|
||||
- <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
|
||||
+ <artifactId>org.eclipse.swt.gtk.freebsd.x86</artifactId>
|
||||
<version>3.102.1-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
<properties>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
<buildid>${buildId}</buildid>
|
||||
@@ -112,7 +112,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86</value>
|
||||
+ <value>gtk.freebsd.x86</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86/build.xml 2014-03-30 19:49:45.000000000 -0500
|
||||
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<project name="org.eclipse.swt.gtk.linux.x86" default="build.jars" basedir=".">
|
||||
+<project name="org.eclipse.swt.gtk.freebsd.x86" default="build.jars" basedir=".">
|
||||
|
||||
<property name="swt.ws" value="gtk" />
|
||||
- <property name="swt.os" value="linux" />
|
||||
+ <property name="swt.os" value="freebsd" />
|
||||
<property name="swt.arch" value="x86" />
|
||||
- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
|
||||
+ <property name="targets" value="install"/>
|
||||
|
||||
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
|
||||
<property name="version.suffix" value="3.102.1" />
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:52:06.000000000 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
|
||||
Bundle-Name: %fragmentName
|
||||
Bundle-Vendor: %providerName
|
||||
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.x86_64; singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.swt.gtk.freebsd.x86_64; singleton:=true
|
||||
Bundle-Version: 3.102.1.qualifier
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Localization: fragment
|
||||
@@ -30,6 +30,6 @@
|
||||
org.eclipse.swt.internal.gtk; x-internal:=true,
|
||||
org.eclipse.swt.internal.mozilla; x-internal:=true,
|
||||
org.eclipse.swt.internal.opengl.glx; x-internal:=true
|
||||
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86_64))
|
||||
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
|
||||
Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,
|
||||
J2SE-1.3
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/build.xml 2014-03-30 19:51:51.000000000 -0500
|
||||
@@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<project name="org.eclipse.swt.gtk.linux.x86_64" default="build.jars" basedir=".">
|
||||
+<project name="org.eclipse.swt.gtk.freebsd.x86_64" default="build.jars" basedir=".">
|
||||
|
||||
<property name="swt.ws" value="gtk" />
|
||||
- <property name="swt.os" value="linux" />
|
||||
+ <property name="swt.os" value="freebsd" />
|
||||
<property name="swt.arch" value="x86_64" />
|
||||
- <property name="targets" value="make_mozilla make_xulrunner make_xpcominit install"/>
|
||||
+ <property name="targets" value="install"/>
|
||||
|
||||
<!-- These properties are used by eclipse when exporting as Deployable plugin and fragments -->
|
||||
<property name="version.suffix" value="3.102.1" />
|
||||
--- ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:51:08.000000000 -0500
|
||||
+++ ./eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:51:36.000000000 -0500
|
||||
@@ -20,12 +20,12 @@
|
||||
<relativePath>../binaries-parent/</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.swt</groupId>
|
||||
- <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
|
||||
+ <artifactId>org.eclipse.swt.gtk.freebsd.x86_64</artifactId>
|
||||
<version>3.102.1-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
<properties>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
<buildid>${buildId}</buildid>
|
||||
@@ -112,7 +112,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86_64</value>
|
||||
+ <value>gtk.freebsd.x86_64</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:45:38.000000000 -0500
|
||||
@@ -3,8 +3,8 @@
|
||||
Bundle-Name: %fragmentName
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: fragment
|
||||
-Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86;singleton:=true
|
||||
Bundle-Version: 1.1.300.qualifier
|
||||
Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
|
||||
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86))
|
||||
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86))
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/pom.xml 2014-03-30 19:45:12.000000000 -0500
|
||||
@@ -18,7 +18,7 @@
|
||||
<relativePath>../../../../</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.core</groupId>
|
||||
- <artifactId>org.eclipse.core.net.linux.x86</artifactId>
|
||||
+ <artifactId>org.eclipse.core.net.freebsd.x86</artifactId>
|
||||
<version>1.1.300-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<configuration>
|
||||
<environments>
|
||||
<environment>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
</environment>
|
||||
@@ -47,7 +47,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86</value>
|
||||
+ <value>gtk.freebsd.x86</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
@@ -61,12 +61,12 @@
|
||||
<phase>process-resources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
|
||||
- <copy todir="." >
|
||||
- <fileset dir="../../natives/unix/linux/">
|
||||
- <include name="libgnomeproxy-*.so"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
|
||||
+ <copy todir="." >
|
||||
+ <fileset dir="../../natives/unix/freebsd/">
|
||||
+ <include name="libgnomeproxy-*.so"/>
|
||||
+ </fileset>
|
||||
+ </copy>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86/fragment.properties 2014-03-30 19:45:23.000000000 -0500
|
||||
@@ -8,5 +8,5 @@
|
||||
# Contributors:
|
||||
# IBM Corporation - initial API and implementation
|
||||
###############################################################################
|
||||
-fragmentName = Proxy for Linux
|
||||
+fragmentName = Proxy for FreeBSD
|
||||
providerName = Eclipse.org
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:47:19.000000000 -0500
|
||||
@@ -3,8 +3,8 @@
|
||||
Bundle-Name: %fragmentName
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: fragment
|
||||
-Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.core.net.freebsd.x86_64;singleton:=true
|
||||
Bundle-Version: 1.1.100.qualifier
|
||||
Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0"
|
||||
-Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
|
||||
+Eclipse-PlatformFilter: (& (osgi.os=freebsd) (osgi.arch=x86_64))
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.4
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/pom.xml 2014-03-30 19:47:00.000000000 -0500
|
||||
@@ -18,7 +18,7 @@
|
||||
<relativePath>../../../../</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.core</groupId>
|
||||
- <artifactId>org.eclipse.core.net.linux.x86_64</artifactId>
|
||||
+ <artifactId>org.eclipse.core.net.freebsd.x86_64</artifactId>
|
||||
<version>1.1.100-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
<configuration>
|
||||
<environments>
|
||||
<environment>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
</environment>
|
||||
@@ -48,7 +48,7 @@
|
||||
<property>
|
||||
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
|
||||
<name>native</name>
|
||||
- <value>gtk.linux.x86_64</value>
|
||||
+ <value>gtk.freebsd.x86_64</value>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
@@ -62,12 +62,12 @@
|
||||
<phase>process-resources</phase>
|
||||
<configuration>
|
||||
<target>
|
||||
- <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
|
||||
- <copy todir="." >
|
||||
- <fileset dir="../../natives/unix/linux/">
|
||||
- <include name="libgnomeproxy-*.so"/>
|
||||
- </fileset>
|
||||
- </copy>
|
||||
+ <exec executable="gmake" newenvironment="false" dir="../../natives/unix/freebsd/"/>
|
||||
+ <copy todir="." >
|
||||
+ <fileset dir="../../natives/unix/freebsd/">
|
||||
+ <include name="libgnomeproxy-*.so"/>
|
||||
+ </fileset>
|
||||
+ </copy>
|
||||
</target>
|
||||
</configuration>
|
||||
<goals>
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.freebsd.x86_64/fragment.properties 2014-03-30 19:47:09.000000000 -0500
|
||||
@@ -8,5 +8,5 @@
|
||||
# Contributors:
|
||||
# IBM Corporation - initial API and implementation
|
||||
###############################################################################
|
||||
-fragmentName = Proxy for Linux x86_64
|
||||
+fragmentName = Proxy for FreeBSD x86_64
|
||||
providerName = Eclipse.org
|
||||
--- ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile.orig 2014-03-30 18:51:46.000000000 -0500
|
||||
+++ ./eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/freebsd/makefile 2014-03-30 19:42:55.000000000 -0500
|
||||
@@ -18,7 +18,7 @@
|
||||
LIB_NAME = gnomeproxy.so
|
||||
LIB_NAME_FULL = libgnomeproxy-1.0.0.so
|
||||
|
||||
-OS_TYPE = linux
|
||||
+OS_TYPE = freebsd
|
||||
JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
|
||||
INCLUDE = `pkg-config --cflags gconf-2.0`
|
||||
COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
|
||||
@@ -30,15 +30,15 @@
|
||||
|
||||
compile:
|
||||
@echo "Building file: $(GNOMEPROXY.O)"
|
||||
- @echo "Invoking: GCC C Compiler"
|
||||
- gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
|
||||
+ @echo "Invoking: C Compiler"
|
||||
+ $(CC) $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C)
|
||||
@echo "Finished building: $(GNOMEPROXY.O)"
|
||||
@echo " "
|
||||
|
||||
link: compile
|
||||
@echo "Building target: $(LIB_NAME_FULL)"
|
||||
- @echo "Invoking: GCC C Linker"
|
||||
- gcc $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
|
||||
+ @echo "Invoking: C Linker"
|
||||
+ $(CC) $(LINKER_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(LIBS) $(GNOMEPROXY.O) -lc
|
||||
@echo "Finished building target: $(LIB_NAME_FULL)"
|
||||
@echo " "
|
||||
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/META-INF/MANIFEST.MF 2014-03-30 19:54:41.000000000 -0500
|
||||
@@ -2,9 +2,9 @@
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-Vendor: %providerName
|
||||
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86;singleton:=true
|
||||
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=linux) (osgi.arch=x86))
|
||||
-Bundle-Localization: launcher.gtk.linux.x86
|
||||
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86))
|
||||
+Bundle-Localization: launcher.gtk.freebsd.x86
|
||||
Eclipse-BundleShape: dir
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/pom.xml 2014-03-30 19:54:29.000000000 -0500
|
||||
@@ -18,13 +18,13 @@
|
||||
<relativePath>../../launcher-binary-parent</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.equinox</groupId>
|
||||
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86</artifactId>
|
||||
+ <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>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86</arch>
|
||||
</properties>
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86/launcher.gtk.freebsd.x86.properties 2014-03-30 19:54:51.000000000 -0500
|
||||
@@ -8,5 +8,5 @@
|
||||
# Contributors:
|
||||
# IBM Corporation - initial API and implementation
|
||||
###############################################################################
|
||||
-pluginName = Equinox Launcher Linux X86 Fragment
|
||||
+pluginName = Equinox Launcher FreeBSD X86 Fragment
|
||||
providerName = Eclipse.org - Equinox
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/META-INF/MANIFEST.MF 2014-03-30 19:55:31.000000000 -0500
|
||||
@@ -2,9 +2,9 @@
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-Vendor: %providerName
|
||||
-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86_64;singleton:=true
|
||||
+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.freebsd.x86_64;singleton:=true
|
||||
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=linux) (osgi.arch=x86_64))
|
||||
-Bundle-Localization: launcher.gtk.linux.x86_64
|
||||
+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=freebsd) (osgi.arch=x86_64))
|
||||
+Bundle-Localization: launcher.gtk.freebsd.x86_64
|
||||
Eclipse-BundleShape: dir
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/pom.xml 2014-03-30 19:55:25.000000000 -0500
|
||||
@@ -18,13 +18,13 @@
|
||||
<relativePath>../../launcher-binary-parent</relativePath>
|
||||
</parent>
|
||||
<groupId>org.eclipse.equinox</groupId>
|
||||
- <artifactId>org.eclipse.equinox.launcher.gtk.linux.x86_64</artifactId>
|
||||
+ <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>
|
||||
- <os>linux</os>
|
||||
+ <os>freebsd</os>
|
||||
<ws>gtk</ws>
|
||||
<arch>x86_64</arch>
|
||||
</properties>
|
||||
--- ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak.orig 2014-03-30 18:56:11.000000000 -0500
|
||||
+++ ./rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/make_freebsd.mak 2014-03-30 22:05:58.000000000 -0500
|
||||
@@ -42,15 +42,15 @@
|
||||
EXEC = $(PROGRAM_OUTPUT)
|
||||
DLL = $(PROGRAM_LIBRARY)
|
||||
#LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 -lpthread -ldl -lX11
|
||||
-LIBS = -lpthread -ldl
|
||||
+LIBS = -pthread
|
||||
GTK_LIBS = \
|
||||
-DGTK_LIB="\"libgtk-x11-2.0.so.0\"" -DGDK_LIB="\"libgdk-x11-2.0.so.0\"" \
|
||||
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
|
||||
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
|
||||
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
|
||||
-CFLAGS = ${M_ARCH} -g -s -Wall\
|
||||
+CFLAGS = ${M_ARCH} -g -s -Wall -pthread\
|
||||
-fpic \
|
||||
- -DLINUX \
|
||||
+ -DFREEBSD \
|
||||
-DMOZILLA_FIX \
|
||||
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
|
||||
-DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \
|
||||
@@ -59,7 +59,7 @@
|
||||
$(GTK_LIBS) \
|
||||
-I. \
|
||||
-I.. \
|
||||
- -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
|
||||
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(DEFAULT_OS) \
|
||||
`pkg-config --cflags gtk+-2.0`
|
||||
|
||||
all: $(EXEC) $(DLL)
|
||||
@@ -98,10 +98,10 @@
|
||||
$(CC) $(CFLAGS) -c ../eclipseNix.c -o eclipseNix.o
|
||||
|
||||
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
|
||||
- $(CC) ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
|
||||
+ $(CC) -s ${M_ARCH} -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
|
||||
|
||||
$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
|
||||
- $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
|
||||
+ $(CC) -s $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
|
||||
|
||||
install: all
|
||||
cp $(EXEC) $(OUTPUT_DIR)
|
||||
--- ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties.orig 2014-03-30 18:56:10.000000000 -0500
|
||||
+++ ./rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64/launcher.gtk.freebsd.x86_64.properties 2014-03-31 07:49:37.000000000 -0500
|
||||
@@ -8,5 +8,5 @@
|
||||
# Contributors:
|
||||
# IBM Corporation - initial API and implementation
|
||||
###############################################################################
|
||||
-pluginName = Equinox Launcher Linux X86_64 Fragment
|
||||
+pluginName = Equinox Launcher FreeBSD X86_64 Fragment
|
||||
providerName = Eclipse.org - Equinox
|
||||
@ -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"/>
|
||||
2459
java/eclipse/files/patch-submodules
Normal file
2459
java/eclipse/files/patch-submodules
Normal file
File diff suppressed because it is too large
Load Diff
40
java/eclipse/scripts/pre-patch
Normal file
40
java/eclipse/scripts/pre-patch
Normal file
@ -0,0 +1,40 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -x
|
||||
|
||||
# Copy the Linux 'native' code for the FreeBSD versions
|
||||
# At this point, just make sure the directory and file names are "freebsd"
|
||||
# These files will be patched in the do-patch step.
|
||||
|
||||
check_freebsd_mak ()
|
||||
{
|
||||
local d
|
||||
d=`dirname "$1"`
|
||||
[ -e "${d}/make_freebsd.mak" ] && return
|
||||
cp -p "$1" "${d}/make_freebsd.mak"
|
||||
}
|
||||
|
||||
for d in ${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x* \
|
||||
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x* \
|
||||
${WRKSRC}/eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x* \
|
||||
${WRKSRC}/eclipse.platform.resources/bundles/org.eclipse.core.filesystem/natives/unix/linux \
|
||||
${WRKSRC}/eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux \
|
||||
${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x* \
|
||||
${WRKSRC}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x* \
|
||||
${WRKSRC}/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x* \
|
||||
${WRKSRC}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/gtk/linux/x*
|
||||
do
|
||||
mkdir -p `echo $d | sed -e 's/linux/freebsd/'`
|
||||
[ -d $d ] && ( cd $d; tar cf - . ) | ( cd `echo $d | sed -e 's/linux/freebsd/'`; tar xf - )
|
||||
done
|
||||
|
||||
for d in `find ${WRKSRC} -type d -name \*freebsd\*`
|
||||
do
|
||||
for f in `find $d -name \*linux\*`
|
||||
do
|
||||
mv $f `echo $f | sed -e 's/linux/freebsd/'`
|
||||
done
|
||||
find $d -type f \( -name \*.so -o -name eclipse -o -name launcher \) -delete
|
||||
done
|
||||
|
||||
find ${WRKSRC} -type f -name make_linux.mak | while read file; do check_freebsd_mak "$file"; done
|
||||
Loading…
Reference in New Issue
Block a user