--- eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse-platform-parent/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -77,9 +77,9 @@ 'eclipiserun-repo' repository, such as for computing .api-descriptions and generating API Tools reports. --> - https://download.eclipse.org/eclipse/updates/4.32-I-builds/ + https://download.eclipse.org/eclipse/updates/4.32/ - https://download.eclipse.org/eclipse/updates/4.32-I-builds + https://download.eclipse.org/eclipse/updates/4.32 https://repo.eclipse.org/content/repositories/tycho-snapshots/ @@ -246,6 +246,26 @@ + freebsd + gtk + x86_64 + + + freebsd + gtk + powerpc64 + + + freebsd + gtk + powerpc64le + + + freebsd + gtk + aarch64 + + linux gtk x86_64 @@ -809,7 +829,7 @@ For maintenance streams should always be "M-builds". Ideally, this value would be provided by the environment, see bug 489789. --> - https://download.eclipse.org/eclipse/updates/4.32-I-builds + https://download.eclipse.org/eclipse/updates/4.32 --- eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/scripts/productBuild/allElements.xml 0000-00-00 00:00:00.000000000 +0000 @@ -66,6 +66,13 @@ + + + + + + + --- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/Utils.java 0000-00-00 00:00:00.000000000 +0000 @@ -646,7 +646,7 @@ arguments.add("-sf"); //$NON-NLS-1$ arguments.add(links[i]); arguments.add(links[i + 1]); - script.printExecTask("ln", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ + script.printExecTask("ln", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ arguments.clear(); } } --- eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java 0000-00-00 00:00:00.000000000 +0000 @@ -922,7 +922,7 @@ for (int i = 0; i < links.length; i += 2) { arguments.add(links[i]); arguments.add(links[i + 1]); - script.printExecTask("ln -s", dir, arguments, "Linux"); //$NON-NLS-1$ //$NON-NLS-2$ + script.printExecTask("ln -s", dir, arguments, "Linux,FreeBSD"); //$NON-NLS-1$ //$NON-NLS-2$ arguments.clear(); } } --- eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/JNLPGenerator.java 0000-00-00 00:00:00.000000000 +0000 @@ -325,6 +325,8 @@ return "Mac"; //$NON-NLS-1$ if ("linux".equalsIgnoreCase(os)) //$NON-NLS-1$ return "Linux"; //$NON-NLS-1$ + if ("freebsd".equalsIgnoreCase(os)) //$NON-NLS-1$ + return "FreeBSD"; //$NON-NLS-1$ if ("solaris".equalsIgnoreCase(os)) //$NON-NLS-1$ return "Solaris"; //$NON-NLS-1$ if ("hpux".equalsIgnoreCase(os)) //$NON-NLS-1$ --- eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/customTargets.xml 0000-00-00 00:00:00.000000000 +0000 @@ -25,4 +25,10 @@ + + + + + + --- eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/build/org.eclipse.pde.build/templates/packager/packaging.properties 0000-00-00 00:00:00.000000000 +0000 @@ -20,3 +20,4 @@ root.win32.win32.x86_64=eclipse.exe, eclipsec.exe root.linux.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm +root.freebsd.gtk.x86_64=eclipse,libcairo-swt.so,about_files/,about.html,icon.xpm --- eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/ui/org.eclipse.pde.ui.templates/src/org/eclipse/pde/internal/ui/templates/rcp/IntroTemplate.java 0000-00-00 00:00:00.000000000 +0000 @@ -170,7 +170,7 @@ presentationElement.setAttribute("home-page-id", "root"); //$NON-NLS-1$ //$NON-NLS-2$ IPluginElement implementationElement = factory.createElement(presentationElement); implementationElement.setName("implementation"); //$NON-NLS-1$ - implementationElement.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + implementationElement.setAttribute("os", "win32,linux,macosx,freebsd"); //$NON-NLS-1$ //$NON-NLS-2$ if (getTargetVersion() == 3.0) implementationElement.setAttribute("style", "content/shared.css"); //$NON-NLS-1$//$NON-NLS-2$ --- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/ConfigurationSection.java 0000-00-00 00:00:00.000000000 +0000 @@ -69,8 +69,8 @@ private FormEntry fCustomEntry; private boolean fBlockChanges; - private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; + private static final String[] TAB_LABELS = { "linux", "freebsd", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_FREEBSD, Platform.OS_MACOSX, Platform.OS_WIN32 }; private CTabFolder fTabFolder; private int fLastTab; --- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/product/JRESection.java 0000-00-00 00:00:00.000000000 +0000 @@ -80,8 +80,8 @@ private ComboViewerPart fEEsCombo; private boolean fBlockChanges; - private static final String[] TAB_LABELS = { "linux", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_MACOSX, Platform.OS_WIN32 }; + private static final String[] TAB_LABELS = { "linux", "freebsd", "macosx", "win32" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + private static final String[] TAB_OS = { Platform.OS_LINUX, Platform.OS_FREEBSD, Platform.OS_MACOSX, Platform.OS_WIN32 }; private CTabFolder fTabFolder; private int fLastTab; --- eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/product/ProductIntroOperation.java 0000-00-00 00:00:00.000000000 +0000 @@ -149,7 +149,7 @@ implementation.setName("implementation"); //$NON-NLS-1$ implementation.setAttribute("kind", "html"); //$NON-NLS-1$ //$NON-NLS-2$ implementation.setAttribute("style", "content/shared.css"); //$NON-NLS-1$ //$NON-NLS-2$ - implementation.setAttribute("os", "win32,linux,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ + implementation.setAttribute("os", "win32,linux,freebsd,macosx"); //$NON-NLS-1$ //$NON-NLS-2$ presentation.add(implementation); --- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -137,6 +137,11 @@ x86_64 + freebsd + gtk + x86_64 + + win32 win32 x86_64 --- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product 0000-00-00 00:00:00.000000000 +0000 @@ -19,6 +19,7 @@ location="org.eclipse.platform" /> + --- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -125,9 +125,9 @@ mirror-build generate-resources - + @@ -395,6 +395,7 @@ zip tar.gz + tar.gz tar.gz --- eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product 0000-00-00 00:00:00.000000000 +0000 @@ -19,6 +19,7 @@ location="org.eclipse.platform" /> + --- eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 @@ -22,14 +22,30 @@ name="Linux (64 bit version)" fileName="eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz"> + + + + @@ -71,14 +87,30 @@ name="Linux (64 bit version)" fileName="eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz"> + + + + @@ -117,13 +149,29 @@ name="Linux (64 bit version)" fileName="swt-${BUILD_ID}-gtk-linux-x86_64.zip"> + + + + + --- eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -46,6 +46,11 @@ x86_64 + freebsd + gtk + x86_64 + + win32 win32 x86_64 @@ -96,6 +101,7 @@ zip tar.gz + tar.gz tar.gz --- eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml 0000-00-00 00:00:00.000000000 +0000 @@ -18,6 +18,10 @@ + + + + --- eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml 0000-00-00 00:00:00.000000000 +0000 @@ -263,6 +263,26 @@ fileName="launchers-linux.gtk.aarch64.${BUILD_ID}.tar.gz" /> + + + + @@ -284,6 +304,11 @@ id="ESLG264" name="Linux (x86_64/GTK+)" fileName="EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz" /> + rcp.config equinox.starterkit.product equinox-sdk - eclipse-junit-tests + eclipse.platform.repository --- eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -44,6 +44,16 @@ root.linux.gtk.x86_64=rootfiles/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64 root.linux.gtk.x86_64.permissions.755=eclipse -bin.includes = feature.properties +root.freebsd.gtk.powerpc64=rootfiles/freebsd.gtk.powerpc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64 +root.freebsd.gtk.powerpc64.permissions.755=eclipse +root.freebsd.gtk.powerpc64le=rootfiles/freebsd.gtk.powerpc64le,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/powerpc64le +root.freebsd.gtk.powerpc64le.permissions.755=eclipse +root.freebsd.gtk.aarch64=rootfiles/freebsd.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/aarch64 +root.freebsd.gtk.aarch64.permissions.755=eclipse + +root.freebsd.gtk.x86_64=rootfiles/freebsd.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/freebsd/x86_64 +root.freebsd.gtk.x86_64.permissions.755=eclipse + +bin.includes = feature.properties --- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -75,6 +75,11 @@ version="0.0.0"/> + + @@ -223,6 +228,12 @@ version="0.0.0"/> + + @@ -246,12 +257,30 @@ version="0.0.0"/> + + + + + + @@ -284,6 +313,11 @@ + + + + + --- eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.releng/publish-to-maven-central/SDK4Mvn.aggr 0000-00-00 00:00:00.000000000 +0000 @@ -2,15 +2,19 @@ - + - + + + + + --- eclipse.platform.swt/binaries/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/binaries/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -38,6 +38,10 @@ org.eclipse.swt.gtk.linux.aarch64 org.eclipse.swt.gtk.linux.ppc64le org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.swt.gtk.freebsd.aarch64 + org.eclipse.swt.gtk.freebsd.powerpc64 + org.eclipse.swt.gtk.freebsd.powerpc64le + org.eclipse.swt.gtk.freebsd.x86_64 org.eclipse.swt.win32.win32.aarch64 org.eclipse.swt.win32.win32.x86_64 --- eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup 0000-00-00 00:00:00.000000000 +0000 @@ -69,7 +69,7 @@ xsi:type="predicates:OrPredicate"> + pattern=".*(cocoa|gtk|win32)(\.(freebsd|macosx|aix|hpux|linux|solaris|win32)(\.(x86_64|x86_64|ppc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/> --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java 0000-00-00 00:00:00.000000000 +0000 @@ -68,13 +68,14 @@ static String arch() { String osArch = System.getProperty("os.arch"); //$NON-NLS-1$ - if (osArch.equals ("amd64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ + // if (osArch.equals ("x86_64")) return "x86_64"; //$NON-NLS-1$ $NON-NLS-2$ return osArch; } static String os() { String osName = System.getProperty("os.name"); //$NON-NLS-1$ if (osName.equals ("Linux")) return "linux"; //$NON-NLS-1$ $NON-NLS-2$ + if (osName.equals ("FreeBSD")) return "freebsd"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.equals ("Mac OS X")) return "macosx"; //$NON-NLS-1$ $NON-NLS-2$ if (osName.startsWith ("Win")) return "win32"; //$NON-NLS-1$ $NON-NLS-2$ return osName; --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh 0000-00-00 00:00:00.000000000 +0000 @@ -72,7 +72,7 @@ cd `dirname $0` -MAKE_TYPE=make +MAKE_TYPE=gmake export CFLAGS='-O -Wall -fPIC' @@ -82,27 +82,30 @@ fi case $OS in *) - SWT_OS=`uname -s | tr -s '[:upper:]' '[:lower:]'` + SWT_OS=`uname -s | tr '[:upper:]' '[:lower:]'` MAKEFILE=make_linux.mak ;; esac # Determine which CPU type we are building for if [ "${MODEL}" = "" ]; then - if uname -i > /dev/null 2>&1; then - MODEL=`uname -i` - if [ ${MODEL} = 'unknown' ]; then - MODEL=`uname -m` - fi - else - MODEL=`uname -m` - fi + MODEL=`uname -m` fi case $MODEL in "x86_64") SWT_ARCH=x86_64 - AWT_ARCH=amd64 + AWT_ARCH=x86_64 ;; + "powerpc" | "powerpc64") + SWT_ARCH=ppc64 + AWT_ARCH=ppc64 + MODEL=`uname -p` + ;; + "powerpc64le") + SWT_ARCH=ppc64le + AWT_ARCH=ppc64le + MODEL=`uname -p` + ;; *) SWT_ARCH=$MODEL AWT_ARCH=$MODEL @@ -134,11 +137,35 @@ export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" fi ;; + "freebsd.x86_64") + if [ "${CC}" = "" ]; then + export CC=cc + fi + if [ "${PKG_CONFIG_PATH}" = "" ]; then + export PKG_CONFIG_PATH="/usr/lib64/pkgconfig" + fi + ;; + "freebsd.ppc64") + if [ "${CC}" = "" ]; then + export CC=cc + fi + if [ "${PKG_CONFIG_PATH}" = "" ]; then + export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" + fi + ;; + "freebsd.aarch64") + if [ "${CC}" = "" ]; then + export CC=cc + fi + if [ "${PKG_CONFIG_PATH}" = "" ]; then + export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/" + fi + ;; esac # For 64-bit CPUs, we have a switch -if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then +if [ ${MODEL} = 'x86_64' -o ${MODEL} = 'ppc64le' -o ${MODEL} = 'powerpc64' -o ${MODEL} = 'powerpc64le' -o ${MODEL} = 'aarch64' -o ${MODEL} = 'loongarch64' ]; then SWT_PTR_CFLAGS=-DJNI64 if [ -d /lib64 ]; then XLIB64=-L/usr/X11R6/lib64 @@ -149,6 +176,11 @@ XLIB64="${XLIB64} -L/usr/lib64" SWT_LFLAGS=-m64 export SWT_LFLAGS + fi + if [ ${SWT_OS} = "freebsd" ] + then + SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -m64" + export SWT_LFLAGS=-m64 fi export SWT_PTR_CFLAGS fi --- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 @@ -99,15 +99,18 @@ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o +port_prefix=`pkg-config --variable=prefix gtk+-3.0` CFLAGS := $(CFLAGS) \ -DSWT_VERSION=$(SWT_VERSION) \ $(SWT_DEBUG) \ $(SWT_WEBKIT_DEBUG) \ - -DLINUX -DGTK \ + -DFREEBSD -DGTK \ + -Wno-deprecated-non-prototype \ + -I$(port_prefix)/include \ -I$(SWT_JAVA_HOME)/include \ - -I$(SWT_JAVA_HOME)/include/linux \ + -I$(SWT_JAVA_HOME)/include/freebsd \ ${SWT_PTR_CFLAGS} -LFLAGS = -shared -fPIC ${SWT_LFLAGS} +LFLAGS = -shared -fPIC ${SWT_LFLAGS} -L$(port_prefix)/lib # Treat all warnings as errors. If your new code produces a warning, please # take time to properly understand and fix/silence it as necessary. --- eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/bundles/org.eclipse.swt/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 @@ -39,3 +39,24 @@ requires.8.name = org.eclipse.swt.win32.win32.aarch64 requires.8.range = [$version$,$version$] requires.8.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) + +requires.9.namespace = org.eclipse.equinox.p2.iu +requires.9.name = org.eclipse.swt.gtk.freebsd.x86_64 +requires.9.range = [$version$,$version$] +requires.9.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=x86_64)(!(org.eclipse.swt.buildtime=true))) + +requires.10.namespace = org.eclipse.equinox.p2.iu +requires.10.name = org.eclipse.swt.gtk.freebsd.powerpc64 +requires.10.range = [$version$,$version$] +requires.10.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)(!(org.eclipse.swt.buildtime=true))) + +requires.11.namespace = org.eclipse.equinox.p2.iu +requires.11.name = org.eclipse.swt.gtk.freebsd.powerpc64le +requires.11.range = [$version$,$version$] +requires.11.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le)(!(org.eclipse.swt.buildtime=true))) + +requires.12.namespace = org.eclipse.equinox.p2.iu +requires.12.name = org.eclipse.swt.gtk.freebsd.aarch64 +requires.12.range = [$version$,$version$] +requires.12.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=aarch64)(!(org.eclipse.swt.buildtime=true))) + --- eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/local-build/org.eclipse.swt.fragments.localbuild/META-INF/p2.inf 0000-00-00 00:00:00.000000000 +0000 @@ -33,3 +33,23 @@ requires.7.name = org.eclipse.swt.win32.win32.aarch64 requires.7.range = 0.0.0 requires.7.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=aarch64)) + +requires.8.namespace = org.eclipse.equinox.p2.iu +requires.8.name = org.eclipse.swt.gtk.freebsd.x86_64 +requires.8.range = 0.0.0 +requires.8.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=x86_64)) + +requires.9.namespace = org.eclipse.equinox.p2.iu +requires.9.name = org.eclipse.swt.gtk.freebsd.powerpc64 +requires.9.range = 0.0.0 +requires.9.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64)) + +requires.10.namespace = org.eclipse.equinox.p2.iu +requires.10.name = org.eclipse.swt.gtk.freebsd.powerpc64le +requires.10.range = 0.0.0 +requires.10.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=powerpc64le)) + +requires.11.namespace = org.eclipse.equinox.p2.iu +requires.11.name = org.eclipse.swt.gtk.freebsd.aarch64 +requires.11.range = 0.0.0 +requires.11.filter = (&(osgi.os=freebsd)(osgi.ws=gtk)(osgi.arch=aarch64)) --- eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.swt/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -116,11 +116,11 @@ unix - Linux + - tests/org.eclipse.swt.tests.gtk + @@ -138,6 +138,21 @@ linux gtk ppc64le + + + freebsd + gtk + x86_64 + + + freebsd + gtk + powerpc64 + + + freebsd + gtk + powerpc64le --- eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.browser/plugin.xml 0000-00-00 00:00:00.000000000 +0000 @@ -94,7 +94,7 @@ @@ -104,28 +104,28 @@ usr/bin/google-chrome usr/bin/chromium-browser usr/bin/konqueror usr/bin/epiphany --- eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/internal/forms/widgets/TitleRegion.java 0000-00-00 00:00:00.000000000 +0000 @@ -212,6 +212,9 @@ if (Constants.OS_LINUX.equalsIgnoreCase(os)) { tw += 1; // See Bug 342610 } + else if (Constants.OS_FREEBSD.equalsIgnoreCase(os)) { + tw += 1; // See Bug 342610 + } if (bsize != null) tw -= bsize.x + SPACING; if (msize != null) @@ -577,4 +580,4 @@ target.setTransfer(transferTypes); target.addDropListener(listener); } -} \ No newline at end of file +} --- eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/bundles/org.eclipse.ui.themes/plugin.xml 0000-00-00 00:00:00.000000000 +0000 @@ -12,7 +12,7 @@ basestylesheeturi="css/e4-dark_linux.css" id="org.eclipse.e4.ui.css.theme.e4_dark" label="%theme.dark" - os="linux"> + os="freebsd"> + os="freebsd"> + + + + + + + + + + + + + + + + --- eclipse.platform.ui/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform.ui/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -88,6 +88,10 @@ + + + + --- eclipse.platform/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000 +++ eclipse.platform/runtime/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java 0000-00-00 00:00:00.000000000 +0000 @@ -259,6 +259,8 @@ */ public static final String OS_LINUX = "linux";//$NON-NLS-1$ + public static final String OS_FREEBSD = "freebsd"; + /** * Constant string (value "aix") indicating the platform is running on an * AIX-based operating system. @@ -410,7 +412,7 @@ public static final String ARCH_AARCH64 = "aarch64";//$NON-NLS-1$ /** - * Constant string (value "amd64") indicating the platform is running on an + * Constant string (value "x86_64") indicating the platform is running on an * AMD64-based architecture. * * @since 3.0 --- equinox/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Constants.java 0000-00-00 00:00:00.000000000 +0000 +++ equinox/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Constants.java 0000-00-00 00:00:00.000000000 +0000 @@ -17,9 +17,10 @@ * @author aniefer */ class Constants { - public static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ + public static final String INTERNAL_AMD64 = "x86_64"; //$NON-NLS-1$ public static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$ public static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$ + public static final String INTERNAL_OS_FREEBSD = "FreeBSD"; //$NON-NLS-1$ public static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ public static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ public static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ @@ -42,6 +43,7 @@ * Linux-based operating system. */ public static final String OS_LINUX = "linux";//$NON-NLS-1$ + public static final String OS_FREEBSD = "freebsd";//$NON-NLS-1$ /** * Constant string (value "aix") indicating the platform is running on an --- equinox/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 0000-00-00 00:00:00.000000000 +0000 +++ equinox/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java 0000-00-00 00:00:00.000000000 +0000 @@ -431,17 +431,20 @@ } private String getArch() { - if (arch != null) + if (arch != null) { + // if (arch.equals("x86_64")) return "x86_64"; return arch; + } String osgiArch = System.getProperty(PROP_ARCH); if (osgiArch != null) { + // if (osgiArch.equals("x86_64")) return "x86_64"; arch = osgiArch; return arch; } String name = System.getProperty("os.arch");//$NON-NLS-1$ - // Map amd64 architecture to x86_64 - if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64)) - return Constants.ARCH_X86_64; + // Map x86_64 architecture to x86_64 + // XXX if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64)) + // XXX return Constants.ARCH_X86_64; return name; } --- equinox/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 +++ equinox/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxConfiguration.java 0000-00-00 00:00:00.000000000 +0000 @@ -90,9 +90,9 @@ // While we recognize the i386 architecture, we change // this internally to be x86. private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$ - // While we recognize the amd64 architecture, we change + // While we recognize the x86_64 architecture, we change // this internally to be x86_64. - private static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$ + private static final String INTERNAL_AMD64 = "x86_64"; //$NON-NLS-1$ public static final String VARIABLE_DELIM_STRING = "$"; //$NON-NLS-1$ public static final char VARIABLE_DELIM_CHAR = '$'; @@ -1134,7 +1134,7 @@ // Map i386 architecture to x86 if (name.equalsIgnoreCase(INTERNAL_ARCH_I386)) archValue = Constants.ARCH_X86; - // Map amd64 architecture to x86_64 + // Map x86_64 architecture to x86_64 else if (name.equalsIgnoreCase(INTERNAL_AMD64)) archValue = Constants.ARCH_X86_64; else --- equinox/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 +++ equinox/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/environment/Constants.java 0000-00-00 00:00:00.000000000 +0000 @@ -148,7 +148,7 @@ public static final String ARCH_X86_64 = "x86_64";//$NON-NLS-1$ /** - * Constant string (value "amd64") indicating the platform is running on an + * Constant string (value "x86_64") indicating the platform is running on an * AMD64-based architecture. * * @deprecated use ARCH_X86_64 instead. Note the values --- equinox/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.core.sdk/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -92,6 +92,16 @@ version="0.0.0"/> + + + + --- equinox/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -33,6 +33,15 @@ root.linux.gtk.aarch64=bin/gtk/linux/aarch64,gtk_root root.linux.gtk.aarch64.permissions.755=launcher +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher + +root.freebsd.gtk.powerpc64le=bin/gtk/freebsd/powerpc64le,gtk_root +root.freebsd.gtk.powerpc64le.permissions.755=launcher + +root.freebsd.gtk.aarch64=bin/gtk/freebsd/aarch64,gtk_root +root.freebsd.gtk.aarch64.permissions.755=launcher + root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/launcher @@ -41,3 +50,6 @@ root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=launcher + +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root +root.freebsd.gtk.x86_64.permissions.755=launcher --- equinox/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -66,6 +66,34 @@ version="0.0.0"/> + + + + + + + + " + ;; + esac + ;; *) - echo "Unknown OS -- build aborted" + echo "Unknown OS $defaultOS -- build aborted" ;; esac export CC @@ -154,13 +179,13 @@ # If the OS is supported (a makefile exists) if [ "$makefile" != "" ]; then if [ "$extraArgs" != "" ]; then - make -f $makefile $extraArgs + gmake -f $makefile $extraArgs else echo "Building $OS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS" - make -f $makefile clean + gmake -f $makefile clean case x$CC in - x*gcc*) make -f $makefile all PICFLAG=-fpic ;; - *) make -f $makefile all ;; + x*gcc*) gmake -f $makefile all PICFLAG=-fpic ;; + *) gmake -f $makefile all ;; esac fi else --- equinox/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak 0000-00-00 00:00:00.000000000 +0000 @@ -39,7 +39,8 @@ DEFAULT_OS ?= $(shell uname -s | tr "[:upper:]" "[:lower:]") DEFAULT_WS ?= gtk DEFAULT_OS_ARCH ?= $(shell uname -m) -JAVA_HOME ?= $(shell readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::") +# XXX JAVA_HOME ?= $(shell readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::") +JAVA_HOME ?= /usr/local/openjdk17 PROGRAM_OUTPUT ?= eclipse PROGRAM_LIBRARY = $(PROGRAM_OUTPUT)_$(LIB_VERSION).so @@ -56,7 +57,7 @@ DEFAULT_JAVA ?= DEFAULT_JAVA_EXEC endif -CC ?= gcc +CC ?= cc # XXX gcc # Useful to figure out if there is any difference between running build.sh and make_linux directly. INFO_PROG=CC:$(CC) PROGRAM_OUTPUT:$(PROGRAM_OUTPUT) PROGRAM_LIBRARY:$(PROGRAM_LIBRARY) # @@ -86,10 +87,11 @@ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ -D$(DEFAULT_JAVA) \ + -Wno-deprecated-non-prototype \ $(GTK_LIBS) \ -I. \ -I.. \ - -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \ + -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd \ `pkg-config --cflags gtk+-3.0` all: $(EXEC) $(DLL) --- equinox/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -125,6 +125,10 @@ + + + + --- equinox/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/resources/build.properties 0000-00-00 00:00:00.000000000 +0000 @@ -26,6 +26,12 @@ root.linux.gtk.ppc64le=bin/gtk/linux/ppc64le,gtk_root root.linux.gtk.ppc64le.permissions.755=launcher +root.freebsd.gtk.powerpc64=bin/gtk/freebsd/powerpc64,gtk_root +root.freebsd.gtk.powerpc64.permissions.755=launcher + +root.freebsd.gtk.powerpc64le=bin/gtk/freebsd/powerpc64le,gtk_root +root.freebsd.gtk.powerpc64le.permissions.755=launcher + root.macosx.cocoa.x86_64=bin/cocoa/macosx/x86_64 root.macosx.cocoa.x86_64.permissions.755=Contents/MacOS/${launcherName} @@ -37,3 +43,9 @@ root.linux.gtk.loongarch64=bin/gtk/linux/loongarch64,gtk_root root.linux.gtk.loongarch64.permissions.755=launcher + +root.freebsd.gtk.x86_64=bin/gtk/freebsd/x86_64,gtk_root +root.freebsd.gtk.x86_64.permissions.755=libcairo-swt.so + +root.freebsd.gtk.aarch64=bin/gtk/freebsd/aarch64,gtk_root +root.freebsd.gtk.aarch64.permissions.755=libcairo-swt.so --- equinox/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 +++ equinox/features/org.eclipse.equinox.executable.feature/resources/build.xml 0000-00-00 00:00:00.000000000 +0000 @@ -102,6 +102,22 @@ + + + + + + + + + + + + + + + + @@ -110,6 +126,14 @@ + + + + + + + + @@ -118,6 +142,14 @@ + + + + + + + + @@ -168,6 +200,10 @@ + + + + --- equinox/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ equinox/pom.xml 0000-00-00 00:00:00.000000000 +0000 @@ -176,6 +176,7 @@ bundles/org.eclipse.equinox.security.macosx bundles/org.eclipse.equinox.security.win32 bundles/org.eclipse.equinox.security.linux + bundles/org.eclipse.equinox.security.freebsd bundles/org.eclipse.equinox.bidi bundles/org.eclipse.equinox.cm bundles/org.eclipse.equinox.console @@ -219,6 +220,10 @@ bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64 bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.aarch64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.x86_64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64 + bundles/org.eclipse.equinox.launcher.gtk.freebsd.powerpc64le bundles/org.eclipse.equinox.launcher.win32.win32.aarch64 bundles/org.eclipse.equinox.launcher.win32.win32.x86_64 bundles/org.eclipse.equinox.launcher.tests --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/feature.xml 0000-00-00 00:00:00.000000000 +0000 @@ -119,6 +119,11 @@ version="0.0.0"/> + + --- rt.equinox.p2/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/products/org.eclipse.equinox.p2.examples.rcp.discovery.product/cloud.product 0000-00-00 00:00:00.000000000 +0000 @@ -122,6 +122,7 @@ + @@ -135,6 +136,7 @@ + --- rt.equinox.p2/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/products/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.product/sdkbundlevisibility.product 0000-00-00 00:00:00.000000000 +0000 @@ -115,6 +115,7 @@ + @@ -130,6 +131,7 @@ + --- rt.equinox.p2/products/org.eclipse.equinox.p2.installer.product/installer.product 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/products/org.eclipse.equinox.p2.installer.product/installer.product 0000-00-00 00:00:00.000000000 +0000 @@ -41,6 +41,7 @@ + @@ -60,6 +61,7 @@ + @@ -77,6 +79,7 @@ + @@ -89,6 +92,7 @@ + --- rt.equinox.p2/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.p2/products/org.eclipse.equinox.p2.ui.admin.rcp.product/rcp.product 0000-00-00 00:00:00.000000000 +0000 @@ -158,10 +158,12 @@ + + @@ -210,6 +212,7 @@ + @@ -236,6 +239,7 @@ + @@ -253,6 +257,7 @@ +