summaryrefslogtreecommitdiff
path: root/java/eclipse/files/eclipse-build-upstream.patch
diff options
context:
space:
mode:
authorJohn Marino <marino@FreeBSD.org>2014-06-26 08:48:10 +0000
committerJohn Marino <marino@FreeBSD.org>2014-06-26 08:48:10 +0000
commit7a492ac2b5daaba7f244d452f3488dc5aaf9d8af (patch)
tree372bec47be6eb6b2b86781c1263f75844c105264 /java/eclipse/files/eclipse-build-upstream.patch
parentAllow to build with texinfo from ports (diff)
java/eclipse: Update version 3.7.1 => 4.3.2 and assign maintainer
At long last, eclipse has been updated to the latest release and is now under the stewardship of Jimmy Kelly. This version supports OpenJDK8 runtime environments. A special thanks to Jonathan Chen for getting the ball rolling after the PR stalled. PR: 188659 Submitted by: Jimmy Kelly Distfiles by: Jonathan Chen Verified by: F10/amd64 poudriere
Notes
Notes: svn path=/head/; revision=359322
Diffstat (limited to 'java/eclipse/files/eclipse-build-upstream.patch')
-rw-r--r--java/eclipse/files/eclipse-build-upstream.patch357
1 files changed, 0 insertions, 357 deletions
diff --git a/java/eclipse/files/eclipse-build-upstream.patch b/java/eclipse/files/eclipse-build-upstream.patch
deleted file mode 100644
index d4c5991762b7..000000000000
--- a/java/eclipse/files/eclipse-build-upstream.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-### Eclipse Workspace Patch 1.0
-#P eclipse-build
-Index: generatebuild.xml
-===================================================================
---- generatebuild.xml (revision 23733)
-+++ generatebuild.xml (working copy)
-@@ -5,7 +5,7 @@
- <target name="genBuild">
- <echo message="About to generate source bundles and build.xml files" />
- <eclipse.buildScript elements="feature@${featureToBuild}"
-- configInfo="linux,gtk,${buildArch}"
-+ configInfo="${buildOs},gtk,${buildArch}"
- buildingosgi="true"
- recursivegeneration="true"
- builddirectory="${buildDirectory}"
-Index: build.xml
-===================================================================
---- build.xml (revision 23733)
-+++ build.xml (working copy)
-@@ -131,7 +131,8 @@
- <ant inheritall="false" antfile="pdebuild.xml">
- <property name="buildId" value="${buildId}" />
- <property name="buildArch" value="${buildArch}" />
-- <property name="buildDirectory" value="../../" />
-+ <property name="buildOs" value="${buildOs}" />
-+ <property name="buildDirectory" value="../../" />
- </ant>
- </target>
-
-@@ -312,7 +313,10 @@
- <!-- end eclipse-build-only patches -->
- <!-- Only build for one target (bug #293952) -->
- <copy file="${buildConfigs}/eclipse-build-config/build.properties.in" tofile="${buildConfigs}/eclipse-build-config/build.properties" />
-- <replace file="${buildConfigs}/eclipse-build-config/build.properties" token="@build_arch@" value="${buildArch}" />
-+ <replace file="${buildConfigs}/eclipse-build-config/build.properties">
-+ <replacefilter token="@build_arch@" value="${buildArch}" />
-+ <replacefilter token="@build_os@" value="${buildOs}" />
-+ </replace>
- <patch patchfile="${basedir}/patches/eclipse-core-resources-compilation-profile.patch" dir="${buildDirectory}" strip="0" />
- <patch patchfile="${basedir}/patches/eclipse-equinox-util.patch" dir="${buildDirectory}" strip="0" />
- <echo file="patch-stamp" />
-@@ -399,6 +403,7 @@
- <!--
- <ant antfile="build.xml" dir="${eclipse.pdebuild.scripts}">
- <property name="arch" value="${buildArch}"/>
-+ <property os="os" value="${buildOs}"/>
- <property name="builder" value="${buildConfig}" />
- </ant>
- -->
-@@ -462,9 +467,9 @@
-
- <target name="compile.libgnomeproxy" if="build.libgnomeproxy">
- <!-- build libgnomeproxy -->
-- <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
-- <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
-- <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
-+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}" executable="make" failonerror="true" />
-+ <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.${buildOs}.${buildArch}/" />
-+ <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/${buildOs}/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.${buildOs}.${buildArch}/" />
- </target>
-
- <target name="compilelibs" unless="compilelibs.complete">
-@@ -476,16 +481,16 @@
- <include name="**/*.so" />
- </fileset>
- </delete>
-- <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
-+ <ant antfile="build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.${buildOs}.${buildArch}" />
-
- <property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
- <exec dir="${launcherlibs}/library/gtk/" executable="sh" failonerror="true">
- <arg line="build.sh" />
- </exec>
-
-- <property name="launcherfragment" value="org.eclipse.equinox.launcher.gtk.linux.${buildArch}" />
-+ <property name="launcherfragment" value="org.eclipse.equinox.launcher.gtk.${buildOs}.${buildArch}" />
-
-- <copy file="${launcherlibs}/library/gtk/eclipse" todir="${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/${buildArch}/" />
-+ <copy file="${launcherlibs}/library/gtk/eclipse" todir="${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/${buildOs}/${buildArch}/" />
- <copy todir="${buildDirectory}/plugins/${launcherfragment}">
- <fileset dir="${launcherlibs}/library/gtk">
- <include name="**/*.so" />
-@@ -493,13 +498,13 @@
- </copy>
-
- <!-- build liblocalfile -->
-- <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
-- <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
-+ <exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}" executable="make" failonerror="true" />
-+ <move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/${buildOs}/libunixfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.${buildOs}.${buildArch}/os/${buildOs}/${buildArch}">
- </move>
- <!-- build libgnomeproxy -->
- <antcall target="compile.libgnomeproxy" />
- <!-- build libupdate -->
-- <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
-+ <ant dir="${buildDirectory}/plugins/org.eclipse.update.core.${buildOs}/src" antfile="build.xml" />
-
- <echo file="compilelibs-stamp" />
- </target>
-@@ -593,7 +598,7 @@
- <arg line="-application org.eclipse.ant.core.antRunner " />
- <arg line="-buildfile buildConfiguration.xml" />
- <arg line="-propertyfile ${basedir}/build.properties " />
-- <arg line="-Dconfigs=linux,gtk,${buildArch} " />
-+ <arg line="-Dconfigs=${buildOs},gtk,${buildArch} " />
- <arg line="-Dreposource=${reposource} " />
- <arg line="-Dbasedir=${productFiles}/rcpConfig" />
- <arg line="-DbuildId=${buildId} " />
-@@ -631,6 +636,7 @@
- <arg line="-buildfile publishProduct.xml" />
- <arg line="-propertyfile ${basedir}/build.properties " />
- <arg line="-DbuildArch=${buildArch} " />
-+ <arg line="-DbuildOs=${buildOs} " />
- <arg line="-Dreposource=${reposource} " />
- <arg line="-DbuildConfig=${buildConfig} " />
- <arg line="-DproductFile=${productFile} " />
-@@ -721,7 +727,7 @@
- <param name="p2.director.profile" value="${profileName}" />
- <param name="p2.director.install.path" value="${provisionDir}" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
-- <param name="p2.os" value="linux" />
-+ <param name="p2.os" value="${buildOs}" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="${buildArch}" />
- <param name="p2.repo" value="${reposource}" />
-@@ -750,7 +753,7 @@
- <param name="p2.director.profile" value="${profileName}" />
- <param name="p2.director.install.path" value="${provisionDir}" />
- <param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
-- <param name="p2.os" value="linux" />
-+ <param name="p2.os" value="${buildOs}" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="${buildArch}" />
- <param name="p2.repo" value="${reposource}" />
-@@ -800,6 +806,8 @@
- -->
- <exec executable="${basedir}/runtests.sh" dir="${basedir}">
- <arg value="-t${timestamp}" />
-+ <arg value="-a${buildArch}" />
-+ <arg value="-o${buildOs}" />
- <arg value="-b ${testsBuildDirectory}" />
- <arg value="-p ${provisionDir}" />
- <arg value="${testSwitches}" />
-@@ -924,7 +932,7 @@
- <property name="startupjarpath" refid="startupjar" />
- <symlink link="${installationDir}/startup.jar" resource="plugins/${startupjarpath}" />
- <!-- Create the "swt.jar" and friends symlinks -->
-- <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.linux.${buildArch}_*" id="swtjar" />
-+ <fileset dir="${installationDir}/plugins" includes="org.eclipse.swt.gtk.${buildOs}.${buildArch}_*" id="swtjar" />
- <property name="swtjarpath" refid="swtjar" />
- <symlink link="${installationDir}/swt-gtk-${label}.jar" resource="plugins/${swtjarpath}" />
- <symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
-@@ -1061,7 +1074,7 @@
- <param name="p2.director.profile" value="PlatformProfile" />
- <param name="p2.director.install.path" value="${installationDir}" />
- <param name="p2.director.extraArgs" value="-purgeHistory" />
-- <param name="p2.os" value="linux" />
-+ <param name="p2.os" value="${buildOs}" />
- <param name="p2.ws" value="gtk" />
- <param name="p2.arch" value="${buildArch}" />
- <param name="p2.repo" value="${installationDir}" />
-Index: pdebuild.xml
-===================================================================
---- pdebuild.xml (revision 23733)
-+++ pdebuild.xml (working copy)
-@@ -88,7 +88,7 @@
- <filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
-
- <property name="depsDirs2Property"
-- value="org.eclipse.swt.gtk.linux.${buildArch}
-+ value="org.eclipse.swt.gtk.${buildOs}.${buildArch}
- org.eclipse.core.filesystem
- org.eclipse.core.resources
- org.eclipse.core.commands
-@@ -214,12 +214,14 @@
- <subant>
- <property name="buildId" value="${buildId}" />
- <property name="buildArch" value="${buildArch}" />
-+ <property name="buildOs" value="${buildOs}" />
- <property file="pdebuild.properties" />
- <filelist refid="depsDirs" />
- </subant>
- <subant>
- <property name="buildId" value="${buildId}" />
- <property name="buildArch" value="${buildArch}" />
-+ <property name="buildOs" value="${buildOs}" />
- <property file="pdebuild.properties" />
- <filelist refid="helpDirs" />
- </subant>
-@@ -245,6 +247,7 @@
- <arg line="-application org.eclipse.ant.core.antRunner " />
- <arg line="-buildfile ../pdebuild.xml generateScripts2" />
- <arg line="-DbuildArch=${buildArch} " />
-+ <arg line="-DbuildOs=${buildOs} " />
- <arg line="-DbuildId=${buildId} " />
- <arg line="-debug -consolelog" />
- </java>
-@@ -287,10 +288,10 @@
- <target name="removeGeneratedBuildXMLs" depends="zipPlugins2">
- <fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins"
- excludes="**/org.eclipse.swt.gtk.*/*,
-- **/org.eclipse.update.core.linux/**/*,
-+ **/org.eclipse.update.core.${buildOs}/**/*,
- **/org.eclipse.pde.build/scripts/*,
- **/org.eclipse.jdt.core/scripts/*,
-- **/org.eclipse.update.core.linux/src/*,
-+ **/org.eclipse.update.core.${buildOs}/src/*,
- **/org.eclipse.jdt.doc.isv/*,
- **/org.eclipse.swt/*,
- **/org.eclipse.jdt.doc.user/*"
-Index: publishProduct.xml
-===================================================================
---- publishProduct.xml (revision 23733)
-+++ publishProduct.xml (working copy)
-@@ -1,7 +1,7 @@
- <project name="Eclipse SDK build" default="publish" basedir=".">
- <target name="publish">
- <p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${productFile}" compress="true">
-- <config os="linux" ws="gtk" arch="${buildArch}" />
-+ <config os="${buildOs}" ws="gtk" arch="${buildArch}" />
- <advice kind="featureVersions" file="${buildDirectory}/finalFeaturesVersions.properties" />
- <advice kind="pluginVersions" file="${buildDirectory}/finalPluginsVersions.properties" />
- </p2.publish.product>
-Index: runtests.sh
-===================================================================
---- runtests.sh (revision 23733)
-+++ runtests.sh (working copy)
-@@ -16,6 +16,8 @@
- -b Tests build directory
- -p Clean installation directory to copy for running test suites
- -t Timestamp string with which to tag the results
-+ -a Architecture to run the tests on
-+ -o OS to run the tests on
- -v Make test runs output to the console
- _EOF_
- }
-@@ -83,6 +85,8 @@
- headless=1
- fi
-
-+ buildOs=linux
-+
- label=$(grep label build.properties | sed s/label=//)
- testframework=$(grep ^testframework build.properties | sed s/testframework=//)
-
-@@ -142,21 +146,16 @@
- if [ ${headless} == 1 ]; then
- # Try to find Xvnc
- xvnc=
-- if [ -a /usr/bin/Xvnc ]
-- then
-- xvnc=/usr/bin/Xvnc
-- setupXvnc
-- else
-- if [ -a /usr/X11/bin/Xvnc ]
-- then
-- xvnc=/usr/X11/bin/Xvnc
-+ for _xvnc in /usr/bin/Xvnc /usr/X11/bin/Xvnc /usr/local/bin/Xvnc; do
-+ if [ -a $_xvnc ]; then
-+ xvnc=$_xvnc
- setupXvnc
-- else
-- echo "Couldn't find Xvnc (/usr/bin/Xvnc or /usr/X11/bin/Xvnc). Using DISPLAY=0:0"
-- DISPLAY=`$HOST`:0.0
-+ break
- fi
-+ done
-+ if [ "x$xvnc" = "x" ]; then
-+ echo "Couldn't find Xvnc. Using default DISPLAY from environment"
- fi
-- export DISPLAY
- fi
- }
-
-@@ -165,9 +164,11 @@
- port=`expr '(' $RANDOM '*' 9 / 32767 ')' + 58`
- echo localhost > Xvnc.cfg
- echo "Setting up Xvnc on port ${port} with password VNCpassword1"
-- $xvnc :$port -screen 1 1024x768x32 -auth Xvnc.cfg -localhost -PasswordFile eclipse-tests-vncpwd &> Xvnc.log &
-+ $xvnc :$port -geometry 1024x768 -depth 24 -auth Xvnc.cfg -localhost -rfbauth eclipse-tests-vncpwd &> Xvnc.log &
- Xvncpid=$!
-- DISPLAY=`$HOST`:$port
-+ DISPLAY=$HOST:$port
-+ export DISPLAY
-+
- }
-
- function setArch() {
-@@ -186,13 +187,15 @@
- arch=ia64 ;;
- ppc)
- arch=ppc ;;
-- x86_64)
-+ x86_64|amd64)
- arch=x86_64 ;;
- *)
- echo "Unrecognized architecture: $arch" 1>&2
- exit 1 ;;
- esac
- echo >&2 "Architecture not specified. Assuming host architecture: $arch"
-+ else
-+ arch=$buildArch
- fi
- }
-
-@@ -206,7 +209,7 @@
- -application org.eclipse.ant.core.antRunner \
- -file $testDriver \
- -Declipse-home=${eclipseHome} \
-- -Dos=linux \
-+ -Dos=${buildOs} \
- -Dws=gtk \
- -Darch=${arch} \
- -Dlibrary-file=$libraryXml \
-@@ -214,7 +217,7 @@
- -logger org.apache.tools.ant.DefaultLogger \
- -vmargs \
- -Duser.home=${homedir} \
-- -Dosgi.os=linux \
-+ -Dosgi.os=${buildOs} \
- -Dosgi.ws=gtk \
- -Dosgi.arch=${arch}
- else
-@@ -348,7 +351,7 @@
- }
-
- # Command-line arguments
--while getopts "vde:gb:p:t:h" OPTION
-+while getopts "vde:gb:p:t:a:o:h" OPTION
- do
- case $OPTION in
- d)
-@@ -366,6 +369,12 @@
- p)
- provisionDir=$OPTARG
- ;;
-+ a)
-+ buildArch=$OPTARG
-+ ;;
-+ o)
-+ buildOs=$OPTARG
-+ ;;
- h)
- usage
- exit 1
---- task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java~ Thu Feb 25 21:14:10 2010
-+++ task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java Fri Nov 5 11:39:46 2010
-@@ -36,8 +36,8 @@
- for (Iterator<Object> jarIter = jarLocations.iterator(); jarIter.hasNext();) {
-
- String origLocation = (String) jarIter.next();
-
-- String systemLocations = (String) dependencies.get(origLocation);
-+ String systemLocations = getProject().replaceProperties((String) dependencies.get(origLocation));
- String[] systemLocationList = systemLocations.split(":");
- String attemptedLocations = "";
- for (int j = 0; j < systemLocationList.length; j++) {