diff options
Diffstat (limited to 'java/eclipse/files')
53 files changed, 911 insertions, 1860 deletions
diff --git a/java/eclipse/files/Makefile b/java/eclipse/files/Makefile deleted file mode 100644 index 95cd54717e5f..000000000000 --- a/java/eclipse/files/Makefile +++ /dev/null @@ -1,87 +0,0 @@ -# $FreeBSD$ - -ECHO= /bin/echo -FIND= /usr/bin/find -MKDIR= /bin/mkdir -p -SED= /usr/bin/sed -CP= /bin/cp -CSH= /bin/csh -SH= /bin/sh -GMAKE= $(LOCALBASE)/bin/gmake -ANT= $(LOCALBASE)/bin/ant -UNZIP_CMD= $(LOCALBASE)/bin/unzip - -PORTDESTDIR= $(PREFIX)/eclipse - -CFLAGS+= -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/bsd \ - -I$(JAVA_HOME)/include/freebsd - -LIBUPDATE= libupdate.so -LIBUPDATE_DST= plugins/org.eclipse.update.core.freebsd/os/freebsd/x86 -LIBUPDATE_SRC= plugins/org.eclipse.update.core.freebsd/src - -SWT_VERSION= $(ECLIPSE_BUILD) -LIBSWT= libswt-$(ECLIPSE_WS)-$(SWT_VERSION).so -LIBSWTPI= libswt-pi-$(ECLIPSE_WS)-$(SWT_VERSION).so -LIBSWT_DST= plugins/org.eclipse.swt.$(ECLIPSE_WS)/os/freebsd/x86 -LIBSWT_SRC= plugins/org.eclipse.swt/Eclipse_SWT - -LAUNCHER= eclipse -LAUNCHER_DST= plugins/platform-launcher/bin/freebsd/$(ECLIPSE_WS) -LAUNCHER_SRC= plugins/platform-launcher/library/$(ECLIPSE_WS) - -LAUNCHER_SRCS= $(LAUNCHER_SRC)/../eclipse.c \ - $(LAUNCHER_SRC)/../eclipseUtil.c \ - $(LAUNCHER_SRC)/../eclipseShm.c \ - $(LAUNCHER_SRC)/eclipseGtk.c -LAUNCHER_OBJS= $(LAUNCHER_SRCS:S/.c/.o/g) - -all: binaries java - -binaries: libswt launcher libupdate - -libswt: - @$(ECHO) "===> Building libswt." - cd "plugins/org.eclipse.swt/Eclipse SWT PI/$(ECLIPSE_WS)/library" && \ - $(SH) ./build.sh && \ - $(CP) *.so ../../../../org.eclipse.swt.$(ECLIPSE_WS)/os/freebsd/x86/ - -launcher: - @$(ECHO) "===> Building Eclipse launcher." - cd plugins/platform-launcher/library/$(ECLIPSE_WS) && \ - $(CSH) build.csh -os freebsd && \ - $(CP) eclipse ../../bin/freebsd/$(ECLIPSE_WS)/eclipse - -libupdate: - @$(ECHO) "===> Building libupdate." - cd plugins/org.eclipse.update.core.freebsd/src && \ - $(ANT) -Djava.home=$(JAVA_HOME) -DCC=$(CC) - @$(ECHO) "===> Building libcore." - cd plugins/org.eclipse.core.resources.freebsd/src && \ - env JDK_INCLUDE="$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd" $(GMAKE) && \ - $(CP) *.so ../../org.eclipse.core.resources.freebsd/os/freebsd/x86 - -java: build-install - -build-install: - @$(ECHO) "===> Building Eclipse platform." - ./build -os $(ECLIPSE_OS) -ws $(ECLIPSE_WS) -arch $(ECLIPSE_ARCH) - -install: - @$(ECHO) "===> Installing Eclipse platform." - @$(MKDIR) $(PORTDESTDIR) - $(UNZIP_CMD) result/$(ECLIPSE_OS)-$(ECLIPSE_WS)-$(ECLIPSE_ARCH)-sdk.zip -d $(PREFIX) - @$(ECHO) "===> Installing a shell script..." - @$(SED) \ - -e "s+%%ECLIPSE_HOME%%+$(PORTDESTDIR)+g" \ - -e "s+%%JAVA_HOME%%+$(JAVA_HOME)+g" \ - eclipse.in > eclipse.tmp - $(BSD_INSTALL_SCRIPT) eclipse.tmp $(PREFIX)/bin/eclipse - -clean: - ./build -os $(ECLIPSE_OS) -ws $(ECLIPSE_WS) -arch $(ECLIPSE_ARCH) clean - rm -rf $(LIBSWT_DST)/$(LIBSWTPI) $(LIBSWT_DST)/$(LIBSWT) - rm -rf $(LAUNCHER_DST)/$(LAUNCHER) - rm -rf $(LIBSWT_SRC)/*.o $(LAUNCHER_OBJS) - rm -rf $(LIBUPDATE_DST)/$(LIBUPDATE) diff --git a/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.gtk.x86.xml b/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.gtk.x86.xml deleted file mode 100644 index fae9108eaf4f..000000000000 --- a/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.gtk.x86.xml +++ /dev/null @@ -1,319 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Assemble org.eclipse.sdk" default="main"> - <property name="archiveName" value="org.eclipse.sdk-${buildId}-freebsd.gtk.x86.zip"/> - <property name="os" value="freebsd"/> - <property name="ws" value="gtk"/> - <property name="arch" value="x86"/> - <property name="assemblyTempDir" value="${buildDirectory}/tmp"/> - <property name="eclipse.base" value="${assemblyTempDir}/${collectingFolder}"/> - <property name="eclipse.plugins" value="${eclipse.base}/plugins"/> - <property name="eclipse.features" value="${eclipse.base}/features"/> - <property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/> - <!-- Beginning of the jarUp task --> - <target name="jarUp" description="Create a jar from the given location."> - <available property="${source}/${elementName}_exists" file="${source}/${elementName}"/> - <antcall target="jarIng"> - <param name="source" value="${source}"/> - <param name="elementName" value="${elementName}"/> - </antcall> - </target> - <target name="jarIng" if="${source}/${elementName}_exists"> - <zip zipfile="${source}/${elementName}.jar" basedir="${source}/${elementName}" filesonly="false" whenempty="skip" update="false"/> - <delete dir="${source}/${elementName}"/> - </target> - <!-- End of the jarUp task --> - <target name="main"> - <condition property="pluginArchivePrefix" value="plugins"> - <equals arg1="${archivePrefix}" arg2="" trim="true"/> - </condition> - <property name="pluginArchivePrefix" value="${archivePrefix}/plugins"/> - - <condition property="featureArchivePrefix" value="features"> - <equals arg1="${archivePrefix}" arg2="" trim="true"/> - </condition> - <property name="featureArchivePrefix" value="${archivePrefix}/features"/> - - <delete dir="${assemblyTempDir}"/> - <dirname property="archiveParentFolder" file="${archiveFullPath}"/> - <mkdir dir="${archiveParentFolder}"/> - <mkdir dir="${assemblyTempDir}"/> - <mkdir dir="${buildLabel}"/> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.isv" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.scheduler" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.debug.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.base" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi.services" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.boot" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.sdk" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.filebuffers" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime.compatibility" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.externaltools" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.core.refactoring" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ide" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.junit" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.freebsd" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.variables" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.freebsd" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.text" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.launching" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.swt" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.build" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi.util" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.texteditor" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.compatibility" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.configurator" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.forms" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.jdt.source/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.platform.source/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.jdt/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.pde/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.platform/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - - <!-- This shouldn't be changed ever --> - <exec executable="zip" dir="${assemblyTempDir}"> - <arg line="-r -q ${zipargs} ${archiveFullPath}"/> - <arg line="${featureArchivePrefix}"/> - <arg line="${pluginArchivePrefix}"/> - </exec> - <exec executable="zip" dir="${eclipse.base}/freebsd.gtk.x86"> - <arg line="-r -q ${zipargs} ${archiveFullPath} . "/> - </exec> - </target> -</project> diff --git a/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.motif.x86.xml b/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.motif.x86.xml deleted file mode 100644 index 643f346be719..000000000000 --- a/java/eclipse/files/assemble.org.eclipse.sdk.freebsd.motif.x86.xml +++ /dev/null @@ -1,319 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="Assemble org.eclipse.sdk" default="main"> - <property name="archiveName" value="org.eclipse.sdk-${buildId}-freebsd.motif.x86.zip"/> - <property name="os" value="freebsd"/> - <property name="ws" value="motif"/> - <property name="arch" value="x86"/> - <property name="assemblyTempDir" value="${buildDirectory}/tmp"/> - <property name="eclipse.base" value="${assemblyTempDir}/${collectingFolder}"/> - <property name="eclipse.plugins" value="${eclipse.base}/plugins"/> - <property name="eclipse.features" value="${eclipse.base}/features"/> - <property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/> - <!-- Beginning of the jarUp task --> - <target name="jarUp" description="Create a jar from the given location."> - <available property="${source}/${elementName}_exists" file="${source}/${elementName}"/> - <antcall target="jarIng"> - <param name="source" value="${source}"/> - <param name="elementName" value="${elementName}"/> - </antcall> - </target> - <target name="jarIng" if="${source}/${elementName}_exists"> - <zip zipfile="${source}/${elementName}.jar" basedir="${source}/${elementName}" filesonly="false" whenempty="skip" update="false"/> - <delete dir="${source}/${elementName}"/> - </target> - <!-- End of the jarUp task --> - <target name="main"> - <condition property="pluginArchivePrefix" value="plugins"> - <equals arg1="${archivePrefix}" arg2="" trim="true"/> - </condition> - <property name="pluginArchivePrefix" value="${archivePrefix}/plugins"/> - - <condition property="featureArchivePrefix" value="features"> - <equals arg1="${archivePrefix}" arg2="" trim="true"/> - </condition> - <property name="featureArchivePrefix" value="${archivePrefix}/features"/> - - <delete dir="${assemblyTempDir}"/> - <dirname property="archiveParentFolder" file="${archiveFullPath}"/> - <mkdir dir="${archiveParentFolder}"/> - <mkdir dir="${assemblyTempDir}"/> - <mkdir dir="${buildLabel}"/> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.isv" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.scheduler" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.ui.refactoring" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.debug.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.intro" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.base" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi.services" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.boot" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.sdk" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.filebuffers" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime.compatibility" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.views" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.ide" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.externaltools" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.core.refactoring" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.freebsd.motif.x86" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ide" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.user" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.junit" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.freebsd" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.doc.isv" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.help.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.core.variables" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.freebsd" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.presentations.r21" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.text" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.platform" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.launching" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.swt" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.build" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug.ui" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.osgi.util" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.team.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.texteditor" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.pde.core" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.swt.motif" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.compatibility" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.update.configurator" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="plugins/org.eclipse.ui.forms" target="gather.bin.parts"> - <property name="destination.temp.folder" value="${eclipse.plugins}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.jdt.source/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.platform.source/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.jdt/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.pde/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - <ant antfile="build.xml" dir="features/org.eclipse.platform/" target="gather.bin.parts"> - <property name="feature.base" value="${eclipse.base}"/> - </ant> - - <!-- This shouldn't be changed ever --> - <exec executable="zip" dir="${assemblyTempDir}"> - <arg line="-r -q ${zipargs} ${archiveFullPath}"/> - <arg line="${featureArchivePrefix}"/> - <arg line="${pluginArchivePrefix}"/> - </exec> - <exec executable="zip" dir="${eclipse.base}/freebsd.motif.x86"> - <arg line="-r -q ${zipargs} ${archiveFullPath} . "/> - </exec> - </target> -</project> diff --git a/java/eclipse/files/build.sh b/java/eclipse/files/build.sh deleted file mode 100644 index f7cd9949b332..000000000000 --- a/java/eclipse/files/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2004 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Kevin Cornell (Rational Software Corporation) -# Tom Tromey (Red Hat, Inc.) -#******************************************************************************* - -#!/bin/sh - -gmake -f make_gtk.mak ${1} ${2} ${3} ${4} diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in index 22f720a96710..1edf7be3bdbb 100644 --- a/java/eclipse/files/eclipse.in +++ b/java/eclipse/files/eclipse.in @@ -10,6 +10,8 @@ DEFAULT_JAVA_HOME=%%JAVA_HOME%% ECLIPSE_HOME=%%ECLIPSE_HOME%% DEFAULT_JAVA_CMD=java +MOZILLA_FIVE_HOME=%%X11BASE%%/lib/%%BROWSER%% +LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH #----------------------------------------------------------------------------- diff --git a/java/eclipse/files/make_freebsd.mak b/java/eclipse/files/make_freebsd.mak deleted file mode 100644 index e2eeeb8fbefa..000000000000 --- a/java/eclipse/files/make_freebsd.mak +++ /dev/null @@ -1,121 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2004 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -#******************************************************************************* - -# Makefile for creating SWT libraries on FreeBSD - -include make_common.mak - -SWT_VERSION=$(maj_ver)$(min_ver) - -# Define the installation directories for various products. -# JAVA_HOME - The JDK > 1.3 -# MOTIF_HOME - Motif includes and libraries -# QT_HOME - identifier namespace package (used by KDE) -MOTIF_HOME = /usr/X11R6 -QT_HOME = /usr/X11R6 - -# Define the various DLL (shared) libraries to be made. - -SWT_PREFIX = swt -WS_PREFIX = motif -SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o -SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L/usr/local/lib -L/usr/X11R6/lib \ - -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -lXinerama \ - -lXtst -liconv -CFLAGS = -O -s -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DMOTIF -fpic -I./ \ - -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd \ - -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include \ - -I/usr/X11R6/include -I/usr/local/include - -GNOME_PREFIX = swt-gnome -GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GNOME_OBJECTS= swt.o gnome.o gnome_structs.o gnome_stats.o -GNOME_CFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - -KDE_PREFIX = swt-kde -KDE_LIB = lib$(KDE_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -KDE_OBJS = kde.o -KDE_LIBS = -L/usr/local/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt-mt -KDE_CFLAGS = -fno-rtti -c -O -I$(QT_HOME)/include -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/bsd \ - -I$(JAVA_HOME)/include/freebsd -I/usr/local/include - -AWT_PREFIX = swt-awt -AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -AWT_OBJS = swt_awt.o -AWT_LIBS = -L$(JAVA_HOME)/jre/lib/i386 -ljawt -shared - -GTK_PREFIX = swt-gtk -GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GTK_OBJS = swt.o gtk.o -GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` -GTK_LIBS = -x -shared `pkg-config --libs-only-L gtk+-2.0` `pkg-config --libs-only-l --libs-only-L gtk+-2.0` - -all: make_swt make_awt $(MAKE_GNOME) make_gtk - -kde: make_kde - -make_swt: $(SWT_LIB) - -$(SWT_LIB): $(SWT_OBJS) - $(LD) -o $@ $(SWT_OBJS) $(SWT_LIBS) - -swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -os.o: os.c os.h swt.h os_custom.h - $(CC) $(CFLAGS) -c os.c -os_structs.o: os_structs.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) -c os_structs.c -os_custom.o: os_custom.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) -c os_custom.c -os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h - $(CC) $(CFLAGS) -c os_stats.c - -make_gnome: $(GNOME_LIB) - -$(GNOME_LIB): $(GNOME_OBJECTS) - $(CC) -o $@ $(GNOME_OBJECTS) $(GNOME_LIBS) - -gnome.o: gnome.c - $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome.o gnome.c - -gnome_structs.o: gnome_structs.c - $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_structs.o gnome_structs.c - -gnome_stats.o: gnome_stats.c - $(CC) -O -Wall -DSWT_VERSION=$(SWT_VERSION) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/bsd -I$(JAVA_HOME)/include/freebsd $(GNOME_CFLAGS) -c -o gnome_stats.o gnome_stats.c - -make_kde: $(KDE_LIB) - -$(KDE_LIB): $(KDE_OBJS) - ld -o $@ $(KDE_OBJS) $(KDE_LIBS) - -$(KDE_OBJS): kde.cc - $(CXX) $(KDE_CFLAGS) -o kde.o kde.cc - -make_awt: $(AWT_LIB) - -$(AWT_LIB): $(AWT_OBJS) - ld -o $@ $(AWT_OBJS) $(AWT_LIBS) - -make_gtk: $(GTK_LIB) - -$(GTK_LIB): $(GTK_OBJS) - ld -o $@ $(GTK_OBJS) $(GTK_LIBS) - -gtk.o: gtk.c - $(CC) $(CFLAGS) $(GTK_CFLAGS) -c -o gtk.o gtk.c - -clean: - rm -f *.so *.o - diff --git a/java/eclipse/files/make_gtk.mak b/java/eclipse/files/make_gtk.mak deleted file mode 100644 index 0ec9b0762ed4..000000000000 --- a/java/eclipse/files/make_gtk.mak +++ /dev/null @@ -1,188 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2004 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -#******************************************************************************* - -# Makefile for creating SWT libraries for FreeBSD GTK - -include make_common.mak - -LD=$(CC) - -SWT_VERSION=$(maj_ver)$(min_ver) - -# Define the installation directories for various products. -# Your system may have these in a different place. -# JAVA_HOME - IBM's version of Java - -#JAVA_HOME = /usr/local/jdk1.4.2 -AWT_LIB_PATH = $(JAVA_HOME)/jre/lib/i386 -XTEST_LIB_PATH = /usr/X11R6/lib - -# mozilla source distribution folder -MOZILLA_HOME = /usr/X11R6 - -# Define the various shared libraries to be build. -WS_PREFIX = gtk -SWT_PREFIX = swt -AWT_PREFIX = swt-awt -SWTPI_PREFIX = swt-pi -ATK_PREFIX = swt-atk -GNOME_PREFIX = swt-gnome -MOZILLA_PREFIX = swt-mozilla -SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so -MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so - -GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` -L$(XTEST_LIB_PATH) -lXtst - -AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared - -ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` -ATKLIBS = `pkg-config --libs atk gtk+-2.0` - -GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` - -MOZILLACFLAGS = -O \ - -fno-rtti \ - -Wall \ - -I./ \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/bsd \ - -I$(JAVA_HOME)/include/freebsd \ - -include $(MOZILLA_HOME)/include/$(BROWSER)/mozilla-config.h \ - -I$(MOZILLA_HOME)/include/$(BROWSER) \ - -I$(MOZILLA_HOME)/include/$(BROWSER)/xpcom \ - -I$(MOZILLA_HOME)/include/$(BROWSER)/string \ - -I$(MOZILLA_HOME)/include/$(BROWSER)/nspr \ - -I$(MOZILLA_HOME)/include/$(BROWSER)/embed_base \ - -I$(MOZILLA_HOME)/include/$(BROWSER)/gfx - -MOZILLALIBS = -L$(MOZILLA_HOME)/lib/$(BROWSER) \ - -L$(MOZILLA_HOME)/lib/$(BROWSER) \ - -lgtkembedmoz -lxpcom -MOZILLALDFLAGS = -s - -SWT_OBJECTS = swt.o callback.o -AWT_OBJECTS = swt_awt.o -SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o -ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o -GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o -MOZILLA_OBJECTS = xpcom.o - -CFLAGS = -O -Wall \ - -DSWT_VERSION=$(SWT_VERSION) \ - -DFREEBSD -DGTK \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/bsd \ - -I$(JAVA_HOME)/include/freebsd \ - -I../../../Eclipse_SWT/common/library \ - -I../../../Eclipse_SWT_PI/gtk/library \ - -I/usr/X11R6/include \ - -fpic \ - ${SWT_PTR_CFLAGS} - -LIBS = -shared -fpic - -# -# Target Rules -# - -all: make_swt make_atk $(MAKE_GNOME) make_awt make_mozilla - -all64: make_swt make_atk make_gnome make_awt - -# -# SWT libs -# -make_swt: $(SWT_LIB) $(SWTPI_LIB) - -$(SWT_LIB): $(SWT_OBJECTS) - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS) - -callback.o: callback.c callback.h - $(CC) $(CFLAGS) -c callback.c - -$(SWTPI_LIB): $(SWTPI_OBJECTS) - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) - -swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -os.o: os.c os.h swt.h os_custom.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c -os_structs.o: os_structs.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_structs.c -os_custom.o: os_custom.c os_structs.h os.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_custom.c -os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h - $(CC) $(CFLAGS) $(GTKCFLAGS) -c os_stats.c - -# -# AWT lib -# -make_awt:$(AWT_LIB) - -$(AWT_LIB): $(AWT_OBJECTS) - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) - -# -# Atk lib -# -make_atk: $(ATK_LIB) - -$(ATK_LIB): $(ATK_OBJECTS) - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) - -atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -atk_structs.o: atk_structs.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_structs.c -atk_custom.o: atk_custom.c atk_structs.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_custom.c -atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c - -# -# Gnome lib -# -make_gnome: $(GNOME_LIB) - -$(GNOME_LIB): $(GNOME_OBJECTS) - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) - -gnome.o: gnome.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c - -gnome_structs.o: gnome_structs.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_structs.c - -gnome_stats.o: gnome_stats.c gnome_stats.h - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome_stats.c - -# -# Mozilla lib -# -make_mozilla:$(MOZILLA_LIB) - -$(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) $(LIBS) $(MOZILLALDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) - -xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) -c xpcom.cpp - -# -# Clean -# -clean: - rm -f *.o *.so diff --git a/java/eclipse/files/make_gtk.xml b/java/eclipse/files/make_gtk.xml deleted file mode 100644 index 16486806af48..000000000000 --- a/java/eclipse/files/make_gtk.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="build_gtk_freebsd_lib" basedir="../../.."> - -<target name="init"> - <tstamp/> - <property name="lib_destdir" value="${basedir}/../org.eclipse.swt.gtk/os/freebsd/x86" /> -</target> - -<!-- Build swt.so for GTK --> -<!-- Output .so for this platform into the org.eclipse.swt.gtk/os directory --> -<target name="build_gtk_freebsd_lib" depends="init"> - <mkdir dir="${lib_destdir}" /> - <exec dir="./bin/library" executable="sh"> - <arg line="${basedir}/bin/library/build.sh"/> - </exec> - <copy todir="${lib_destdir}"> - <fileset dir="${basedir}/bin/library/" includes="*.so"/> - </copy> - <eclipse.refreshLocal resource="org.eclipse.swt.gtk" depth="infinite" /> -</target> - -<target name="clean" depends="init"> - <tstamp/> - <exec dir="./bin/library" executable="sh"> - <arg line="${basedir}/bin/library/build.sh"/> - <arg line="clean"/> - </exec> -</target> - -</project> diff --git a/java/eclipse/files/make_motif.xml b/java/eclipse/files/make_motif.xml deleted file mode 100644 index 9952d3c1974d..000000000000 --- a/java/eclipse/files/make_motif.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="build_motif_freebsd_lib" basedir="../../.."> - -<target name="init_linux"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/linux" /> - <property name="lib_destdir" value="${fragment_dir}/os/linux/x86" /> - <property name="lib_extension" value=".so"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="init_freebsd"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/freebsd" /> - <property name="lib_destdir" value="${fragment_dir}/os/freebsd/x86" /> - <property name="lib_extension" value=".so"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="init_aix"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/aix" /> - <property name="lib_destdir" value="${fragment_dir}/os/aix/ppc" /> - <property name="lib_extension" value=".a"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="init_hpux_PA_RISC"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/hpux" /> - <property name="lib_destdir" value="${fragment_dir}/os/hpux/PA_RISC" /> - <property name="lib_extension" value=".sl"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="init_hpux_ia64"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/hpux" /> - <property name="lib_destdir" value="${fragment_dir}/os/hpux/ia64" /> - <property name="lib_extension" value=".so"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="init_solaris"> - <tstamp/> - <property name="fragment_dir" value="${basedir}/../org.eclipse.swt.motif" /> - <property name="jar_destdir" value="${fragment_dir}/ws/solaris" /> - <property name="lib_destdir" value="${fragment_dir}/os/solaris/sparc" /> - <property name="lib_extension" value=".so"/> - - <mkdir dir="${lib_destdir}" /> -</target> - -<target name="build_file_lib"> - <exec dir="./bin/library" executable="sh"> - <arg line="${basedir}/bin/library/build.sh"/> - </exec> - <copy todir="${lib_destdir}"> - <fileset dir="${basedir}/bin/library/" includes="*${lib_extension}"/> - </copy> - <eclipse.refreshLocal resource="org.eclipse.swt.motif" depth="infinite" /> -</target> - -<!-- Build swt.so for motif linux --> -<!-- Output .so for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_linux_lib" depends="init_linux,build_file_lib"> -</target> - -<!-- Build swt.so for motif freebsd --> -<!-- Output .so for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_freebsd_lib" depends="init_freebsd,build_file_lib"> -</target> - -<!-- Build swt.so for aix ppc --> -<!-- Output .so for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_aix_lib" depends="init_aix,build_file_lib"> -</target> - -<!-- Build swt.so for hpux PA_RISC --> -<!-- Output .sl for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_hpux_PA_RISC_lib" depends="init_hpux_PA_RISC,build_file_lib"> -</target> - -<!-- Build swt.so for hpux ia64 --> -<!-- Output .so for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_hpux_ia64_lib" depends="init_hpux_ia64,build_file_lib"> -</target> - -<!-- Build swt.so for solaris sparc --> -<!-- Output .so for this platform into the org.eclipse.swt.motif/os directory --> -<target name="build_motif_solaris_lib" depends="init_solaris,build_file_lib"> -</target> - -<target name="clean"> - <tstamp/> - <exec dir="./bin/library" executable="sh"> - <arg line="${basedir}/bin/library/build.sh"/> - <arg line="clean"/> - </exec> -</target> - -</project> diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh new file mode 100644 index 000000000000..ed38417a85b6 --- /dev/null +++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh @@ -0,0 +1,42 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Fri May 13 11:37:09 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Sat May 14 21:02:00 2005 +@@ -100,6 +100,33 @@ + ;; + esac + ;; ++ "FreeBSD") ++ CC=gcc ++ LD=gcc ++ XTEST_LIB_PATH=$X11BASE/lib ++ GECKO_I=${X11BASE}/include/${BROWSER} ++ GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" ++ GECKO_L=${X11BASE}/lib/${BROWSER} ++ GECKO_LIBS="-L${GECKO_L} -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz" ++ case $MODEL in ++ "amd64") ++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 ++ SWT_PTR_CFLAGS=-DSWT_PTR_SIZE_64 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.amd64 ++ makefile="make_freebsd.mak" ++ echo "Building FreeBSD GTK AMD64 version of SWT" ++ ;; ++ "i386") ++ AWT_LIB_PATH=$JAVA_HOME/jre/lib/i386 ++ OUTPUT_DIR=../../../org.eclipse.swt.gtk.freebsd.x86 ++ makefile="make_freebsd.mak" ++ echo "Building FreeBSD GTK x86 version of SWT" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + CC=gcc + LD=gcc +@@ -128,4 +155,4 @@ + + export CC LD JAVA_HOME AWT_LIB_PATH XTEST_LIB_PATH GECKO_SDK GECKO_INCLUDES GECKO_LIBS SWT_PTR_CFLAGS CDE_HOME OUTPUT_DIR + +-make -f $makefile ${1} ${2} ${3} ${4} ++gmake -f $makefile ${1} ${2} ${3} ${4} diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak new file mode 100644 index 000000000000..967dec3c6db3 --- /dev/null +++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-make_freebsd.mak @@ -0,0 +1,23 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak.orig Sat May 14 19:50:23 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak Sat May 14 21:24:34 2005 +@@ -78,15 +78,16 @@ + CFLAGS = -O -Wall \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ +- -DLINUX -DGTK \ ++ -DFREEBSD -DGTK \ + -I$(JAVA_HOME)/include \ + -I$(JAVA_HOME)/include/freebsd \ +- -fpic \ ++ -I$(X11BASE)/include \ ++ -fpic -fPIC \ + ${SWT_PTR_CFLAGS} +-LIBS = -shared -fpic -s ++LIBS = -shared -fpic -fPIC -s + + +-all: make_swt make_atk make_gnome make_awt ++all: make_swt make_atk $(MAKE_GNOME) make_awt $(MAKE_MOZILLA) $(MAKE_CAIRO) + + # + # SWT libs diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h b/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h new file mode 100644 index 000000000000..0e47fc2a22f4 --- /dev/null +++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-os_custom.h @@ -0,0 +1,59 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h.orig Mon Jun 27 21:54:10 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h Thu Jul 14 20:28:19 2005 +@@ -21,31 +21,31 @@ + #define PTR_sizeof() sizeof(void *) + + /* Libraries for dynamic loaded functions */ +-#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so.0" +-#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so.0" +-#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so.0" +-#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so.0" +-#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so.0" +-#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so.0" +-#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so.0" +-#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so.0" +-#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so.0" +-#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so.0" ++#define gtk_file_chooser_add_filter_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_dialog_new_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_current_folder_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_filename_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_get_filenames_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_current_folder_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_current_name_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_extra_widget_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_filename_LIB "libgtk-x11-2.0.so" ++#define gtk_file_chooser_set_select_multiple_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_add_pattern_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_new_LIB "libgtk-x11-2.0.so" ++#define gtk_file_filter_set_name_LIB "libgtk-x11-2.0.so" ++#define gtk_tree_selection_get_selected_rows_LIB "libgtk-x11-2.0.so" ++#define gtk_tree_view_column_cell_get_position_LIB "libgtk-x11-2.0.so" ++#define gtk_entry_set_alignment_LIB "libgtk-x11-2.0.so" ++#define gdk_draw_pixbuf_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_default_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_monitor_at_window_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_monitor_geometry_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_n_monitors_LIB "libgdk-x11-2.0.so" ++#define gdk_screen_get_number_LIB "libgdk-x11-2.0.so" ++#define gdk_window_set_keep_above_LIB "libgdk-x11-2.0.so" ++#define gdk_window_set_accept_focus_LIB "libgdk-x11-2.0.so" ++#define gdk_x11_screen_get_window_manager_name_LIB "libgdk-x11-2.0.so" + + /* Field accessors */ + #define GTK_ACCEL_LABEL_SET_ACCEL_STRING(arg0, arg1) (arg0)->accel_string = arg1 diff --git a/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh b/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh new file mode 100644 index 000000000000..67f3e36be840 --- /dev/null +++ b/java/eclipse/files/manualpatch-plugins-swt-motif-build.sh @@ -0,0 +1,28 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh.orig Fri May 13 11:37:09 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh Sat May 14 21:03:05 2005 +@@ -54,6 +54,18 @@ + echo "Building Linux motif x86 version of SWT" + esac + ;; ++ "FreeBSD") ++ case $MODEL in ++ i?86) ++ OUTPUT_DIR=../../../org.eclipse.swt.motif.freebsd.x86 ++ makefile="make_freebsd.mak" ++ echo "Building FreeBSD motif x86 version of SWT" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + case $MODEL in + *) +@@ -113,4 +125,4 @@ + + export JAVA_HOME MOTIF_HOME CDE_HOME OUTPUT_DIR + +-make -f $makefile $1 $2 $3 $4 +\ No newline at end of file ++gmake -f $makefile $1 $2 $3 $4 diff --git a/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak b/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak new file mode 100644 index 000000000000..2470de02e8d1 --- /dev/null +++ b/java/eclipse/files/manualpatch-plugins-swt-motif-make_freebsd.mak @@ -0,0 +1,44 @@ +--- plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak.orig Thu Jul 14 20:06:19 2005 ++++ plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/make_freebsd.mak Thu Jul 14 20:14:57 2005 +@@ -25,26 +25,26 @@ + WS_PREFIX = motif + SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + SWT_OBJS = swt.o callback.o os.o os_structs.o os_custom.o os_stats.o +-SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L/usr/lib -L/usr/X11R6/lib \ +- -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -ldl -lXinerama -lXtst ++SWT_LIBS = -L$(MOTIF_HOME)/lib -lXm -L$(PREFIX)/lib -L$(X11BASE)/lib \ ++ -rpath . -x -shared -lX11 -lm -lXext -lXt -lXp -lXinerama + + # Uncomment for Native Stats tool + #NATIVE_STATS = -DNATIVE_STATS + +-CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DMOTIF -fpic \ +- -I$(JAVA_HOME)/include -I$(MOTIF_HOME)/include -I/usr/X11R6/include ++CFLAGS = -O -s -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DMOTIF -fpic -fPIC \ ++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -I$(MOTIF_HOME)/include -I$(X11BASE)/include -I$(PREFIX)/include + + # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) + GNOME_PREFIX = swt-gnome + GNOME_LIB = lib$(GNOME_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o +-GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DLINUX -DGTK -I$(JAVA_HOME)/include `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` ++GNOME_CFLAGS = -O -Wall -DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DFREEBSD -DGTK -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd -fpic -fPIC `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` + GNOME_LIBS = -shared -fpic -fPIC `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 + + AWT_PREFIX = swt-awt + AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so + AWT_OBJS = swt_awt.o +-AWT_LIBS = -L$(JAVA_HOME)/jre/bin -ljawt -shared ++AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(MACHINE_ARCH) -ljawt -shared + + GTK_PREFIX = swt-gtk + GTK_LIB = lib$(GTK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so +@@ -77,7 +77,7 @@ + ${SWT_PTR_CFLAGS} + MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS} + +-all: make_swt make_awt make_gnome make_gtk ++all: make_swt make_awt $(MAKE_GNOME) make_gtk + + make_swt: $(SWT_LIB) + diff --git a/java/eclipse/files/patch-assemble b/java/eclipse/files/patch-assemble new file mode 100644 index 000000000000..69143bf43c7e --- /dev/null +++ b/java/eclipse/files/patch-assemble @@ -0,0 +1,39 @@ +--- assemble.org.eclipse.sdk.linux.motif.x86.xml.orig Wed Jul 13 00:36:40 2005 ++++ assemble.org.eclipse.sdk.linux.motif.x86.xml Wed Jul 13 00:38:19 2005 +@@ -610,10 +610,5 @@ + </exec> + <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> + <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> +- <exec executable="rm"> +- <arg line="-rf"/> +- <arg line="'${assemblyTempDir}'"/> +- </exec> +- <delete dir="${assemblyTempDir}"/> + </target> + </project> +--- assemble.org.eclipse.sdk.linux.gtk.x86.xml.orig Wed Jul 13 00:40:52 2005 ++++ assemble.org.eclipse.sdk.linux.gtk.x86.xml Wed Jul 13 00:40:58 2005 +@@ -610,10 +610,5 @@ + </exec> + <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> + <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> +- <exec executable="rm"> +- <arg line="-rf"/> +- <arg line="'${assemblyTempDir}'"/> +- </exec> +- <delete dir="${assemblyTempDir}"/> + </target> + </project> +--- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml.orig Wed Jul 13 00:43:03 2005 ++++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml Wed Jul 13 00:43:07 2005 +@@ -610,10 +610,5 @@ + </exec> + <move file="${archiveFullPath}" tofile="${assemblyTempDir}/${collectingFolder}/tmp.tar"/> + <gzip src="${assemblyTempDir}/${collectingFolder}/tmp.tar" zipfile="${archiveFullPath}"/> +- <exec executable="rm"> +- <arg line="-rf"/> +- <arg line="'${assemblyTempDir}'"/> +- </exec> +- <delete dir="${assemblyTempDir}"/> + </target> + </project> diff --git a/java/eclipse/files/patch-assemble-all b/java/eclipse/files/patch-assemble-all deleted file mode 100644 index 4ffff7bbf067..000000000000 --- a/java/eclipse/files/patch-assemble-all +++ /dev/null @@ -1,15 +0,0 @@ ---- assemble.org.eclipse.sdk.all.xml.orig Sun Oct 17 22:04:02 2004 -+++ assemble.org.eclipse.sdk.all.xml Sun Oct 17 22:03:18 2004 -@@ -19,6 +19,12 @@ - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86"> - <property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/> - </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.gtk.x86"> -+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.gtk.x86.xml"/> -+ </ant> -+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.freebsd.motif.x86"> -+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.freebsd.motif.x86.xml"/> -+ </ant> - <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.solaris.motif.sparc"> - <property name="assembleScriptName" value="assemble.org.eclipse.sdk.solaris.motif.sparc.xml"/> - </ant> diff --git a/java/eclipse/files/patch-build b/java/eclipse/files/patch-build index 21a526f1b77f..3dbdaaa59210 100644 --- a/java/eclipse/files/patch-build +++ b/java/eclipse/files/patch-build @@ -1,22 +1,11 @@ ---- build.orig Thu Sep 16 15:50:23 2004 -+++ build Sat Oct 23 06:19:32 2004 -@@ -1,6 +1,6 @@ - #! /bin/sh - --export ANT_OPTS=-Xmx1000M -+export ANT_OPTS=-Xmx128M - - bootclasspath=$JAVA_HOME/jre/lib/rt.jar - os="" -@@ -51,9 +51,9 @@ +--- build.orig Wed Jul 13 00:45:46 2005 ++++ build Wed Jul 13 00:46:02 2005 +@@ -52,7 +52,7 @@ exit 1 fi --if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-amd64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||[ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] -+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-amd64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] ||[ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ] +-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] ++if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "freebsd-gtk-x86" ] || [ "$os-$ws-$arch" = "freebsd-motif-x86" ] || [ "$os-$ws-$arch" = "freebsd-gtk-amd64" ] then -- ant -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch -Dbootclasspath=$bootclasspath -DjavacTarget=1.2 -+ ant -buildfile build.xml $target -DinstallOs=$os -DinstallWs=$ws -DinstallArch=$arch -Dbootclasspath=$bootclasspath -DjavacTarget=1.4 - else - echo "The os-ws-arch combination of $os-$ws-$arch is not valid." - exit 1 + ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH + ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml diff --git a/java/eclipse/files/patch-build.bat b/java/eclipse/files/patch-build.bat new file mode 100644 index 000000000000..27006ce8beda --- /dev/null +++ b/java/eclipse/files/patch-build.bat @@ -0,0 +1,12 @@ +--- build.bat.orig Mon Jun 27 21:55:26 2005 ++++ build.bat Sun Jul 17 18:21:31 2005 +@@ -44,6 +44,9 @@ + if %os%-%ws%-%arch%==qnx-photon-x86 goto run + if %os%-%ws%-%arch%==hpux-motif-ia64_32 goto run + if %os%-%ws%-%arch%==macosx-carbon-ppc goto run ++if %os%-%ws%-%arch%==freebsd-motif-x86 goto run ++if %os%-%ws%-%arch%==freebsd-gtk-x86 goto run ++if %os%-%ws%-%arch%==freebsd-gtk-amd64 goto run + + ECHO The ws os arch combination entered is not valid. + goto end diff --git a/java/eclipse/files/patch-build.xml b/java/eclipse/files/patch-build.xml new file mode 100644 index 000000000000..d9b351762b89 --- /dev/null +++ b/java/eclipse/files/patch-build.xml @@ -0,0 +1,30 @@ +--- build.xml.orig Mon Jun 27 21:55:26 2005 ++++ build.xml Sun Jul 17 18:50:50 2005 +@@ -63,11 +63,11 @@ + <!--unzip launcher --> + <property name="launcherlibs" value="${buildDirectory}/launchertmp" /> + <mkdir dir="${launcherlibs}" /> +- <unzip dest="${launcherlibs}"> +- <fileset dir="${buildDirectory}/plugins/org.eclipse.platform.source/src/"> +- <include name="org.eclipse.platform_*/launchersrc.zip" /> ++ <copy todir="${launcherlibs}"> ++ <fileset dir="${buildDirectory}/features/org.eclipse.platform.launchers"> ++ <include name ="**"/> + </fileset> +- </unzip> ++ </copy> + <exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true"> + <arg line="build.sh" /> + </exec> +@@ -265,7 +265,10 @@ + + <!--used to add doc plug-ins to result after initial assembly--> + <condition property="archive.format" value="tar"> +- <equals arg1="${installOs}" arg2="linux" /> ++ <or> ++ <equals arg1="${installOs}" arg2="linux" /> ++ <equals arg1="${installOs}" arg2="freebsd" /> ++ </or> + </condition> + <property name="archive.format" value="zip" /> + </target> diff --git a/java/eclipse/files/patch-eclipseShm b/java/eclipse/files/patch-eclipseShm deleted file mode 100644 index 901f8d787326..000000000000 --- a/java/eclipse/files/patch-eclipseShm +++ /dev/null @@ -1,15 +0,0 @@ ---- plugins/platform-launcher/library/eclipseShm.c.orig Wed Apr 21 03:55:49 2004 -+++ plugins/platform-launcher/library/eclipseShm.c Wed Apr 21 03:55:57 2004 -@@ -178,11 +178,11 @@ - - #else /* Unix like platforms */ - -+#include <sys/types.h> - #include <sys/shm.h> - #include <string.h> - #include <stdlib.h> - #include <stdio.h> --#include <sys/types.h> - #include <unistd.h> - - int createSharedData(char** id, int size) { diff --git a/java/eclipse/files/patch-features-jdt-build b/java/eclipse/files/patch-features-jdt-build.xml index 7c1cc432fdb7..05d56b033f71 100644 --- a/java/eclipse/files/patch-features-jdt-build +++ b/java/eclipse/files/patch-features-jdt-build.xml @@ -1,21 +1,27 @@ ---- features/org.eclipse.jdt/build.xml.orig Thu Jun 3 00:23:02 2004 -+++ features/org.eclipse.jdt/build.xml Thu Jun 3 00:24:29 2004 -@@ -162,6 +162,18 @@ +--- features/org.eclipse.jdt/build.xml.orig Fri May 13 11:34:52 2005 ++++ features/org.eclipse.jdt/build.xml Sat May 14 18:42:27 2005 +@@ -164,6 +164,24 @@ <fileset dir="${basedir}/rootfiles" includes="**" /> </copy> </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ </copy> ++ </target> + <target name="rootFilesfreebsd_gtk_x86"> + <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true"> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles" includes="**" /> + </copy> + </target> + <target name="rootFilesfreebsd_motif_x86"> + <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true"> ++ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> + <fileset dir="${basedir}/rootfiles" includes="**" /> + </copy> + </target> <target name="rootFilessolaris_motif_sparc"> <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> - <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true"> + <copy todir="${feature.base}/solaris.motif.sparc/${collectingFolder}" failonerror="true" overwrite="true"> diff --git a/java/eclipse/files/patch-features-jdt-source-build b/java/eclipse/files/patch-features-jdt-source-build deleted file mode 100644 index 620751087709..000000000000 --- a/java/eclipse/files/patch-features-jdt-source-build +++ /dev/null @@ -1,13 +0,0 @@ ---- features/org.eclipse.jdt.source/build.xml.orig Sun Oct 17 22:12:02 2004 -+++ features/org.eclipse.jdt.source/build.xml Sun Oct 17 22:13:55 2004 -@@ -94,6 +94,10 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilesaix_motif_ppc"> diff --git a/java/eclipse/files/patch-features-jdt-source-build.xml b/java/eclipse/files/patch-features-jdt-source-build.xml new file mode 100644 index 000000000000..28af8014b52f --- /dev/null +++ b/java/eclipse/files/patch-features-jdt-source-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.jdt.source/build.xml.orig Sat Feb 19 12:09:34 2005 ++++ features/org.eclipse.jdt.source/build.xml Sat Mar 26 18:31:36 2005 +@@ -96,6 +96,12 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFilessolaris_motif_sparc"> + </target> + <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-launchers-gtk-build.sh b/java/eclipse/files/patch-features-launchers-gtk-build.sh new file mode 100644 index 000000000000..a3e68b8f3260 --- /dev/null +++ b/java/eclipse/files/patch-features-launchers-gtk-build.sh @@ -0,0 +1,41 @@ +--- features/org.eclipse.platform.launchers/library/gtk/build.sh.orig Fri Apr 1 13:57:19 2005 ++++ features/org.eclipse.platform.launchers/library/gtk/build.sh Sun Apr 3 11:37:51 2005 +@@ -67,6 +67,23 @@ + ;; + esac + ;; ++ "FreeBSD") ++ makefile="make_freebsd.mak" ++ defaultOS="freebsd" ++ case $MODEL in ++ "amd64") ++ defaultOSArch="amd64" ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ "i386") ++ defaultOSArch="x86" ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; ++ *) ++ echo "*** Unknown MODEL <${MODEL}>" ++ ;; ++ esac ++ ;; + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" +@@ -112,11 +129,11 @@ + # 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 +- make -f $makefile all ++ gmake -f $makefile clean ++ gmake -f $makefile all + fi + else + echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak b/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak new file mode 100644 index 000000000000..8fef6388c620 --- /dev/null +++ b/java/eclipse/files/patch-features-launchers-gtk-make_freebsd.mak @@ -0,0 +1,11 @@ +--- features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak.orig Sun Apr 17 20:24:58 2005 ++++ features/org.eclipse.platform.launchers/library/gtk/make_freebsd.mak Sun Apr 17 20:25:45 2005 +@@ -26,7 +26,7 @@ + CC=gcc + OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseGtk.o + EXEC = $(PROGRAM_OUTPUT) +-LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lgdk-x11-2.0 ++LIBS = `pkg-config --libs gtk+-2.0` + CFLAGS = -O -s \ + -fpic \ + -DMOZILLA_FIX \ diff --git a/java/eclipse/files/patch-features-launchers-library-eclipseShm.c b/java/eclipse/files/patch-features-launchers-library-eclipseShm.c new file mode 100644 index 000000000000..f351472d932b --- /dev/null +++ b/java/eclipse/files/patch-features-launchers-library-eclipseShm.c @@ -0,0 +1,17 @@ +--- features/org.eclipse.platform.launchers/library/eclipseShm.c.orig Fri Apr 1 13:55:58 2005 ++++ features/org.eclipse.platform.launchers/library/eclipseShm.c Sun Apr 3 11:34:02 2005 +@@ -182,11 +182,13 @@ + + #else /* Unix like platforms */ + ++#include <machine/param.h> ++#include <sys/types.h> ++#include <sys/ipc.h> + #include <sys/shm.h> + #include <string.h> + #include <stdlib.h> + #include <stdio.h> +-#include <sys/types.h> + #include <unistd.h> + + int createSharedData(char** id, int size) { diff --git a/java/eclipse/files/patch-features-launchers-motif-build.sh b/java/eclipse/files/patch-features-launchers-motif-build.sh new file mode 100644 index 000000000000..3dfeb9174230 --- /dev/null +++ b/java/eclipse/files/patch-features-launchers-motif-build.sh @@ -0,0 +1,33 @@ +--- features/org.eclipse.platform.launchers/library/motif/build.sh~ Sat Feb 19 12:13:49 2005 ++++ features/org.eclipse.platform.launchers/library/motif/build.sh Sun Mar 20 15:27:04 2005 +@@ -55,6 +55,15 @@ + MOTIF_HOME=/bluebird/teamswt/swt-builddir/motif21 + OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" + ;; ++ "FreeBSD") ++ makefile="make_freebsd.mak" ++ defaultOS="freebsd" ++ defaultOSArch="x86" ++ defaultWS="motif" ++ X11_HOME=$X11BASE ++ MOTIF_HOME=$X11BASE ++ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" ++ ;; + "SunOS") + makefile="make_solaris.mak" + defaultOS="solaris" +@@ -122,11 +131,11 @@ + # 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 +- make -f $makefile all ++ gmake -f $makefile clean ++ gmake -f $makefile all + fi + else + echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-features-pde-build b/java/eclipse/files/patch-features-pde-build deleted file mode 100644 index 7bdd9a68275b..000000000000 --- a/java/eclipse/files/patch-features-pde-build +++ /dev/null @@ -1,13 +0,0 @@ ---- features/org.eclipse.pde/build.xml.orig Sun Oct 17 22:15:27 2004 -+++ features/org.eclipse.pde/build.xml Sun Oct 17 22:17:56 2004 -@@ -114,6 +114,10 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilesaix_motif_ppc"> diff --git a/java/eclipse/files/patch-features-pde-build.xml b/java/eclipse/files/patch-features-pde-build.xml new file mode 100644 index 000000000000..9e18780543c7 --- /dev/null +++ b/java/eclipse/files/patch-features-pde-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.pde/build.xml.orig Sat Feb 19 12:09:30 2005 ++++ features/org.eclipse.pde/build.xml Sat Mar 26 18:33:49 2005 +@@ -116,6 +116,12 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ </target> + <target name="rootFilessolaris_motif_sparc"> + </target> + <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-pde-source-build b/java/eclipse/files/patch-features-pde-source-build deleted file mode 100644 index 92b936b7a515..000000000000 --- a/java/eclipse/files/patch-features-pde-source-build +++ /dev/null @@ -1,13 +0,0 @@ ---- features/org.eclipse.pde.source/build.xml.orig Sun Oct 17 22:21:30 2004 -+++ features/org.eclipse.pde.source/build.xml Sun Oct 17 22:22:08 2004 -@@ -84,6 +84,10 @@ - </target> - <target name="rootFileslinux_motif_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> - <target name="rootFilessolaris_motif_sparc"> - </target> - <target name="rootFilesaix_motif_ppc"> diff --git a/java/eclipse/files/patch-features-pde-source-build.xml b/java/eclipse/files/patch-features-pde-source-build.xml new file mode 100644 index 000000000000..7318f68c0dee --- /dev/null +++ b/java/eclipse/files/patch-features-pde-source-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.pde.source/build.xml.orig Sat Feb 19 12:09:29 2005 ++++ features/org.eclipse.pde.source/build.xml Sat Mar 26 18:34:22 2005 +@@ -86,6 +86,12 @@ + </target> + <target name="rootFileslinux_motif_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ </target> + <target name="rootFilessolaris_motif_sparc"> + </target> + <target name="rootFilessolaris_gtk_sparc"> diff --git a/java/eclipse/files/patch-features-platform-build b/java/eclipse/files/patch-features-platform-build deleted file mode 100644 index ca72b5390887..000000000000 --- a/java/eclipse/files/patch-features-platform-build +++ /dev/null @@ -1,183 +0,0 @@ ---- features/org.eclipse.platform/build.xml.orig Thu Sep 16 15:45:46 2004 -+++ features/org.eclipse.platform/build.xml Sun Oct 17 22:44:56 2004 -@@ -64,6 +64,11 @@ - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}"> - <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk" target="${target}"> -+ <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -@@ -104,6 +109,11 @@ - </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif" target="${target}"> - <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif" target="${target}"> -+ <property name="arch" value="x86"/> - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> -@@ -192,6 +202,11 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.linux" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> -@@ -247,6 +262,11 @@ - <property name="os" value="qnx"/> - <property name="ws" value="photon"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.linux" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="linux"/> -@@ -444,7 +464,85 @@ - <copy todir="${feature.base}/features/org.eclipse.platform_3.0.1" failonerror="true"> - <fileset dir="${basedir}" includes="cpl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.0.1/feature.xml" selfVersion="3.0.1" featureIds="" pluginIds="org.apache.ant,1.6.2,org.apache.lucene,1.3.1,org.eclipse.ant.core,3.0.0,org.eclipse.compare,3.0.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.filebuffers,3.0.1,org.eclipse.core.expressions,3.0.0,org.eclipse.core.resources,3.0.1,org.eclipse.core.runtime,3.0.1,org.eclipse.core.runtime.compatibility,3.0.0,org.eclipse.osgi,3.0.1,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.0.0,org.eclipse.debug.core,3.0.1,org.eclipse.debug.ui,3.0.1,org.eclipse.help,3.0.0,org.eclipse.help.webapp,3.0.1,org.eclipse.help.base,3.0.1,org.eclipse.help.ui,3.0.0,org.eclipse.help.appserver,3.0.0,org.eclipse.help.ide,3.0.0,org.eclipse.platform,3.0.1,org.eclipse.platform.doc.user,3.0.1,org.eclipse.search,3.0.1,org.eclipse.swt,3.0.1,org.eclipse.team.core,3.0.0,org.eclipse.team.cvs.core,3.0.1,org.eclipse.team.cvs.ssh,3.0.0,org.eclipse.team.cvs.ssh2,3.0.0,org.eclipse.team.cvs.ui,3.0.1,org.eclipse.team.ui,3.0.1,org.eclipse.tomcat,4.1.30,org.eclipse.text,3.0.1,org.eclipse.jface,3.0.0,org.eclipse.jface.text,3.0.1,org.eclipse.ui.console,3.0.0,org.eclipse.ui.presentations.r21,3.0.1,org.eclipse.ui.intro,3.0.1,org.eclipse.ui.cheatsheets,3.0.1,org.eclipse.ui.workbench,3.0.1,org.eclipse.ui.workbench.texteditor,3.0.1,org.eclipse.ui.views,3.0.0,org.eclipse.ui.editors,3.0.1,org.eclipse.ui.forms,3.0.0,org.eclipse.ui,3.0.1,org.eclipse.ui.externaltools,3.0.1,org.eclipse.ui.ide,3.0.1,org.eclipse.update.configurator,3.0.0,org.eclipse.update.core,3.0.1,org.eclipse.update.scheduler,3.0.0,org.eclipse.update.ui,3.0.1,org.eclipse.ui.workbench.compatibility,3.0.0,org.eclipse.swt.motif,3.0.1,org.eclipse.swt.motif,3.0.1,org.eclipse.core.resources.hpux,3.0.0,org.eclipse.swt.gtk,3.0.1,org.eclipse.swt.gtk,3.0.1,org.eclipse.core.resources.linux,3.0.0,org.eclipse.update.core.linux,3.0.1,org.eclipse.swt.gtk64,3.0.1,org.eclipse.swt.gtk64,3.0.1,org.eclipse.update.core.linux,3.0.1,org.eclipse.swt.motif,3.0.1,org.eclipse.core.resources.linux,3.0.0,org.eclipse.update.core.linux,3.0.1,org.eclipse.swt.carbon,3.0.1,org.eclipse.core.resources.macosx,3.0.0,org.eclipse.ui.carbon,3.0.0,org.eclipse.swt.photon,3.0.1,org.eclipse.core.resources.qnx,3.0.0,org.eclipse.swt.motif,3.0.1,org.eclipse.swt.win32,3.0.1,org.eclipse.core.resources.win32,3.0.0,org.eclipse.ui.win32,3.0.1,org.eclipse.update.core.win32,3.0.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.0.1/feature.xml" selfVersion="3.0.1" featureIds="" pluginIds=" -+org.apache.ant,1.6.2, -+org.apache.lucene,1.3.1, -+org.eclipse.ant.core,3.0.0, -+org.eclipse.compare,3.0.0, -+org.eclipse.core.boot,3.0.0, -+org.eclipse.core.filebuffers,3.0.1, -+org.eclipse.core.expressions,3.0.0, -+org.eclipse.core.resources,3.0.1, -+org.eclipse.core.runtime,3.0.1, -+org.eclipse.core.runtime.compatibility,3.0.0, -+org.eclipse.osgi,3.0.1, -+org.eclipse.osgi.services,3.0.0, -+org.eclipse.osgi.util,3.0.0, -+org.eclipse.core.variables,3.0.0, -+org.eclipse.debug.core,3.0.1, -+org.eclipse.debug.ui,3.0.1, -+org.eclipse.help,3.0.0, -+org.eclipse.help.webapp,3.0.1, -+org.eclipse.help.base,3.0.1, -+org.eclipse.help.ui,3.0.0, -+org.eclipse.help.appserver,3.0.0, -+org.eclipse.help.ide,3.0.0, -+org.eclipse.platform,3.0.1, -+org.eclipse.platform.doc.user,3.0.1, -+org.eclipse.search,3.0.1, -+org.eclipse.swt,3.0.1, -+org.eclipse.team.core,3.0.0, -+org.eclipse.team.cvs.core,3.0.1, -+org.eclipse.team.cvs.ssh,3.0.0, -+org.eclipse.team.cvs.ssh2,3.0.0, -+org.eclipse.team.cvs.ui,3.0.1, -+org.eclipse.team.ui,3.0.1, -+org.eclipse.tomcat,4.1.30, -+org.eclipse.text,3.0.1, -+org.eclipse.jface,3.0.0, -+org.eclipse.jface.text,3.0.1, -+org.eclipse.ui.console,3.0.0, -+org.eclipse.ui.presentations.r21,3.0.1, -+org.eclipse.ui.intro,3.0.1, -+org.eclipse.ui.cheatsheets,3.0.1, -+org.eclipse.ui.workbench,3.0.1, -+org.eclipse.ui.workbench.texteditor,3.0.1, -+org.eclipse.ui.views,3.0.0, -+org.eclipse.ui.editors,3.0.1, -+org.eclipse.ui.forms,3.0.0, -+org.eclipse.ui,3.0.1, -+org.eclipse.ui.externaltools,3.0.1, -+org.eclipse.ui.ide,3.0.1, -+org.eclipse.update.configurator,3.0.0, -+org.eclipse.update.core,3.0.1, -+org.eclipse.update.scheduler,3.0.0, -+org.eclipse.update.ui,3.0.1, -+org.eclipse.ui.workbench.compatibility,3.0.0, -+org.eclipse.swt.motif,3.0.1, -+org.eclipse.swt.motif,3.0.1, -+org.eclipse.core.resources.hpux,3.0.0, -+org.eclipse.swt.gtk,3.0.1, -+org.eclipse.swt.gtk,3.0.1, -+org.eclipse.core.resources.freebsd,3.0.0, -+org.eclipse.update.core.freebsd,3.0.1, -+org.eclipse.core.resources.linux,3.0.0, -+org.eclipse.update.core.linux,3.0.1, -+org.eclipse.swt.gtk64,3.0.1, -+org.eclipse.swt.gtk64,3.0.1, -+org.eclipse.update.core.linux,3.0.1, -+org.eclipse.swt.motif,3.0.1, -+org.eclipse.core.resources.linux,3.0.0, -+org.eclipse.update.core.linux,3.0.1, -+org.eclipse.swt.carbon,3.0.1, -+org.eclipse.core.resources.macosx,3.0.0, -+org.eclipse.ui.carbon,3.0.0, -+org.eclipse.swt.photon,3.0.1, -+org.eclipse.core.resources.qnx,3.0.0, -+org.eclipse.swt.motif,3.0.1, -+org.eclipse.swt.win32,3.0.1, -+org.eclipse.core.resources.win32,3.0.0, -+org.eclipse.ui.win32,3.0.1, -+org.eclipse.update.core.win32,3.0.0,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -496,6 +594,28 @@ - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" /> - </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../../plugins/platform-launcher/bin/freebsd/motif" includes="**" /> -+ <fileset dir="${basedir}/freebsd.motif" includes="**" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ <fileset dir="${basedir}/configuration.files" includes="**" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> -+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD"> -+ <arg line="-s"/> -+ <arg line="libXm.so.2.1"/> -+ <arg line="libXm.so.2"/> -+ </exec> -+ <exec executable="ln" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" os="FreeBSD"> -+ <arg line="-s"/> -+ <arg line="libXm.so.2.1"/> -+ <arg line="libXm.so"/> -+ </exec> -+ </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true"> -@@ -517,6 +637,16 @@ - <arg line="libXm.so.2.1"/> - <arg line="libXm.so"/> - </exec> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../../plugins/platform-launcher/bin/freebsd/gtk" includes="**" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ <fileset dir="${basedir}/configuration.files" includes="**" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> diff --git a/java/eclipse/files/patch-features-platform-build.xml b/java/eclipse/files/patch-features-platform-build.xml new file mode 100644 index 000000000000..02c964e12473 --- /dev/null +++ b/java/eclipse/files/patch-features-platform-build.xml @@ -0,0 +1,97 @@ +--- features/org.eclipse.platform/build.xml.orig Mon Jun 27 21:52:50 2005 ++++ features/org.eclipse.platform/build.xml Thu Jul 14 00:30:56 2005 +@@ -92,6 +92,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.update.core.freebsd" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -132,6 +137,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.win32" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -346,7 +356,7 @@ + <copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false"> + <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="org.eclipse.rcp,3.1.0," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.0,org.eclipse.osgi.util,3.1.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.freebsd,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> + <antcall target="rootFiles${os}_${ws}_${arch}"/> + </target> + <target name="rootFileswin32_win32_x86"> +@@ -372,6 +382,19 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.x86" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/gtk" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.x86" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -405,6 +428,19 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.amd64" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> ++ <fileset dir="${basedir}/gtk" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.amd64" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -429,6 +465,21 @@ + </copy> + <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.motif.x86" includes="**" /> ++ <fileset dir="${basedir}/motif" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> ++ <fileset dir="${basedir}/motif" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> + </target> + <target name="rootFilessolaris_motif_sparc"> + <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> diff --git a/java/eclipse/files/patch-features-platform-source-build b/java/eclipse/files/patch-features-platform-source-build deleted file mode 100644 index 68c1f8c96348..000000000000 --- a/java/eclipse/files/patch-features-platform-source-build +++ /dev/null @@ -1,54 +0,0 @@ ---- features/org.eclipse.platform.source/build.xml.orig Sun Oct 17 22:47:16 2004 -+++ features/org.eclipse.platform.source/build.xml Sun Oct 17 22:52:58 2004 -@@ -37,6 +37,16 @@ - <property name="os" value="linux"/> - <property name="ws" value="motif"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.motif.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.macosx.carbon.ppc" target="${target}"> - <property name="arch" value="ppc"/> - <property name="os" value="macosx"/> -@@ -129,7 +139,21 @@ - <copy todir="${feature.base}/features/org.eclipse.platform.source_3.0.1" failonerror="true"> - <fileset dir="${basedir}" includes="cpl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.0.1/feature.xml" selfVersion="3.0.1" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.0.1,org.eclipse.platform.source,3.0.1,org.eclipse.platform.source.linux.gtk.ia64,3.0.1,org.eclipse.platform.source.macosx.carbon.ppc,3.0.1,org.eclipse.platform.source.qnx.photon.x86,3.0.1,org.eclipse.platform.source.linux.gtk.ppc,3.0.1,org.eclipse.platform.source.hpux.motif.PA_RISC,3.0.1,org.eclipse.platform.source.aix.motif.ppc,3.0.1,org.eclipse.platform.source.linux.gtk.x86,3.0.1,org.eclipse.platform.source.win32.win32.x86,3.0.1,org.eclipse.platform.source.solaris.motif.sparc,3.0.1,org.eclipse.platform.source.linux.gtk.amd64,3.0.1,org.eclipse.platform.source.linux.motif.x86,3.0.1,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.0.1/feature.xml" selfVersion="3.0.1" featureIds="" pluginIds="org.eclipse.platform.doc.isv,3.0.1, -+org.eclipse.platform.source,3.0.1, -+org.eclipse.platform.source.linux.gtk.ia64,3.0.1, -+org.eclipse.platform.source.macosx.carbon.ppc,3.0.1, -+org.eclipse.platform.source.qnx.photon.x86,3.0.1, -+org.eclipse.platform.source.linux.gtk.ppc,3.0.1, -+org.eclipse.platform.source.hpux.motif.PA_RISC,3.0.1, -+org.eclipse.platform.source.aix.motif.ppc,3.0.1, -+org.eclipse.platform.source.linux.gtk.x86,3.0.1, -+org.eclipse.platform.source.freebsd.gtk.x86,3.0.1, -+org.eclipse.platform.source.win32.win32.x86,3.0.1, -+org.eclipse.platform.source.solaris.motif.sparc,3.0.1, -+org.eclipse.platform.source.linux.gtk.amd64,3.0.1, -+org.eclipse.platform.source.linux.motif.x86,3.0.1, -+org.eclipse.platform.source.freebsd.motif.x86,3.0.1,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -154,6 +178,11 @@ - </target> - <target name="rootFilesqnx_photon_x86"> - </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ </target> -+ - - <target name="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.platform.source."> - <delete dir="${feature.temp.folder}"/> diff --git a/java/eclipse/files/patch-features-platform-source-build.xml b/java/eclipse/files/patch-features-platform-source-build.xml new file mode 100644 index 000000000000..3eb8270a1802 --- /dev/null +++ b/java/eclipse/files/patch-features-platform-source-build.xml @@ -0,0 +1,66 @@ +--- features/org.eclipse.platform.source/build.xml.orig Mon Jun 27 21:52:51 2005 ++++ features/org.eclipse.platform.source/build.xml Thu Jul 14 00:45:53 2005 +@@ -57,11 +57,21 @@ + <property name="os" value="linux"/> + <property name="ws" value="motif"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.motif.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="motif"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.linux.gtk.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.hpux.motif.PA_RISC" target="${target}"> + <property name="arch" value="PA_RISC"/> + <property name="os" value="hpux"/> +@@ -72,6 +82,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.source.freebsd.gtk.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.platform.doc.isv" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -136,22 +151,28 @@ + <copy todir="${feature.base}/features/org.eclipse.platform.source_3.1.0" failonerror="true" overwrite="false"> + <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="org.eclipse.rcp.source,3.1.0," pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="org.eclipse.rcp.source,3.1.0," pluginIds="org.eclipse.platform.doc.isv,3.1.0,org.eclipse.platform.source,3.1.0,org.eclipse.platform.source.linux.gtk.ia64,3.1.0,org.eclipse.platform.source.hpux.motif.ia64_32,3.1.0,org.eclipse.platform.source.qnx.photon.x86,3.1.0,org.eclipse.platform.source.linux.gtk.ppc,3.1.0,org.eclipse.platform.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.platform.source.hpux.motif.ia64,3.1.0,org.eclipse.platform.source.linux.gtk.x86_64,3.1.0,org.eclipse.platform.source.freebsd.gtk.amd64,3.1.0,org.eclipse.platform.source.linux.gtk.ppc64,3.1.0,org.eclipse.platform.source.macosx.carbon.ppc,3.1.0,org.eclipse.platform.source.linux.gtk.x86,3.1.0,org.eclipse.platform.source.freebsd.gtk.x86,3.1.0,org.eclipse.platform.source.win32.win32.x86,3.1.0,org.eclipse.platform.source.linux.motif.x86,3.1.0,org.eclipse.platform.source.freebsd.motif.x86,3.1.0,"/> + <antcall target="rootFiles${os}_${ws}_${arch}"/> + </target> + <target name="rootFileswin32_win32_x86"> + </target> + <target name="rootFileslinux_gtk_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + </target> + <target name="rootFileslinux_gtk_ppc64"> + </target> + <target name="rootFileslinux_gtk_x86_64"> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + </target> + <target name="rootFileslinux_motif_x86"> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> + </target> + <target name="rootFilessolaris_motif_sparc"> + </target> diff --git a/java/eclipse/files/patch-features-platform-source-feature b/java/eclipse/files/patch-features-platform-source-feature deleted file mode 100644 index b4a1b73ebee0..000000000000 --- a/java/eclipse/files/patch-features-platform-source-feature +++ /dev/null @@ -1,9 +0,0 @@ ---- features/org.eclipse.platform.source/feature.xml.orig Sun Oct 17 22:47:27 2004 -+++ features/org.eclipse.platform.source/feature.xml Sun Oct 17 22:57:32 2004 -@@ -23,4 +23,6 @@ - <plugin ws="motif" os="solaris" fragment="true" arch="sparc" download-size="0" install-size="0" id="org.eclipse.platform.source.solaris.motif.sparc" version="3.0.1"/> - <plugin ws="gtk" os="linux" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.amd64" version="3.0.1"/> - <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.0.1"/> -+ <plugin ws="motif" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.motif.x86" version="3.0.1"/> -+ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.0.1"/> - </feature> diff --git a/java/eclipse/files/patch-features-platform-source-feature.xml b/java/eclipse/files/patch-features-platform-source-feature.xml new file mode 100644 index 000000000000..04d17e6eecfa --- /dev/null +++ b/java/eclipse/files/patch-features-platform-source-feature.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.platform.source/feature.xml.orig Mon Jun 27 21:52:50 2005 ++++ features/org.eclipse.platform.source/feature.xml Thu Jul 14 00:54:19 2005 +@@ -20,9 +20,12 @@ + <plugin ws="motif" os="hpux" fragment="true" arch="PA_RISC" download-size="0" install-size="0" id="org.eclipse.platform.source.hpux.motif.PA_RISC" version="3.1.0"/> + <plugin ws="motif" os="hpux" fragment="true" arch="ia64" download-size="0" install-size="0" id="org.eclipse.platform.source.hpux.motif.ia64" version="3.1.0"/> + <plugin ws="gtk" os="linux" fragment="true" arch="x86_64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86_64" version="3.1.0"/> ++ <plugin ws="gtk" os="freebsd" fragment="true" arch="amd64" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.amd64" version="3.1.0"/> + <plugin ws="gtk" os="linux" fragment="true" arch="ppc64" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.ppc64" version="3.1.0"/> + <plugin ws="carbon" os="macosx" fragment="true" arch="ppc" download-size="0" install-size="0" id="org.eclipse.platform.source.macosx.carbon.ppc" version="3.1.0"/> + <plugin ws="gtk" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.gtk.x86" version="3.1.0"/> ++ <plugin ws="gtk" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.gtk.x86" version="3.1.0"/> + <plugin ws="win32" os="win32" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.win32.win32.x86" version="3.1.0"/> + <plugin ws="motif" os="linux" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.linux.motif.x86" version="3.1.0"/> ++ <plugin ws="motif" os="freebsd" fragment="true" arch="x86" download-size="0" install-size="0" id="org.eclipse.platform.source.freebsd.motif.x86" version="3.1.0"/> + </feature> diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml new file mode 100644 index 000000000000..6e257a9bac70 --- /dev/null +++ b/java/eclipse/files/patch-features-rcp-build.xml @@ -0,0 +1,108 @@ +--- features/org.eclipse.rcp/build.xml.orig Mon Jun 27 21:52:51 2005 ++++ features/org.eclipse.rcp/build.xml Fri Jul 15 00:34:31 2005 +@@ -37,6 +37,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="motif"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="motif"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.hpux.ia64_32" target="${target}"> + <property name="arch" value="ia64_32"/> + <property name="os" value="hpux"/> +@@ -72,6 +77,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.aix.ppc" target="${target}"> + <property name="arch" value="ppc"/> + <property name="os" value="aix"/> +@@ -82,6 +92,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.linux.ia64" target="${target}"> + <property name="arch" value="ia64"/> + <property name="os" value="linux"/> +@@ -185,7 +200,7 @@ + <copy todir="${feature.base}/features/org.eclipse.rcp_3.1.0" failonerror="true" overwrite="false"> + <fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg" /> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.gtk.linux.ia64,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.motif.hpux.ia64_32,3.1.0,org.eclipse.rcp,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.freebsd.x86,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.freebsd.amd64,3.1.0,org.eclipse.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.freebsd.x86,3.1.0,org.eclipse.swt.gtk.linux.ia64,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.motif.hpux.ia64_32,3.1.0,org.eclipse.rcp,3.1.0,"/> + <antcall target="rootFiles${os}_${ws}_${arch}"/> + </target> + <target name="rootFileswin32_win32_x86"> +@@ -211,6 +226,19 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.x86" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.x86" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -243,6 +271,19 @@ + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" /> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.gtk.amd64" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.amd64" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + <mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/> + <copy todir="${feature.base}/linux.gtk.ia64/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -266,6 +307,20 @@ + </copy> + <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" /> + <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" /> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> ++ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform/about_files/freebsd.motif.x86" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libcairo.so.1" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </copy> ++ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> + </target> + <target name="rootFilessolaris_motif_sparc"> + <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> diff --git a/java/eclipse/files/patch-features-rcp-source-build.xml b/java/eclipse/files/patch-features-rcp-source-build.xml new file mode 100644 index 000000000000..dcead525d938 --- /dev/null +++ b/java/eclipse/files/patch-features-rcp-source-build.xml @@ -0,0 +1,66 @@ +--- features/org.eclipse.rcp.source/build.xml.orig Mon Jun 27 21:52:50 2005 ++++ features/org.eclipse.rcp.source/build.xml Fri Jul 15 00:40:07 2005 +@@ -17,6 +17,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.amd64" target="${target}"> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.macosx.carbon.ppc" target="${target}"> + <property name="arch" value="ppc"/> + <property name="os" value="macosx"/> +@@ -67,11 +72,21 @@ + <property name="os" value="linux"/> + <property name="ws" value="motif"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.motif.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="motif"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.linux.gtk.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> + </ant> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.freebsd.gtk.x86" target="${target}"> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.rcp.source.solaris.gtk.sparc" target="${target}"> + <property name="arch" value="sparc"/> + <property name="os" value="solaris"/> +@@ -135,22 +150,28 @@ + <copy todir="${feature.base}/features/org.eclipse.rcp.source_3.1.0" failonerror="true" overwrite="false"> + <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> + </copy> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.0,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.0,org.eclipse.rcp.source.linux.gtk.ia64,3.1.0,org.eclipse.rcp.source.qnx.photon.x86,3.1.0,org.eclipse.rcp.source.linux.gtk.ppc,3.1.0,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.0,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.0,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.0,org.eclipse.rcp.source.linux.gtk.x86,3.1.0,org.eclipse.rcp.source.aix.motif.ppc,3.1.0,org.eclipse.rcp.source.win32.win32.x86,3.1.0,org.eclipse.rcp.source.solaris.motif.sparc,3.1.0,org.eclipse.rcp.source.linux.motif.x86,3.1.0,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp.source_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.eclipse.rcp.source,3.1.0,org.eclipse.rcp.source.hpux.motif.ia64_32,3.1.0,org.eclipse.rcp.source.linux.gtk.ia64,3.1.0,org.eclipse.rcp.source.qnx.photon.x86,3.1.0,org.eclipse.rcp.source.linux.gtk.ppc,3.1.0,org.eclipse.rcp.source.hpux.motif.PA_RISC,3.1.0,org.eclipse.rcp.source.linux.gtk.x86_64,3.1.0,org.eclipse.rcp.source.freebsd.gtk.amd64,3.1.0,org.eclipse.rcp.source.solaris.gtk.sparc,3.1.0,org.eclipse.rcp.source.macosx.carbon.ppc,3.1.0,org.eclipse.rcp.source.linux.gtk.x86,3.1.0,org.eclipse.rcp.source.freebsd.gtk.x86,3.1.0,org.eclipse.rcp.source.aix.motif.ppc,3.1.0,org.eclipse.rcp.source.win32.win32.x86,3.1.0,org.eclipse.rcp.source.solaris.motif.sparc,3.1.0,org.eclipse.rcp.source.linux.motif.x86,3.1.0,org.eclipse.rcp.source.freebsd.motif.x86,3.1.0,"/> + <antcall target="rootFiles${os}_${ws}_${arch}"/> + </target> + <target name="rootFileswin32_win32_x86"> + </target> + <target name="rootFileslinux_gtk_x86"> + </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> + <target name="rootFileslinux_gtk_ppc"> + </target> + <target name="rootFileslinux_gtk_ppc64"> + </target> + <target name="rootFileslinux_gtk_x86_64"> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> + <target name="rootFileslinux_gtk_ia64"> + </target> + <target name="rootFileslinux_motif_x86"> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> + </target> + <target name="rootFilessolaris_motif_sparc"> + </target> diff --git a/java/eclipse/files/patch-features-sdk-build b/java/eclipse/files/patch-features-sdk-build deleted file mode 100644 index 2ac5502e68d2..000000000000 --- a/java/eclipse/files/patch-features-sdk-build +++ /dev/null @@ -1,29 +0,0 @@ ---- features/org.eclipse.sdk/build.xml.orig Sat Jun 12 01:24:16 2004 -+++ features/org.eclipse.sdk/build.xml Sun Jun 20 12:36:26 2004 -@@ -84,6 +84,13 @@ - <fileset dir="${basedir}/../org.eclipse.platform/configuration.files" includes="**" /> - </copy> - </target> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/configuration.files" includes="**" /> -+ </copy> -+ </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true"> -@@ -103,6 +110,12 @@ - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true"> - <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> - <fileset dir="${basedir}/../org.eclipse.platform/configuration.files" includes="**" /> -+ </copy> -+ </target> -+ <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true"> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> - </copy> - </target> - <target name="rootFileslinux_gtk_amd64"> diff --git a/java/eclipse/files/patch-features-sdk-build.xml b/java/eclipse/files/patch-features-sdk-build.xml new file mode 100644 index 000000000000..2217569febc1 --- /dev/null +++ b/java/eclipse/files/patch-features-sdk-build.xml @@ -0,0 +1,15 @@ +--- features/org.eclipse.sdk/build.xml.orig Sat Feb 19 12:09:35 2005 ++++ features/org.eclipse.sdk/build.xml Sat Mar 26 18:40:52 2005 +@@ -90,6 +90,12 @@ + </target> + <target name="rootFileslinux_gtk_x86_64"> + </target> ++ <target name="rootFilesfreebsd_gtk_amd64"> ++ </target> ++ <target name="rootFilesfreebsd_gtk_x86"> ++ </target> ++ <target name="rootFilesfreebsd_motif_x86"> ++ </target> + <target name="rootFileslinux_motif_x86"> + </target> + <target name="rootFilessolaris_motif_sparc"> diff --git a/java/eclipse/files/patch-launcher-gtk-build.csh b/java/eclipse/files/patch-launcher-gtk-build.csh deleted file mode 100644 index 54bdb920dd0b..000000000000 --- a/java/eclipse/files/patch-launcher-gtk-build.csh +++ /dev/null @@ -1,17 +0,0 @@ ---- plugins/platform-launcher/library/gtk/build.csh.orig Sun Jun 13 22:33:13 2004 -+++ plugins/platform-launcher/library/gtk/build.csh Sun Jun 13 22:33:39 2004 -@@ -72,11 +72,11 @@ - # 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 -- make -f $makefile all -+ gmake -f $makefile clean -+ gmake -f $makefile all - endif - else - echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-launcher-make_gtk.mak b/java/eclipse/files/patch-launcher-make_gtk.mak deleted file mode 100644 index 66533fd3a983..000000000000 --- a/java/eclipse/files/patch-launcher-make_gtk.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/platform-launcher/library/gtk/make_gtk.mak.orig Sun Jun 13 22:31:21 2004 -+++ plugins/platform-launcher/library/gtk/make_gtk.mak Sun Jun 13 22:31:38 2004 -@@ -26,7 +26,7 @@ - # Define the object modules to be compiled and flags. - OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseGtk.o - EXEC = $(PROGRAM_OUTPUT) --LIBS = `pkg-config ?libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 -+LIBS = `pkg-config --libs-only-L gtk+-2.0` -lgtk-x11-2.0 -lgdk_pixbuf-2.0 - - CFLAGS = -O -s \ - -DMOZILLA_FIX \ diff --git a/java/eclipse/files/patch-launcher-motif-build.csh b/java/eclipse/files/patch-launcher-motif-build.csh deleted file mode 100644 index d041278b42d5..000000000000 --- a/java/eclipse/files/patch-launcher-motif-build.csh +++ /dev/null @@ -1,31 +0,0 @@ ---- plugins/platform-launcher/library/motif/build.csh.orig Sun Jun 20 12:38:06 2004 -+++ plugins/platform-launcher/library/motif/build.csh Sun Jun 20 12:40:27 2004 -@@ -48,6 +48,13 @@ - set defaultWS = "motif" - breaksw - -+ case FreeBSD: -+ set makefile = "make_freebsd.mak" -+ set defaultOS = "freebsd" -+ set defaultOSArch = "x86" -+ set defaultWS = "motif" -+ breaksw -+ - case Linux: - set makefile = "make_linux.mak" - set defaultOS = "linux" -@@ -120,11 +127,11 @@ - # 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 -- make -f $makefile all -+ gmake -f $makefile clean -+ gmake -f $makefile all - endif - else - echo "Unknown OS ($OS) -- build aborted" diff --git a/java/eclipse/files/patch-launcher-motif-make_linux.mak b/java/eclipse/files/patch-launcher-motif-make_linux.mak deleted file mode 100644 index 949e93722cae..000000000000 --- a/java/eclipse/files/patch-launcher-motif-make_linux.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/platform-launcher/library/motif/make_linux.mak.orig Sun Jun 20 12:51:29 2004 -+++ plugins/platform-launcher/library/motif/make_linux.mak Sun Jun 20 12:53:01 2004 -@@ -21,7 +21,7 @@ - # X11_HOME - X11 includes and libraries - # MOTIF_HOME - Motif include and libraries if not the same as X11_HOME - X11_HOME = /usr/X11R6 --MOTIF_HOME = /bluebird/teamswt/swt-builddir/motif21 -+MOTIF_HOME = $(X11_HOME) - - # Define the object modules to be compiled and flags. - OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseMotif.o \ diff --git a/java/eclipse/files/patch-plugins-core-build.xml b/java/eclipse/files/patch-plugins-core-build.xml new file mode 100644 index 000000000000..42dfac0c7320 --- /dev/null +++ b/java/eclipse/files/patch-plugins-core-build.xml @@ -0,0 +1,53 @@ +--- plugins/org.eclipse.core.resources.freebsd/build.xml.orig Wed Jul 27 09:39:39 2005 ++++ plugins/org.eclipse.core.resources.freebsd/build.xml Wed Jul 27 22:09:53 2005 +@@ -19,6 +19,20 @@ + </fileset> + </path> + <property name="bootclasspath" refid="path_bootclasspath"/> ++ <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script --> ++ <!-- Set a meaningful default value for when it is not. --> ++ <property name="eclipse-home" value="${basedir}/.."/> ++ <property environment="env" /> ++ <property name="CC" value="${env.CC}"/> ++ <property name="jdk-path" value="${env.JAVA_HOME}"/> ++ <property name="destination" value="${eclipse-home}/org.eclipse.core.resources.freebsd/os/freebsd/x86/"/> ++ <property name="obj-path" value="${eclipse-home}/org.eclipse.core.resources/src/"/> ++ <property name="src-path" value="${eclipse-home}/org.eclipse.core.resources.freebsd/src/"/> ++ ++ <!-- sets the properties --> ++ <property name="library-name" value="libcore_3_1_0"/> ++ <property name="library-platform" value="so"/> ++ <property name="library-file" value="${library-name}.${library-platform}"/> + + <target name="init" depends="properties"> + <condition property="pluginTemp" value="${buildTempFolder}/plugins"> +@@ -50,6 +64,29 @@ + </target> + + <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.core.resources.freebsd."> ++ <echo message="Building ${library-file}"/> ++ ++ <property name="header-path" value="${jdk-path}/include"/> ++ <property name="header-freebsd-path" value="${header-path}/freebsd" /> ++ ++ <echo message="${CC} -o ${library-file} -shared -fPIC -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/> ++ ++ <apply executable="${CC}" dest="${eclipse-home}/" parallel="false"> ++ <arg value="-o"/> ++ <arg value="${library-file}"/> ++ <arg value="-shared"/> ++ <arg value="-fPIC"/> ++ <arg value="-I${src-path}"/> ++ <arg value="-I${header-path}"/> ++ <arg value="-I${header-freebsd-path}"/> ++ <srcfile/> ++ <arg value="-static"/> ++ <arg value="-lc"/> ++ <fileset dir="${src-path}" includes="*.c"/> ++ <mapper type="glob" from="*.c" to="*.o"/> ++ </apply> ++ ++ <move file="${library-file}" todir="${destination}"/> + </target> + + <target name="build.sources" depends="init"> diff --git a/java/eclipse/files/patch-plugins-swt-gtk-build b/java/eclipse/files/patch-plugins-swt-gtk-build deleted file mode 100644 index 8fb309c988ff..000000000000 --- a/java/eclipse/files/patch-plugins-swt-gtk-build +++ /dev/null @@ -1,18 +0,0 @@ ---- plugins/org.eclipse.swt.gtk/build.xml.orig Wed Apr 21 00:24:26 2004 -+++ plugins/org.eclipse.swt.gtk/build.xml Wed Apr 21 00:24:39 2004 -@@ -10,7 +10,7 @@ - <property name="build.result.folder" value="${basedir}"/> - <property name="plugindir" value="../org.eclipse.swt"/> - <property name="destination" value="${basedir}"/> -- <property name="os" value="linux"/> -+ <property name="os" value="${os}"/> - <property name="ws" value="gtk"/> - <property name="arch" value="x86"/> - <property name="bootclasspath" value=""/> -@@ -291,4 +291,4 @@ - <delete dir="${temp.folder}"/> - </target> - --</project> -\ No newline at end of file -+</project> diff --git a/java/eclipse/files/patch-plugins-swt-motif-build b/java/eclipse/files/patch-plugins-swt-motif-build deleted file mode 100644 index e016d66d6f4f..000000000000 --- a/java/eclipse/files/patch-plugins-swt-motif-build +++ /dev/null @@ -1,18 +0,0 @@ ---- plugins/org.eclipse.swt.motif/build.xml.orig Sun Jun 20 12:55:20 2004 -+++ plugins/org.eclipse.swt.motif/build.xml Sun Jun 20 12:56:39 2004 -@@ -10,7 +10,7 @@ - <property name="build.result.folder" value="${basedir}"/> - <property name="plugindir" value="../org.eclipse.swt"/> - <property name="destination" value="${basedir}"/> -- <property name="os" value="linux"/> -+ <property name="os" value="${os}"/> - <property name="ws" value="motif"/> - <property name="arch" value="x86"/> - <property name="bootclasspath" value=""/> -@@ -315,4 +315,4 @@ - <delete dir="${temp.folder}"/> - </target> - --</project> -\ No newline at end of file -+</project> diff --git a/java/eclipse/files/patch-plugins-update-src-build.xml b/java/eclipse/files/patch-plugins-update-src-build.xml new file mode 100644 index 000000000000..1fa5cb7ccbd2 --- /dev/null +++ b/java/eclipse/files/patch-plugins-update-src-build.xml @@ -0,0 +1,31 @@ +--- plugins/org.eclipse.update.core.freebsd/src/build.xml Sat Apr 9 14:03:21 2005 ++++ ../files/plugins-update-src-build.xml Tue Feb 15 23:41:47 2005 +@@ -6,7 +6,7 @@ + <property name="eclipse-home" value="${basedir}/../.."/> + <property name="jdk-path" value="${java.home}"/> + <property name="destination" value="${eclipse-home}/org.eclipse.update.core.freebsd/os/freebsd/x86/"/> +- <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> ++ <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/src/"/> + <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> + + <!-- sets the properties --> +@@ -44,15 +44,16 @@ + <target name="build"> + <echo message="Building ${library-file}"/> + +- <property name="header-path" value="${jdk-path}/../include"/> ++ <property name="header-path" value="${jdk-path}/include"/> + <property name="header-freebsd-path" value="${header-path}/freebsd" /> + +- <echo message="gcc -o ${library-file} -shared -I${src-path} -I${header-freebsd-path} ${library-file} -static -lc"/> ++ <echo message="${CC} -o ${library-file} -shared -fPIC -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/> + +- <apply executable="gcc" dest="${eclipse-home}/" parallel="false"> ++ <apply executable="${CC}" dest="${eclipse-home}/" parallel="false"> + <arg value="-o"/> + <arg value="${library-file}"/> + <arg value="-shared"/> ++ <arg value="-fPIC"/> + <arg value="-I${src-path}"/> + <arg value="-I${header-path}"/> + <arg value="-I${header-freebsd-path}"/> diff --git a/java/eclipse/files/patch-plugins-update-src-update.c b/java/eclipse/files/patch-plugins-update-src-update.c new file mode 100644 index 000000000000..6d3991ec7358 --- /dev/null +++ b/java/eclipse/files/patch-plugins-update-src-update.c @@ -0,0 +1,15 @@ +--- plugins/org.eclipse.update.core.linux/src/update.c.orig Fri May 13 11:37:58 2005 ++++ plugins/org.eclipse.update.core.linux/src/update.c Sat May 14 19:01:31 2005 +@@ -12,7 +12,12 @@ + /* bug 82520 : need to include stdlib.h */
+ # include <stdlib.h>
+ # include <sys/types.h>
++#ifdef __FreeBSD__ ++# include <sys/param.h> ++# include <sys/mount.h> ++#else + # include <sys/statfs.h>
++#endif + # include <update.h>
+
+ /*
diff --git a/java/eclipse/files/patch-update.c b/java/eclipse/files/patch-update.c deleted file mode 100644 index 83b2047bf2b9..000000000000 --- a/java/eclipse/files/patch-update.c +++ /dev/null @@ -1,17 +0,0 @@ ---- plugins/org.eclipse.update.core.linux/src/update.c.orig Sun Jun 13 22:47:30 2004 -+++ plugins/org.eclipse.update.core.linux/src/update.c Sun Jun 13 22:48:22 2004 -@@ -10,8 +10,14 @@ - *******************************************************************************/
-
- # include <sys/types.h>
-+#ifdef __FreeBSD__ -+# include <sys/param.h> -+# include <sys/mount.h> -+# include "update.h" -+#else - # include <sys/statfs.h>
- # include <update.h>
-+#endif -
- /*
- * Class: org_eclipse_update_configuration_LocalSystemInfo
diff --git a/java/eclipse/files/swt-motif-build.sh b/java/eclipse/files/swt-motif-build.sh deleted file mode 100644 index 7e6ed8a8592f..000000000000 --- a/java/eclipse/files/swt-motif-build.sh +++ /dev/null @@ -1,105 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2000, 2004 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Common Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/cpl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# Kevin Cornell (Rational Software Corporation) -# Tom Tromey (Red Hat, Inc.) -# Sridhar Bidigalu (ICS) -#******************************************************************************* - -#!/bin/sh - -# Determine the operating system being built -OS=`uname -s` - -# build according to the operating system -case $OS in - - "AIX") - if [ "$1" = "clean" ]; then - make -f make_aix.mak clean - else - echo "Building AIX version of SWT and CDE DLLs." - make -f make_aix.mak make_swt - make -f make_aix.mak make_cde - fi - ;; - - "FreeBSD") - if [ "$1" = "clean" ]; then - gmake -f make_freebsd.mak clean - else - echo "Building FreeBSD version of SWT and GNOME DLLs." - gmake -f make_freebsd.mak ${1} ${2} ${3} ${4} - build_kde=`pkg_info -xc kdebase | grep "no packages match"` - if [ "$build_kde" != "" ]; then - echo "Building FreeBSD version of KDE DLL." - gmake -f make_freebsd.mak make_kde - fi - fi - ;; - - "Linux") - if [ "$1" = "clean" ]; then - make -f make_linux.mak clean - else - echo "Building Linux version of SWT and GNOME DLLs." - make -f make_linux.mak make_swt make_awt make_gnome make_gtk - - build_kde=`rpm -q kdebase | grep "not installed"` - if [ "$build_kde" = "" ]; then - echo "Building Linux version of KDE DLL." - make -f make_linux.mak make_kde - fi - fi - ;; - - "SunOS") - if [ "$1" = "clean" ]; then - make -f make_solaris.mak clean - else - echo "Building Solaris version of SWT and CDE DLLs." - make -f make_solaris.mak make_swt - make -f make_solaris.mak make_cde - fi - ;; - - "HP-UX") - # Determine the model number system being built - MODEL=`uname -m` - - case $MODEL in - - "ia64") - # ia64 based systems - if [ "$1" = "clean" ]; then - make -f make_hpux_ia64.mak clean - else - echo "Building HP-UX ia64 version of SWT and CDE DLLs." - make -f make_hpux_ia64.mak make_swt - make -f make_hpux_ia64.mak make_cde - fi - ;; - - *) - # PA_RISC based systems - if [ "$1" = "clean" ]; then - make -f make_hpux_PA_RISC.mak clean - else - echo "Building HP-UX PA_RISC version of SWT and CDE DLLs." - make -f make_hpux_PA_RISC.mak make_swt - make -f make_hpux_PA_RISC.mak make_cde - fi - ;; - esac - ;; - - *) - echo "Unknown OS -- build aborted" - ;; -esac diff --git a/java/eclipse/files/update-build.xml b/java/eclipse/files/update-build.xml deleted file mode 100644 index fc5007598f16..000000000000 --- a/java/eclipse/files/update-build.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="buildlibrary" default="run" basedir="."> - - <!-- The properties ${eclipse-home} ${jdk-path} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <property name="eclipse-home" value="${basedir}/../.."/> - <property name="jdk-path" value="${java.home}"/> - <property name="destination" value="${eclipse-home}/org.eclipse.update.core.freebsd/os/freebsd/x86/"/> - <property name="obj-path" value="${eclipse-home}/org.eclipse.update.core/src/"/> - <property name="src-path" value="${eclipse-home}/org.eclipse.update.core.freebsd/src/"/> - - <!-- sets the properties --> - <property name="library-name" value="libupdate"/> - <property name="library-platform" value="so"/> - <property name="library-file" value="${library-name}.${library-platform}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${obj-path}" includes="${library-file}"/> - <fileset dir="${obj-path}" includes="${library-name}.o"/> - </delete> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <delete> - <fileset dir="${obj-path}" includes="${library-file}"/> - <fileset dir="${obj-path}" includes="${library-name}.o"/> - </delete> - </target> - - - <!-- This target runs the build. --> - <target name="run" depends="init,build,cleanup"> - </target> - - <!-- This target build the library --> - <target name="build"> - <echo message="Building ${library-file}"/> - - <property name="header-path" value="${jdk-path}/include"/> - <property name="header-freebsd-path" value="${header-path}/freebsd" /> - - <echo message="${CC} -o ${library-file} -shared -I${src-path} -I${header-path} -I${header-freebsd-path} ${library-file} -static -lc"/> - - <apply executable="${CC}" dest="${eclipse-home}/" parallel="false"> - <arg value="-o"/> - <arg value="${library-file}"/> - <arg value="-shared"/> - <arg value="-I${src-path}"/> - <arg value="-I${header-path}"/> - <arg value="-I${header-freebsd-path}"/> - <srcfile/> - <arg value="-static"/> - <arg value="-lc"/> - <fileset dir="${src-path}" includes="*.c"/> - <mapper type="glob" from="*.c" to="*.o"/> - </apply> - - <move file="${library-file}" todir="${destination}"/> - </target> - - -</project> |