mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-23 00:43:28 +00:00
Remove java/eclipse-devel as java/eclipse is newer
Given the amount of work required to maintain a single version of eclipse, it was thought prudent to focus maintenance efforts on a single port, especially since the plugins are designed for java/eclipse, not the development version. Discussed in PR. PR: 188659
This commit is contained in:
parent
88913fbbfc
commit
2716b101e4
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=359724
1
MOVED
1
MOVED
@ -6180,3 +6180,4 @@ textproc/yaml-mode.el-emacs21||2014-06-27|Removed: dependent on editors/emacs21
|
||||
www/emacs-w3m-emacs21||2014-06-27|Removed: dependent on editors/emacs21
|
||||
www/emacs-w3m-emacs22||2014-06-27|Removed: dependent on editors/emacs22
|
||||
devel/ode-devel|devel/ode|2014-06-27|Has expired: Outdated by devel/ode
|
||||
java/eclipse-devel|java/eclipse|2014-06-29|Concentrate maintenance effort on newer java/eclipse
|
||||
|
@ -24,7 +24,6 @@
|
||||
SUBDIR += eclipse-cdt
|
||||
SUBDIR += eclipse-checkstyle
|
||||
SUBDIR += eclipse-datatools
|
||||
SUBDIR += eclipse-devel
|
||||
SUBDIR += eclipse-drjava
|
||||
SUBDIR += eclipse-ecj
|
||||
SUBDIR += eclipse-emf
|
||||
|
@ -1,324 +0,0 @@
|
||||
# Created by: various members of freebsd-java
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= eclipse-devel
|
||||
PORTVERSION= 4.2.0
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/:1 \
|
||||
http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/plugins/:2 \
|
||||
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:4,} \
|
||||
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,} \
|
||||
http://archive.eclipse.org/jetty/8.1.0.v20120127/dist/:8 \
|
||||
http://repo2.maven.org/maven2/org/apache/geronimo/specs/geronimo-annotation_1.1_spec/1.0/:9 \
|
||||
http://artfiles.org/apache.org/felix/:10
|
||||
DISTFILES= ${ECLIPSE_BUILD_SRCFILE}:1 \
|
||||
${ECLIPSE_SRCFILE}:1 \
|
||||
${ANT_SRCFILE}:4 \
|
||||
${JUNIT4_SRCFILE}:6 \
|
||||
${TOMCAT_SRCFILES:C,(.*),\\1:7,} \
|
||||
${ECLIPSE_JETTY_SRCFILE}:8 \
|
||||
${GERONIMO_ANNOTATION_BUNDLE}:9
|
||||
DIST_SUBDIR= eclipse
|
||||
EXTRACT_ONLY= ${ECLIPSE_BUILD_SRCFILE}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
COMMENT= An open extensible IDE for anything and nothing in particular
|
||||
|
||||
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:${PORTSDIR}/archivers/unzip \
|
||||
zip:${PORTSDIR}/archivers/zip
|
||||
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
|
||||
webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
|
||||
|
||||
OPTIONS_DEFINE= TESTS
|
||||
TESTS_DESC= "Build SDK test suite"
|
||||
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
|
||||
USE_ANT= yes
|
||||
USE_GL= glu
|
||||
USES= gmake pkgconfig desktop-file-utils
|
||||
USE_GNOME= gconf2 gtk20 gnomevfs2 libgnome libgnomeui
|
||||
USE_JAVA= yes
|
||||
USE_XZ= yes
|
||||
BZIP2_SUFX= .tar.bz2
|
||||
ZIP_CMD?= ${LOCALBASE}/bin/zip
|
||||
|
||||
JAVA_BUILD= yes
|
||||
JAVA_OS= native
|
||||
JAVA_RUN= yes
|
||||
JAVA_VERSION= 1.6
|
||||
JAVA_VENDOR= openjdk
|
||||
|
||||
ECLIPSE_RELEASE_VERSION=I20120608-1400
|
||||
ECLIPSE_BUILD_SRCFILE= eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3${EXTRACT_SUFX}
|
||||
ECLIPSE_SRCFILE= eclipse-${PORTVERSION}-${ECLIPSE_RELEASE_VERSION}-src${BZIP2_SUFX}
|
||||
ECLIPSE_TEST_SRCFILE= eclipse-sdktests-${PORTVERSION}-src${BZIP2_SUFX}
|
||||
ECLIPSE_TEST_SCRIPTFILE=eclipse-sdktests-${PORTVERSION}-scripts${BZIP2_SUFX}
|
||||
ECLIPSE_JAR_BUNDLES= com.ibm.icu_4.4.2.v20110823.jar \
|
||||
com.ibm.icu.source_4.4.2.v20110823.jar \
|
||||
com.jcraft.jsch_0.1.44.v201101211721.jar \
|
||||
javax.inject_1.0.0.v20091030.jar \
|
||||
javax.xml_1.3.4.v201005080400.jar \
|
||||
org.apache.batik.css_1.6.0.v201011041432.jar \
|
||||
org.apache.batik.util_1.6.0.v201011041432.jar \
|
||||
org.apache.batik.util.gui_1.6.0.v201011041432.jar \
|
||||
org.apache.commons.codec_1.3.0.v201101211617.jar \
|
||||
org.apache.commons.el_1.0.0.v201101211617.jar \
|
||||
org.apache.commons.httpclient_3.1.0.v201012070820.jar \
|
||||
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 \
|
||||
org.w3c.css.sac_1.3.1.v200903091627.jar \
|
||||
org.w3c.dom.svg_1.1.0.v201011041433.jar
|
||||
ECLIPSE_SAT4J_BUNDLES= org.sat4j.core_2.3.0.v20110329.jar \
|
||||
org.sat4j.pb_2.3.0.v20110329.jar
|
||||
ECLIPSE_JETTY_VERSION= 8.1.0.v20120127
|
||||
ECLIPSE_JETTY_SRCFILE= jetty-distribution-${ECLIPSE_JETTY_VERSION}.tar.gz
|
||||
ECLIPSE_JETTY_BUNDLES= jetty-util-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-server-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-http-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-continuation-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-io-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-security-${ECLIPSE_JETTY_VERSION}.jar \
|
||||
jetty-servlet-${ECLIPSE_JETTY_VERSION}.jar
|
||||
ANT_VERSION= 1.8.3
|
||||
ANT_SRCFILE= apache-ant-${ANT_VERSION}-bin${BZIP2_SUFX}
|
||||
ANT_BUNDLES= ant-antlr.jar \
|
||||
ant-apache-bcel.jar \
|
||||
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
|
||||
JUNIT4_VERSION= 4.10
|
||||
JUNIT4_SRCFILE= junit-${JUNIT4_VERSION}.jar
|
||||
TOMCAT_VERSION= 7.0.25
|
||||
TOMCAT_SRCFILES= apache-tomcat-${TOMCAT_VERSION}.tar.gz tomcat-juli.jar
|
||||
TOMCAT_BUNDLES= el-api.jar \
|
||||
jasper-el.jar \
|
||||
jasper.jar \
|
||||
jsp-api.jar \
|
||||
servlet-api.jar \
|
||||
tomcat-api.jar \
|
||||
tomcat-juli.jar
|
||||
GERONIMO_ANNOTATION_BUNDLE= geronimo-annotation_1.1_spec-1.0.jar
|
||||
FELIX_BUNDLES= org.apache.felix.gogo.command-0.12.0.jar \
|
||||
org.apache.felix.gogo.runtime-0.10.0.jar \
|
||||
org.apache.felix.gogo.shell-0.10.0.jar
|
||||
FBSD_SUPPORT_SRCFILE= freebsd-support.patch
|
||||
BUILD_DEPSDIR= ${BUILD_WRKSRC}/dependencies
|
||||
|
||||
ALL_TARGET= provisionSDKinDropins
|
||||
INSTALL_TARGET= installSDKinDropins
|
||||
MAKE_ARGS= -DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}-${ECLIPSE_RELEASE_VERSION}
|
||||
MAKE_ENV+= GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
|
||||
|
||||
WRKSRC= ${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//}
|
||||
PATCH_STRIP= -p1
|
||||
|
||||
BOOTCLASSPATH= ${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jce.jar
|
||||
PORTDESTDIR= ${PREFIX}/lib/${PORTNAME}
|
||||
DROPINS_DIR= share/${PORTNAME}/dropins
|
||||
|
||||
PLIST_FILES= bin/${PORTNAME} \
|
||||
share/applications/${PORTNAME}.desktop \
|
||||
share/icons/hicolor/32x32/apps/${PORTNAME}.png \
|
||||
share/icons/hicolor/48x48/apps/${PORTNAME}.png \
|
||||
share/icons/hicolor/256x256/apps/${PORTNAME}.png \
|
||||
share/pixmaps/${PORTNAME}.png
|
||||
|
||||
.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES}
|
||||
DISTFILES+= ${f}:2
|
||||
.endfor
|
||||
.for f in ${FELIX_BUNDLES}
|
||||
DISTFILES+= ${f}:10
|
||||
.endfor
|
||||
|
||||
NO_STAGE= yes
|
||||
.include <bsd.port.pre.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
|
||||
.endif
|
||||
|
||||
# Prepare Eclipse source, Ant, JUnit, Tomcat, Jetty and Geronimo bundles
|
||||
post-extract:
|
||||
@${MKDIR} ${BUILD_WRKSRC}/bundles
|
||||
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_SRCFILE} ${BUILD_WRKSRC}
|
||||
@${CP} ${FILESDIR}/${FBSD_SUPPORT_SRCFILE} ${BUILD_WRKSRC}/patches/
|
||||
.for f in ${ECLIPSE_JAR_BUNDLES} ${ECLIPSE_SAT4J_BUNDLES} ${FELIX_BUNDLES}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${BUILD_WRKSRC}/bundles/
|
||||
.endfor
|
||||
|
||||
@(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
|
||||
|
||||
@${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
|
||||
|
||||
@(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${ECLIPSE_JETTY_SRCFILE} ${EXTRACT_AFTER_ARGS})
|
||||
.for f in ${ECLIPSE_JETTY_BUNDLES}
|
||||
@${CP} ${WRKDIR}/jetty-distribution-${ECLIPSE_JETTY_VERSION}/lib/${f} ${BUILD_WRKSRC}/bundles/
|
||||
.endfor
|
||||
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${GERONIMO_ANNOTATION_BUNDLE} ${BUILD_WRKSRC}/bundles/
|
||||
|
||||
.if ${PORT_OPTIONS:MTESTS}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SRCFILE} ${BUILD_WRKSRC}
|
||||
@${CP} ${DISTDIR}/${DIST_SUBDIR}/${ECLIPSE_TEST_SCRIPTFILE} ${BUILD_WRKSRC}
|
||||
.endif
|
||||
|
||||
# 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:
|
||||
@${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_DEPSDIR}/dependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/jdtdependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/sdkdependencies.properties
|
||||
.endfor
|
||||
.for f in ${ECLIPSE_SAT4J_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+^${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
.endfor
|
||||
.for f in ${ECLIPSE_JETTY_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+^${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=\(.*\)+${f:C/(jetty)-([a-z]+)-(.*)$/org.eclipse.\\1.\\2_\\3/}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
.endfor
|
||||
.for f in ${ANT_BUNDLES}
|
||||
@${REINPLACE_CMD} -e "s+${f}=\(.*\)+${f}=${BUILD_WRKSRC}/bundles/${f}+" ${BUILD_DEPSDIR}/nonosgidependencies.properties
|
||||
.endfor
|
||||
|
||||
@${REINPLACE_CMD} -e "s+=/usr/share/java/junit.jar+=${BUILD_WRKSRC}/bundles/junit4.jar+" ${BUILD_DEPSDIR}/jdtnonosgidependencies.properties
|
||||
@${JAR} umf ${FILESDIR}/MANIFEST.MF.junit4 ${BUILD_WRKSRC}/bundles/junit4.jar
|
||||
|
||||
@${REINPLACE_CMD} -e "s+^\(javax.el_2.2.0.v201108011116.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/el-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/el-api.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.el_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper-el.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.el_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper-el.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.jasper_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jasper.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.jasper_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jasper.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(javax.servlet.jsp_2.2.0.v201112011158.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/jsp-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/jsp-api.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(javax.servlet_3.0.0.v201112011016.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/servlet-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/servlet-api.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.tomcat_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-api.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.tomcat_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-api.jar
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.juli_7.0.21.jar\)=\(.*\)+\1=${BUILD_WRKSRC}/bundles/tomcat-juli.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.juli_7.0.21.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/tomcat-juli.jar
|
||||
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.geronimo.specs.geronimo-annotation_1.1_spec.jar\)=.*+\1=${BUILD_WRKSRC}/bundles/${GERONIMO_ANNOTATION_BUNDLE}+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.command\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.12.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.runtime\)\(_0.8.0.v201108120515.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
@${REINPLACE_CMD} -e "s+^\(org.apache.felix.gogo.shell\)\(_0.8.0.v201110170705.jar\)=.*+\1\2=${BUILD_WRKSRC}/bundles/\1-0.10.0.jar+" ${BUILD_DEPSDIR}/dependencies.properties
|
||||
|
||||
@${MV} ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.0.1.v200903091627.jar ${BUILD_WRKSRC}/dependencyManifests/javax.xml_1.3.4.v201005080400.jar
|
||||
@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.apache.commons.el_1.0.0.v201101211617.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar
|
||||
@${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.apache.commons.el_1.0.0.v201101211617.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA
|
||||
@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.server_6.1.23.v201012071420.jar
|
||||
@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201004211559.jar ${BUILD_WRKSRC}/dependencyManifests/org.mortbay.jetty.util_6.1.23.v201012071420.jar
|
||||
@${MV} ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201101071600.jar ${BUILD_WRKSRC}/dependencyManifests/org.objectweb.asm_3.3.1.v201105211655.jar
|
||||
@${ZIP_CMD} -qd ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar META-INF/ECLIPSEF.SF META-INF/ECLIPSEF.RSA META-INF/MANIFEST.MF
|
||||
@${JAR} umf ${BUILD_WRKSRC}/dependencyManifests/org.w3c.dom.svg_1.1.0.v201011041433.jar/META-INF/MANIFEST.MF ${BUILD_WRKSRC}/bundles/org.w3c.dom.svg_1.1.0.v201011041433.jar
|
||||
|
||||
.if ${PORT_OPTIONS:MTESTS}
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} applyTestPatches)
|
||||
.endif
|
||||
|
||||
pre-build:
|
||||
@${CP} ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java ${BUILD_WRKSRC}
|
||||
@${PATCH} -d ${BUILD_WRKSRC} -E -p0 -i ${PATCHDIR}/BindingModel.java.patch
|
||||
@${CP} ${BUILD_WRKSRC}/BindingModel.java ${BUILD_WRKSRC}/build/eclipse-4.2.0-I20120608-1400-src/plugins/org.eclipse.ui.workbench/Eclipse\ UI/org/eclipse/ui/internal/keys/model/BindingModel.java
|
||||
|
||||
do-install:
|
||||
@${RM} -rf ${PORTDESTDIR}
|
||||
@${MKDIR} ${PORTDESTDIR}
|
||||
@${MKDIR} ${PREFIX}/${DROPINS_DIR}
|
||||
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
|
||||
.for d in plugins dropins/jdt/plugins
|
||||
@${FIND} ${PORTDESTDIR}/${d} -type f -perm 600 -print0 | ${XARGS} -0 ${CHMOD} 644
|
||||
.endfor
|
||||
@${SED} \
|
||||
-e "s+%%BROWSER%%+${GECKO:S/19//}+g" \
|
||||
-e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
|
||||
-e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \
|
||||
-e "s+%%JAVA_OS%%+${JAVA_OS}+g" \
|
||||
-e "s+%%JAVA_VERSION%%+${JAVA_VERSION}+g" \
|
||||
-e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
|
||||
${FILESDIR}/eclipse.in > ${BUILD_WRKSRC}/eclipse.tmp
|
||||
.if defined(JAVA_VENDOR)
|
||||
@${REINPLACE_CMD} -e "s+%%JAVA_VENDOR_SPECIFICATION%%+JAVA_VENDOR=\"${JAVA_VENDOR}\"+g" \
|
||||
${BUILD_WRKSRC}/eclipse.tmp
|
||||
.else
|
||||
@${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}
|
||||
|
||||
.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
|
||||
|
||||
.include <bsd.port.post.mk>
|
@ -1,66 +0,0 @@
|
||||
SHA256 (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 182507df10f79d2bf3436aca0f6b4b4c652f76b2f117a0dfa9989dd815bcf5b9
|
||||
SIZE (eclipse/eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3.tar.xz) = 304184
|
||||
SHA256 (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = c7cf3218e8873e5f8383111c7887636c92d36a847a78ac5adc2687854a21e08d
|
||||
SIZE (eclipse/eclipse-4.2.0-I20120608-1400-src.tar.bz2) = 77996040
|
||||
SHA256 (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 93238e8861acf0ca0546dc4f7c9256e0bf83effbff4afca0ba0aa024d4abd4d1
|
||||
SIZE (eclipse/apache-ant-1.8.3-bin.tar.bz2) = 4254036
|
||||
SHA256 (eclipse/junit-4.10.jar) = 5ccbfcf78fb3663d9bed8ce826934231f93ad40e9a4c6796ba4ccf8557a28d69
|
||||
SIZE (eclipse/junit-4.10.jar) = 253160
|
||||
SHA256 (eclipse/apache-tomcat-7.0.25.tar.gz) = 7ba03b6703b43da6868613fd625bfb13a791d57478b4a4e49bdb56f9fc3994b4
|
||||
SIZE (eclipse/apache-tomcat-7.0.25.tar.gz) = 7527434
|
||||
SHA256 (eclipse/tomcat-juli.jar) = cafd9cf2e73dd21d3fbe89fc83ae235a588342c11f7b8df7c55573aebc25f0d1
|
||||
SIZE (eclipse/tomcat-juli.jar) = 78801
|
||||
SHA256 (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = f3f88abb93f70061d361596c7de5051ae148b01b5897d1b40ab314d6a6e95379
|
||||
SIZE (eclipse/jetty-distribution-8.1.0.v20120127.tar.gz) = 12950131
|
||||
SHA256 (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 6d2d296d01540201bca6e7175bf900f6df0be605e29bdaf822df516f40235ff9
|
||||
SIZE (eclipse/geronimo-annotation_1.1_spec-1.0.jar) = 21584
|
||||
SHA256 (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 3b8ba468997fd9ae21cdf3972f1d512cf09c5442dd0334d49ce49328ba34f8e7
|
||||
SIZE (eclipse/com.ibm.icu_4.4.2.v20110823.jar) = 6701200
|
||||
SHA256 (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 6b983efbce0b4fc18de095fdb637f6ead777bf4cf53f51b244d63fb44d43b579
|
||||
SIZE (eclipse/com.ibm.icu.source_4.4.2.v20110823.jar) = 1754121
|
||||
SHA256 (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = e370a86fae85897c6ba8ed663f20ff9ea2901764226344babb3e93ac418ed227
|
||||
SIZE (eclipse/com.jcraft.jsch_0.1.44.v201101211721.jar) = 199127
|
||||
SHA256 (eclipse/javax.inject_1.0.0.v20091030.jar) = 42a3f56421d64fed322c66738affd5afa221caf967bbf42d96b7cecc3a598428
|
||||
SIZE (eclipse/javax.inject_1.0.0.v20091030.jar) = 12288
|
||||
SHA256 (eclipse/javax.xml_1.3.4.v201005080400.jar) = 22d52002b1bab03b51372c197411a7aee2a5d80f8a3f767eeeace71d1e0c4ad2
|
||||
SIZE (eclipse/javax.xml_1.3.4.v201005080400.jar) = 237996
|
||||
SHA256 (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 330230ef1445f554fef4420a3fa1209048a4896250bf82d36adfe0b6ed142d81
|
||||
SIZE (eclipse/org.apache.batik.css_1.6.0.v201011041432.jar) = 265409
|
||||
SHA256 (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = bfef3b67286b9f9213e9cb58cec25e5549e4e3db54332951466ae07931672a03
|
||||
SIZE (eclipse/org.apache.batik.util_1.6.0.v201011041432.jar) = 101159
|
||||
SHA256 (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 59e05961020cb2de4ea224d48bf6758e74e58af30a4c5c81d9b500f8f4ab6b30
|
||||
SIZE (eclipse/org.apache.batik.util.gui_1.6.0.v201011041432.jar) = 164253
|
||||
SHA256 (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 47dc744368dc7a4cde2be1e9d9e744ec014dca27ff7a23722da12db10e67419e
|
||||
SIZE (eclipse/org.apache.commons.codec_1.3.0.v201101211617.jar) = 55011
|
||||
SHA256 (eclipse/org.apache.commons.el_1.0.0.v201101211617.jar) = 31867a6e2166e744dced07606852ef84e41db24bfd93a3da375ef4454bde13bc
|
||||
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.w3c.css.sac_1.3.1.v200903091627.jar) = e75b95da845d2b1db2787799bca3761b018dde48eb052e4c4a810086502d4dae
|
||||
SIZE (eclipse/org.w3c.css.sac_1.3.1.v200903091627.jar) = 32952
|
||||
SHA256 (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 0e23a9b5f8f92b8edff8a443fb27e79411f2474d8f352361a08a280de35dfdd2
|
||||
SIZE (eclipse/org.w3c.dom.svg_1.1.0.v201011041433.jar) = 87897
|
||||
SHA256 (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 3e6c4a633ede8c24a86559cf9fc2231840dbf032398a38a960677723906728c1
|
||||
SIZE (eclipse/org.sat4j.core_2.3.0.v20110329.jar) = 210700
|
||||
SHA256 (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = c40ca55dad3a937dc4c4005e5facf11204a61d56824c2b19eac480dfbeeaaafd
|
||||
SIZE (eclipse/org.sat4j.pb_2.3.0.v20110329.jar) = 140725
|
||||
SHA256 (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 5799c75d81dd5682ff79f3e440b9ba77c5511fe683b5b7d5a322059ce4d39800
|
||||
SIZE (eclipse/org.apache.felix.gogo.command-0.12.0.jar) = 51746
|
||||
SHA256 (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 15e94961ae2d0046278686965fe6a34ad43d8d18719f5bc2304e725cdb57a379
|
||||
SIZE (eclipse/org.apache.felix.gogo.runtime-0.10.0.jar) = 66965
|
||||
SHA256 (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 5a625f772d7c03443229d9a1e9f9b851892ee363c2e88ef1d5b55ed0979431a2
|
||||
SIZE (eclipse/org.apache.felix.gogo.shell-0.10.0.jar) = 49004
|
@ -1,14 +0,0 @@
|
||||
--- BindingModel.java 2013-08-13 13:47:55.000000000 -0400
|
||||
+++ BindingModel.java 2013-08-13 13:48:48.000000000 -0400
|
||||
@@ -237,7 +237,10 @@
|
||||
if (obj instanceof Binding) {
|
||||
Binding b = (Binding) obj;
|
||||
if (!activeManagerBindings.contains(b)) {
|
||||
- be.fill(b.getParameterizedCommand());
|
||||
+ ParameterizedCommand cmd = b.getParameterizedCommand();
|
||||
+ if (cmd != null) {
|
||||
+ commandToElement.remove(cmd);
|
||||
+ }
|
||||
bindingToElement.remove(b);
|
||||
i.remove();
|
||||
controller.firePropertyChange(this, PROP_BINDING_REMOVE,
|
@ -1,64 +0,0 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.junit
|
||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
|
||||
ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
|
||||
eexport
|
||||
Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
|
||||
on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
|
||||
org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
|
||||
junit.experimental.categories;version="4.10.0",org.junit.experimental.
|
||||
max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
|
||||
g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
|
||||
heories;version="4.10.0",org.junit.experimental.theories.internal;vers
|
||||
ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
|
||||
s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
|
||||
,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
|
||||
it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
|
||||
nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
|
||||
ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
|
||||
;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
|
||||
ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
|
||||
",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
|
||||
g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
|
||||
tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
|
||||
ers.model;version="4.10.0"
|
||||
Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
|
||||
Bundle-ManifestVersion: 2
|
||||
Manifest-Version: 1.0
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.junit
|
||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
|
||||
ls:org.eclipse.orbit/org.junit;tag=v4_10_0_v20120426-0900
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="1.1.0";visibility:=r
|
||||
eexport
|
||||
Export-Package: junit.extensions;version="4.10.0",junit.framework;versi
|
||||
on="4.10.0",junit.runner;version="4.10.0",junit.textui;version="4.10.0",
|
||||
org.junit;version="4.10.0",org.junit.experimental;version="4.10.0",org.
|
||||
junit.experimental.categories;version="4.10.0",org.junit.experimental.
|
||||
max;version="4.10.0",org.junit.experimental.results;version="4.10.0",or
|
||||
g.junit.experimental.runners;version="4.10.0",org.junit.experimental.t
|
||||
heories;version="4.10.0",org.junit.experimental.theories.internal;vers
|
||||
ion="4.10.0";x-internal:=true,org.junit.experimental.theories.supplier
|
||||
s;version="4.10.0",org.junit.internal;version="4.10.0";x-internal:=true
|
||||
,org.junit.internal.builders;version="4.10.0";x-internal:=true,org.jun
|
||||
it.internal.matchers;version="4.10.0";x-internal:=true,org.junit.inter
|
||||
nal.requests;version="4.10.0";x-internal:=true,org.junit.internal.runn
|
||||
ers;version="4.10.0";x-internal:=true,org.junit.internal.runners.model
|
||||
;version="4.10.0";x-internal:=true,org.junit.internal.runners.statemen
|
||||
ts;version="4.10.0";x-internal:=true,org.junit.matchers;version="4.10.0
|
||||
",org.junit.rules;version="4.10.0",org.junit.runner;version="4.10.0",or
|
||||
g.junit.runner.manipulation;version="4.10.0",org.junit.runner.notifica
|
||||
tion;version="4.10.0",org.junit.runners;version="4.10.0",org.junit.runn
|
||||
ers.model;version="4.10.0"
|
||||
Bundle-Version: 4.10.0.v4_10_0_v20120426-0900
|
||||
Bundle-ManifestVersion: 2
|
@ -1,70 +0,0 @@
|
||||
### 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,362 +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)
|
||||
@@ -137,6 +137,7 @@
|
||||
<ant inheritall="false" antfile="pdebuild.xml">
|
||||
<property name="buildId" value="${buildId}" />
|
||||
<property name="buildArch" value="${buildArch}" />
|
||||
+ <property name="buildOs" value="${buildOs}" />
|
||||
<property name="buildDirectory" value="../../" />
|
||||
</ant>
|
||||
</target>
|
||||
@@ -406,7 +407,10 @@
|
||||
|
||||
<!-- Only build for one target (bug #293952) -->
|
||||
<copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
|
||||
- <replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
|
||||
+ <replace file="${buildConfigs}/eclipse-build-config/build.properties">
|
||||
+ <replacefilter token="@build_arch@" value="${buildArch}" />
|
||||
+ <replacefilter token="@build_os@" value="${buildOs}" />
|
||||
+ </replace>
|
||||
|
||||
|
||||
<!-- This one should be removed when Eclipse bug 369215 is fixed -->
|
||||
@@ -563,6 +567,7 @@
|
||||
<!--
|
||||
<ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
|
||||
<property name="arch" value="${buildArch}"/>
|
||||
+ <property os="os" value="${buildOs}"/>
|
||||
<property name="builder" value="${buildConfig}" />
|
||||
</ant>
|
||||
-->
|
||||
@@ -571,9 +576,9 @@
|
||||
|
||||
<target name="compile.libgnomeproxy">
|
||||
<!-- build libgnomeproxy -->
|
||||
- <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
|
||||
- <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
|
||||
- <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">
|
||||
@@ -585,16 +590,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" />
|
||||
@@ -602,8 +607,8 @@
|
||||
</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" />
|
||||
@@ -699,7 +704,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} " />
|
||||
@@ -743,6 +753,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} " />
|
||||
@@ -756,7 +761,7 @@
|
||||
<arg line="-consoleLog" />
|
||||
<arg line="-application org.eclipse.equinox.p2.publisher.ProductPublisher " />
|
||||
<arg line="-flavor tooling" />
|
||||
- <arg line="-configs gtk.linux.${buildArch}" />
|
||||
+ <arg line="-configs gtk.${buildOs}.${buildArch}" />
|
||||
<arg line="-productFile ${productFile}" />
|
||||
<arg line="-metadataRepository file:${reposource}" />
|
||||
<arg line="-artifactRepository file:${reposource}" />
|
||||
@@ -812,7 +817,7 @@
|
||||
<param name="p2.director.profile" value="${profileName}" />
|
||||
<param name="p2.director.install.path" value="${provisionDir}" />
|
||||
<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
|
||||
- <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}" />
|
||||
@@ -828,7 +833,7 @@
|
||||
<param name="p2.director.profile" value="${profileName}" />
|
||||
<param name="p2.director.install.path" value="${provisionDir}" />
|
||||
<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
|
||||
- <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}" />
|
||||
@@ -976,7 +981,7 @@
|
||||
<mkdir dir="${destDir}${prefix}/bin" />
|
||||
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
|
||||
<!-- Create the "swt.jar" and friends symlinks -->
|
||||
- <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
|
||||
+ <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
|
||||
<property name="swtjarpath" refid="swtjar" />
|
||||
<symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
@@ -995,7 +1000,7 @@
|
||||
<param name="p2.director.profile" value="PlatformProfile" />
|
||||
<param name="p2.director.install.path" value="${installationDir}" />
|
||||
<param name="p2.director.extraArgs" value="-purgeHistory" />
|
||||
- <param name="p2.os" value="linux" />
|
||||
+ <param name="p2.os" value="${buildOs}" />
|
||||
<param name="p2.ws" value="gtk" />
|
||||
<param name="p2.arch" value="${buildArch}" />
|
||||
<param name="p2.repo" value="${installationDir}" />
|
||||
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: buildTests.xml
|
||||
===================================================================
|
||||
--- buildTests.xml~ Wed Mar 28 11:50:23 2012
|
||||
+++ buildTests.xml Fri Jun 22 10:11:05 2012
|
||||
@@ -215,6 +215,8 @@
|
||||
-->
|
||||
<exec executable="${basedir}/runtests.sh" dir="${basedir}">
|
||||
<arg value="-t${timestamp}" />
|
||||
+ <arg value="-a${buildArch}" />
|
||||
+ <arg value="-o${buildOs}" />
|
||||
<arg value="-b ${testsBuildDirectory}" />
|
||||
<arg value="-p ${provisionWithTestsDir}" />
|
||||
<arg value="${testSwitches}" />
|
||||
Index: runtests.sh
|
||||
===================================================================
|
||||
--- runtests.sh (revision 23733)
|
||||
+++ 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++) {
|
@ -1,46 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# FreeBSD-specific startup script for Eclipse Platform
|
||||
#
|
||||
# See: http://www.eclipse.org
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
DEFAULT_JAVA_HOME=%%JAVA_HOME%%
|
||||
ECLIPSE_HOME=%%ECLIPSE_HOME%%
|
||||
DEFAULT_JAVA_CMD=java
|
||||
export GRE_HOME=%%LOCALBASE%%/lib/%%BROWSER%%
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Determine configuration settings
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
# Determine the JDK home directory
|
||||
if [ -z "${JAVA_HOME}" ]; then
|
||||
JAVA_HOME=${DEFAULT_JAVA_HOME}
|
||||
fi
|
||||
|
||||
# Determine 'java' executable
|
||||
if [ -z "${JAVACMD}" ]; then
|
||||
if [ -n "${JAVA_HOME}" ]; then
|
||||
JAVACMD="${JAVA_HOME}/bin/java"
|
||||
else
|
||||
JAVACMD=${DEFAULT_JAVACMD}
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if 'java' executable can be found
|
||||
if [ ! -x "$JAVACMD" ]; then
|
||||
echo "Error: JAVA_HOME is not defined correctly: ${JAVA_HOME}"
|
||||
echo " Unable to find ${JAVACMD}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check if 'eclipse' executable can be found
|
||||
if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then
|
||||
echo "Error: ECLIPSE_HOME is not defined correctly: ${ECLIPSE_HOME}"
|
||||
echo " Unable to find eclipse launcher binary"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} exec "${ECLIPSE_HOME}/eclipse" $@
|
File diff suppressed because it is too large
Load Diff
@ -1,71 +0,0 @@
|
||||
$FreeBSD$
|
||||
|
||||
--- eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF~ Mon Dec 19 16:40:57 2011
|
||||
+++ eclipse-build-914dc6de2bfc5ee5819a229cf4877f7043040a92/dependencyManifests/org.apache.commons.el_1.0.0.v200806031608.jar/META-INF/MANIFEST.MF Wed Feb 29 16:33:20 2012
|
||||
@@ -6,13 +6,13 @@
|
||||
Bundle-SymbolicName: org.apache.commons.el
|
||||
Export-Package: org.apache.commons.el;version="1.0.0",org.apache.commo
|
||||
ns.el.parser;version="1.0.0"
|
||||
-Bundle-Version: 1.0.0.v201004212143
|
||||
+Bundle-Version: 1.0.0.v201101211617
|
||||
Bundle-ManifestVersion: 2
|
||||
-Import-Package: javax.servlet;version="[2.4, 3.0)",javax.servlet.http;
|
||||
- version="[2.4, 3.0)",javax.servlet.jsp;version="[2.0, 2.1)",javax.ser
|
||||
- vlet.jsp.el;version="[2.0, 2.1)",javax.servlet.jsp.resources;version=
|
||||
- "[2.0, 2.1)",javax.servlet.jsp.tagext;version="[2.0, 2.1)",javax.serv
|
||||
- let.resources;version="[2.4, 3.0)"
|
||||
+Import-Package: javax.servlet;version="2.4",javax.servlet.http;
|
||||
+ version="2.4",javax.servlet.jsp;version="2.0",javax.ser
|
||||
+ vlet.jsp.el;version="2.0",javax.servlet.jsp.resources;version=
|
||||
+ "2.0",javax.servlet.jsp.tagext;version="2.0",javax.serv
|
||||
+ let.resources;version="2.4"
|
||||
|
||||
Name: org/apache/commons/el/ImplicitObjects$6.class
|
||||
SHA1-Digest: yk3eN531Co8H5mcmuI/jBgzMK7M=
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.el_2.2.0.v201108011116.jar/META-INF/MANIFEST.MF Tue Aug 7 14:18:09 2012
|
||||
@@ -9,7 +9,6 @@
|
||||
Export-Package: javax.el;version="2.2.0"
|
||||
Bundle-Version: 2.2.0.v201108011116
|
||||
Bundle-ManifestVersion: 2
|
||||
-Import-Package: javax.servlet;version="2.5.0",javax.servlet.http;versi
|
||||
- on="2.5.0"
|
||||
+DynamicImport-Package: org.apache.el
|
||||
|
||||
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet.jsp_2.2.0.v201112011158.jar/META-INF/MANIFEST.MF Tue Aug 7 14:20:50 2012
|
||||
@@ -11,7 +11,7 @@
|
||||
rvlet.jsp.tagext;version="2.2.0"
|
||||
Bundle-Version: 2.2.0.v201112011158
|
||||
Bundle-ManifestVersion: 2
|
||||
-Import-Package: javax.el;version="2.2.0",javax.servlet;version="2.6.0"
|
||||
- ,javax.servlet.http;version="2.6.0"
|
||||
+Import-Package: javax.el;version="2.2.0",javax.servlet;version="3.0"
|
||||
+ ,javax.servlet.http;version="3.0",javax.servlet.resources;version="3.0"
|
||||
|
||||
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencyManifests/javax.servlet_3.0.0.v201112011016.jar/META-INF/MANIFEST.MF Tue Aug 7 17:18:42 2012
|
||||
@@ -7,12 +7,14 @@
|
||||
Bundle-SymbolicName: javax.servlet
|
||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
|
||||
ls:org.eclipse.orbit/javax.servlet;tag=v201112011016
|
||||
-Export-Package: javax.servlet;version="2.6.0";uses:="javax.servlet.ann
|
||||
- otation,javax.servlet.descriptor",javax.servlet.annotation;version="2
|
||||
- .6.0";uses:="javax.servlet",javax.servlet.descriptor;version="2.6.0",
|
||||
- javax.servlet.http;version="2.6.0";uses:="javax.servlet",javax.servle
|
||||
- t.resources;version="2.6.0"
|
||||
Bundle-Version: 3.0.0.v201112011016
|
||||
Bundle-ManifestVersion: 2
|
||||
-
|
||||
-
|
||||
+Export-Package: javax.servlet;version="3.0",
|
||||
+ javax.servlet;version="2.6",
|
||||
+ javax.servlet.http;version="3.0",
|
||||
+ javax.servlet.http;version="2.6",
|
||||
+ javax.servlet.annotation;version="2.6",
|
||||
+ javax.servlet.descriptor;version="3.0",
|
||||
+ javax.servlet.descriptor;version="2.6",
|
||||
+ javax.servlet.resources;version="3.0",
|
||||
+ javax.servlet.resources;version="2.6"
|
@ -1,493 +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
|
||||
@@ -11,7 +11,7 @@
|
||||
skipFetch=true
|
||||
individualSourceBundles=true
|
||||
ws=gtk
|
||||
-os=linux
|
||||
+os=freebsd
|
||||
includeLaunchers=true
|
||||
runPackager=true
|
||||
groupConfigurations=true
|
||||
@@ -27,7 +27,7 @@
|
||||
collectingFolder=eclipse
|
||||
archivePrefix=eclipse
|
||||
generateFeatureVersionSuffix=true
|
||||
-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
|
||||
@@ -121,11 +121,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>
|
||||
|
||||
<target name="bootstrap" unless="bootstrapped">
|
||||
@@ -180,8 +180,7 @@
|
||||
<target name="copySource" unless="sdkSourcePresent">
|
||||
<echo message="Copy SDK source (cp -rd --not-target-directory eclipse ${buildDirectory})" />
|
||||
<exec executable="cp" failonerror="true">
|
||||
- <arg value="-rd" />
|
||||
- <arg value="--no-target-directory" />
|
||||
+ <arg value="-R" />
|
||||
<arg value="eclipse" />
|
||||
<arg value="${buildDirectory}" />
|
||||
</exec>
|
||||
@@ -365,32 +364,38 @@
|
||||
|
||||
<target name="applyPatches" depends="insertBuildId" unless="patch.complete">
|
||||
|
||||
- <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
|
||||
- <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
|
||||
- <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1" backups="true"/>
|
||||
- <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
|
||||
- <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2" backups="true"/>
|
||||
+ <patch patchfile="${basedir}/patches/stableUserHome.patch" dir="${buildDirectory}/plugins" strip="1"/>
|
||||
+ <patch patchfile="${basedir}/patches/doNotRunAsRoot.patch" dir="${buildDirectory}/plugins" strip="1"/>
|
||||
+ <patch patchfile="${basedir}/patches/pickUpRenamedJars.patch" dir="${buildDirectory}/plugins" strip="1"/>
|
||||
+ <patch patchfile="${basedir}/patches/populateUpdateSites.patch" dir="${buildDirectory}/plugins" strip="2"/>
|
||||
+ <patch patchfile="${basedir}/patches/eclipse-p2-uninstall-removed-content.patch" dir="${buildDirectory}/plugins" strip="2"/>
|
||||
|
||||
<!-- eclipse-build-only patches -->
|
||||
|
||||
<patch patchfile="${basedir}/patches/e4-remove-w3c-smil-and-use-geronimo.patch" dir="${buildDirectory}" strip="0" reverse="false"/>
|
||||
- <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" backups="true" />
|
||||
+ <patch patchfile="${basedir}/patches/nocoreupdate.patch" dir="${buildDirectory}" strip="0" reverse="false" />
|
||||
|
||||
- <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1" backups="true"/>
|
||||
- <patch patchfile="${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" dir="${buildDirectory}" strip="1" />
|
||||
+ <patch patchfile="${basedir}/patches/eclipse-buildswtnatives.patch" dir="${buildDirectory}" strip="1"/>
|
||||
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
|
||||
+ <arg value="-p1" />
|
||||
+ <arg value="-i${basedir}/patches/eclipse-addArchesAnd64bitSWT.patch" />
|
||||
+ </exec>
|
||||
<patch patchfile="${basedir}/patches/eclipse-add-archs-filesystem.patch" dir="${buildDirectory}" strip="1" />
|
||||
- <patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2" backups="true"/>
|
||||
+ <patch patchfile="${basedir}/patches/e4-add-archs-swt.patch" dir="${buildDirectory}" strip="2"/>
|
||||
<patch patchfile="${basedir}/patches/eclipse-add-archs-executable.patch" dir="${buildDirectory}" strip="1" />
|
||||
<patch patchfile="${basedir}/patches/s390-correctly-build-executable.patch" dir="${buildDirectory}" strip="1"/>
|
||||
<patch patchfile="${basedir}/patches/eclipse-add-archs-net.patch" dir="${buildDirectory}" strip="1" />
|
||||
<patch patchfile="${basedir}/patches/eclipse-add-ppc64-sparc64-s390-s390x.patch" dir="${buildDirectory}" strip="1" />
|
||||
|
||||
<patch patchfile="${basedir}/patches/fix-gnomeproxy-includes.patch" dir="${buildDirectory}" strip="1" />
|
||||
- <patch patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch" dir="${buildDirectory}" strip="1" />
|
||||
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
|
||||
+ <arg value="-p1" />
|
||||
+ <arg value="-i${basedir}/patches/donotstorebuildlogsinfiles.patch" />
|
||||
+ </exec>
|
||||
|
||||
<patch patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch" dir="${buildDirectory}" strip="1" />
|
||||
|
||||
- <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2" backups="true"/>
|
||||
+ <patch patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch" dir="${buildDirectory}" strip="2"/>
|
||||
|
||||
<patch patchfile="${basedir}/patches/eclipse-help-feature-adjust-dependencies.patch" dir="${buildDirectory}" strip="1" />
|
||||
<patch patchfile="${basedir}/patches/eclipse-help-fix-webapp-jsp-compilation.patch" dir="${buildDirectory}/plugins" strip="1"/>
|
||||
@@ -424,11 +429,16 @@
|
||||
<!-- Point (2) implies that you cannot use PDE build.xml, because there is no source folder, so nothing will be compiled -->
|
||||
<!-- Point (1) implies that developers will not create a source folder, because they want to ship binaries -->
|
||||
<!-- So we have to live with those two patches -->
|
||||
- <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0" backups="true"/>
|
||||
+ <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="0"/>
|
||||
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="0" />
|
||||
|
||||
<patch patchfile="${basedir}/patches/nonRelativeLicense.patch" dir="${buildDirectory}" strip="0" />
|
||||
|
||||
+ <exec executable="${localbase}/bin/gpatch" dir="${buildDirectory}">
|
||||
+ <arg value="-p2" />
|
||||
+ <arg value="-i${basedir}/patches/freebsd-support.patch" />
|
||||
+ </exec>
|
||||
+
|
||||
<!-- jsr14 is practically unusable with java7 -->
|
||||
<antcall target="jsr14To15" />
|
||||
|
||||
@@ -952,34 +962,29 @@
|
||||
<target name="installIntoDestDir">
|
||||
<mkdir dir="${installationDir}" />
|
||||
<exec executable="rsync" failonerror="true">
|
||||
- <arg value="-vrpl" />
|
||||
+ <arg value="-vrpL" />
|
||||
<arg value="--exclude=dropins" />
|
||||
<arg value="${provisionDir}/" />
|
||||
<arg value="${installationDir}/" />
|
||||
</exec>
|
||||
|
||||
<!-- 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}" />
|
||||
- <chmod file="${efj}" perm="ugo+rx"/>
|
||||
+ <copy file="eclipse.desktop" tofile="${destDir}${prefix}/share/applications/%%PORTNAME%%.desktop" />
|
||||
<fileset id="equinoxLauncher" dir="${installationDir}/plugins">
|
||||
<include name="org.eclipse.equinox.launcher_*.jar" />
|
||||
</fileset>
|
||||
<property name="launcherJar" refid="equinoxLauncher"/>
|
||||
- <replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
|
||||
<!-- install icons -->
|
||||
- <copy file="${buildDirectory}/plugins/org.eclipse.platform/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/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/eclipse.png" />
|
||||
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/%%PORTNAME%%.png" />
|
||||
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse48.png" tofile="${destDir}${prefix}/share/icons/hicolor/48x48/apps/%%PORTNAME%%.png" />
|
||||
+ <copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse256.png" tofile="${destDir}${prefix}/share/icons/hicolor/256x256/apps/%%PORTNAME%%.png" />
|
||||
<mkdir dir="${destDir}${prefix}/share/pixmaps" />
|
||||
- <symlink link="${destDir}${prefix}/share/pixmaps/eclipse.png" resource="../icons/hicolor/256x256/apps/eclipse.png" overwrite="true"/>
|
||||
+ <symlink link="${destDir}${prefix}/share/pixmaps/%%PORTNAME%%.png" resource="../icons/hicolor/256x256/apps/%%PORTNAME%%.png" overwrite="true"/>
|
||||
<!--shared dropins folder for architecture-independent plugins-->
|
||||
- <mkdir dir="${destDir}${prefix}/share/eclipse/dropins" />
|
||||
+ <mkdir dir="${destDir}${prefix}/share/%%PORTNAME%%/dropins" />
|
||||
<!-- 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" />
|
||||
@@ -987,7 +992,7 @@
|
||||
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" overwrite="true"/>
|
||||
|
||||
- <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 -->
|
||||
<antcall target="extractSos">
|
||||
@@ -1008,7 +1013,7 @@
|
||||
|
||||
<!-- copy PDE and JDT to dropins -->
|
||||
<exec executable="rsync" failonerror="true">
|
||||
- <arg value="-vrpl" />
|
||||
+ <arg value="-vrpL" />
|
||||
<arg value="${provisionDir}/dropins/" />
|
||||
<arg value="${installationDir}/dropins/" />
|
||||
</exec>
|
||||
@@ -1041,8 +1046,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" />
|
||||
@@ -1063,7 +1068,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}">
|
||||
@@ -1078,9 +1083,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>
|
||||
|
||||
@@ -1095,8 +1102,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>
|
||||
@@ -1112,16 +1118,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>
|
||||
@@ -1138,8 +1142,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,10 +1,10 @@
|
||||
buildArch=x86
|
||||
ws=gtk
|
||||
-os=linux
|
||||
+os=freebsd
|
||||
|
||||
buildId=I20120608-1400
|
||||
label=4.2.0-I20120608-1400
|
||||
-bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar:/usr/lib64/jvm/java/jre/lib/rt.jar:/usr/lib64/jvm/java/jre/lib/jce.jar
|
||||
+bootclasspath=%%BOOTCLASSPATH%%
|
||||
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
|
||||
|
||||
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/dependencies.properties.orig Thu Jun 30 16:45:54 2011
|
||||
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/dependencies.properties Thu Jun 30 16:46:18 2011
|
||||
@@ -10,7 +10,7 @@
|
||||
javax.servlet_3.0.0.v201112011016.jar=/usr/share/java/tomcat/tomcat-servlet-3.0-api.jar
|
||||
javax.servlet.jsp_2.2.0.v201112011158.jar=/usr/share/java/tomcat/tomcat-jsp-2.2-api.jar
|
||||
javax.el_2.2.0.v201108011116.jar=/usr/share/java/tomcat/tomcat-el-2.2-api.jar
|
||||
-javax.xml_1.0.1.v200903091627.jar=/usr/share/java/xml-commons-apis.jar
|
||||
+javax.xml_1.3.4.v201005080400.jar=/usr/share/java/xml-commons-apis.jar
|
||||
org.apache.batik.css_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-css.jar
|
||||
org.apache.batik.util_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-util.jar
|
||||
org.apache.batik.util.gui_1.6.0.v201011041432.jar=/usr/share/java/batik/batik-gui-util.jar
|
||||
@@ -18,7 +18,7 @@
|
||||
org.apache.juli_7.0.21.jar=/usr/share/java/tomcat/tomcat-juli.jar
|
||||
org.apache.el_7.0.21.jar=/usr/share/java/tomcat/jasper-el.jar
|
||||
org.apache.commons.codec_1.3.0.v201101211617.jar=/usr/share/java/commons-codec.jar
|
||||
-org.apache.commons.el_1.0.0.v200806031608.jar=/usr/share/java/commons-el.jar
|
||||
+org.apache.commons.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.felix.gogo.command_0.8.0.v201108120515.jar=/usr/share/java/felix/org.apache.felix.gogo.command.jar
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/dependencies/nonosgidependencies.properties Wed Jul 25 18:03:02 2012
|
||||
@@ -20,10 +20,3 @@
|
||||
org.apache.ant_1.8.3.v20120321-1730/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
|
||||
org.apache.ant_1.8.3.v20120321-1730/lib/ant-testutil.jar=/usr/share/java/ant/ant-testutil.jar:/usr/share/java/ant-testutil.jar
|
||||
org.apache.ant_1.8.3.v20120321-1730/lib/ant.jar=/usr/share/java/ant.jar
|
||||
-#bin folder
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/ant=/usr/bin/ant
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun=/usr/bin/antRun
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/antRun.pl=/usr/bin/antRun.pl
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.pl=/usr/bin/runant.pl
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/runant.py=/usr/bin/runant.py
|
||||
-org.apache.ant_1.8.3.v20120321-1730/bin/complete-ant-cmd.pl=/usr/bin/complete-ant-cmd.pl
|
||||
--- eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties.orig Fri Jul 1 20:12:45 2011
|
||||
+++ eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5/dependencies/sdkdependencies.properties Fri Jul 1 20:16:04 2011
|
||||
@@ -1,1 +1,1 @@
|
||||
-org.objectweb.asm_3.3.1.v201101071600.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
|
||||
+org.objectweb.asm_3.3.1.v201105211655.jar=/usr/share/java/objectweb-asm/asm-all.jar:/usr/share/java/asm3-all.jar
|
||||
--- 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
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/additionalArchs/rename.sh Fri Jun 29 15:04:36 2012
|
||||
@@ -4,13 +4,13 @@
|
||||
newArch=$2
|
||||
|
||||
moves(){
|
||||
-for f in $(find -type d); do
|
||||
+for f in $(find . -type d); do
|
||||
tofile=$(echo $f | sed "s/$baseArch/$newArch/")
|
||||
if [ $tofile != $f ]; then
|
||||
cp -pfr $f $tofile
|
||||
fi
|
||||
done
|
||||
-for f in $(find -type f); do
|
||||
+for f in $(find . -type f); do
|
||||
tofile=$(echo $f | sed "s/$baseArch/$newArch/")
|
||||
if [ $tofile != $f ]; then
|
||||
cp -pfr $f $tofile
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform/p2.inf Wed Aug 8 13:48:10 2012
|
||||
@@ -56,3 +56,20 @@
|
||||
units.3.touchpoint.version=1.0.0
|
||||
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
||||
+
|
||||
+requires.4.namespace=org.eclipse.equinox.p2.iu
|
||||
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
|
||||
+requires.4.range=[1.0.0,1.0.0]
|
||||
+requires.4.greedy=true
|
||||
+
|
||||
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+units.4.version=1.0.0
|
||||
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
|
||||
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+units.4.provides.1.version=1.0.0
|
||||
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
|
||||
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
|
||||
+units.4.touchpoint.version=1.0.0
|
||||
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
||||
--- eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf~ Thu Jun 28 12:02:14 2012
|
||||
+++ eclipse-build-7b07d10488eb9d6e2880eac320b09c16d1ae78e3/eclipse-build-config/productFiles/platform.sdk/p2.inf Wed Aug 8 13:55:04 2012
|
||||
@@ -56,3 +56,20 @@
|
||||
units.3.touchpoint.version=1.0.0
|
||||
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
||||
+
|
||||
+requires.4.namespace=org.eclipse.equinox.p2.iu
|
||||
+requires.4.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+requires.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
|
||||
+requires.4.range=[1.0.0,1.0.0]
|
||||
+requires.4.greedy=true
|
||||
+
|
||||
+units.4.id=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+units.4.version=1.0.0
|
||||
+units.4.provides.1.namespace=org.eclipse.equinox.p2.iu
|
||||
+units.4.provides.1.name=toolingorg.eclipse.configuration.gtk.freebsd.x86_64
|
||||
+units.4.provides.1.version=1.0.0
|
||||
+units.4.filter=(&(osgi.os=freebsd) (osgi.arch=x86_64) (osgi.ws=gtk))
|
||||
+units.4.touchpoint.id=org.eclipse.equinox.p2.osgi
|
||||
+units.4.touchpoint.version=1.0.0
|
||||
+units.4.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
|
||||
+units.4.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
|
@ -1,8 +0,0 @@
|
||||
The Eclipse Platform is an open extensible IDE for anything and yet
|
||||
nothing in particular. The Eclipse Platform provides building blocks
|
||||
and a foundation for constructing and running integrated software-
|
||||
development tools. The Eclipse Platform allows tool builders to
|
||||
independently develop tools that integrate with other people's tools
|
||||
so seamlessly you can't tell where one tool ends and another starts.
|
||||
|
||||
WWW: http://www.eclipse.org/
|
Loading…
Reference in New Issue
Block a user