Added the x86_64 linux port as supplied by Intel. Removed the HPUX port from the build scripts. Restructured the fragments so that the arch specific bits of the linux port get their own fragments.

21 files changed, 144 insertions, 1 deletions

diff --git a/core/org.eclipse.cdt.core.linux.ia64/.project b/core/org.eclipse.cdt.core.linux.ia64/.project
new file mode 100644
index 00000000000..9a78313029b
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ia64/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.core.linux.ia64</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/org.eclipse.cdt.core.linux.ia64/build.properties b/core/org.eclipse.cdt.core.linux.ia64/build.properties
new file mode 100644
index 00000000000..99f473dc81f
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ia64/build.properties
@@ -0,0 +1,2 @@
+bin.includes = fragment.xml,\
+               os/
diff --git a/core/org.eclipse.cdt.core.linux.ia64/fragment.xml b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
new file mode 100644
index 00000000000..218d459404e
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ia64/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment
+   id="org.eclipse.cdt.core.linux.ia64"
+   name="CDT Core ia64 Fragment"
+   version="3.0.0"
+   provider-name="Eclipse.org"
+   plugin-id="org.eclipse.cdt.core"
+   plugin-version="3.0.0">
+
+</fragment>
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/ia64/libpty.so b/core/org.eclipse.cdt.core.linux.ia64/os/linux/ia64/libpty.so
index a02452e13e9..a02452e13e9 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/ia64/libpty.so
+++ b/core/org.eclipse.cdt.core.linux.ia64/os/linux/ia64/libpty.so
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/ia64/libspawner.so b/core/org.eclipse.cdt.core.linux.ia64/os/linux/ia64/libspawner.so
index 3a1a6808cf8..3a1a6808cf8 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/ia64/libspawner.so
+++ b/core/org.eclipse.cdt.core.linux.ia64/os/linux/ia64/libspawner.so
diff --git a/core/org.eclipse.cdt.core.linux.ppc/.project b/core/org.eclipse.cdt.core.linux.ppc/.project
new file mode 100644
index 00000000000..dd4fdd2df3e
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ppc/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.core.linux.ppc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/org.eclipse.cdt.core.linux.ppc/build.properties b/core/org.eclipse.cdt.core.linux.ppc/build.properties
new file mode 100644
index 00000000000..99f473dc81f
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ppc/build.properties
@@ -0,0 +1,2 @@
+bin.includes = fragment.xml,\
+               os/
diff --git a/core/org.eclipse.cdt.core.linux.ppc/fragment.xml b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
new file mode 100644
index 00000000000..ef389b20dc2
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.ppc/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment
+   id="org.eclipse.cdt.core.linux.ppc"
+   name="CDT Core ppc Fragment"
+   version="3.0.0"
+   provider-name="Eclipse.org"
+   plugin-id="org.eclipse.cdt.core"
+   plugin-version="3.0.0">
+
+</fragment>
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/ppc/libpty.so b/core/org.eclipse.cdt.core.linux.ppc/os/linux/ppc/libpty.so
index 8435417ed4b..8435417ed4b 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/ppc/libpty.so
+++ b/core/org.eclipse.cdt.core.linux.ppc/os/linux/ppc/libpty.so
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/ppc/libspawner.so b/core/org.eclipse.cdt.core.linux.ppc/os/linux/ppc/libspawner.so
index a9da6b3713f..a9da6b3713f 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/ppc/libspawner.so
+++ b/core/org.eclipse.cdt.core.linux.ppc/os/linux/ppc/libspawner.so
diff --git a/core/org.eclipse.cdt.core.linux.x86/.project b/core/org.eclipse.cdt.core.linux.x86/.project
new file mode 100644
index 00000000000..687a22346e3
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.core.linux.x86</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/org.eclipse.cdt.core.linux.x86/build.properties b/core/org.eclipse.cdt.core.linux.x86/build.properties
new file mode 100644
index 00000000000..686742c4a6d
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86/build.properties
@@ -0,0 +1,5 @@
+source.cdtcorex86.jar = src/
+output.cdtcorex86.jar = bin/
+bin.includes = fragment.xml,\
+               cdtcorex86.jar,\
+               os/
diff --git a/core/org.eclipse.cdt.core.linux.x86/fragment.xml b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
new file mode 100644
index 00000000000..834be06ecd4
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment
+   id="org.eclipse.cdt.core.linux.x86"
+   name="X86 Fragment"
+   version="1.0.0"
+   provider-name="Eclipse.org"
+   plugin-id="org.eclipse.cdt.core"
+   plugin-version="3.0.0">
+
+</fragment>
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/x86/libpty.so b/core/org.eclipse.cdt.core.linux.x86/os/linux/x86/libpty.so
index 1dd15a52e4e..1dd15a52e4e 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/x86/libpty.so
+++ b/core/org.eclipse.cdt.core.linux.x86/os/linux/x86/libpty.so
diff --git a/core/org.eclipse.cdt.core.linux/os/linux/x86/libspawner.so b/core/org.eclipse.cdt.core.linux.x86/os/linux/x86/libspawner.so
index 63276413797..63276413797 100644
--- a/core/org.eclipse.cdt.core.linux/os/linux/x86/libspawner.so
+++ b/core/org.eclipse.cdt.core.linux.x86/os/linux/x86/libspawner.so
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/.project b/core/org.eclipse.cdt.core.linux.x86_64/.project
new file mode 100644
index 00000000000..264e002f9d0
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.core.linux.x86_64</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/build.properties b/core/org.eclipse.cdt.core.linux.x86_64/build.properties
new file mode 100644
index 00000000000..99f473dc81f
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/build.properties
@@ -0,0 +1,2 @@
+bin.includes = fragment.xml,\
+               os/
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
new file mode 100644
index 00000000000..cda5347caaf
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment
+   id="org.eclipse.cdt.core.linux.x86_64"
+   name="CDT Core x86_64 Fragment"
+   version="3.0.0"
+   provider-name="Eclipse.org"
+   plugin-id="org.eclipse.cdt.core"
+   plugin-version="3.0.0">
+
+</fragment>
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libpty.so b/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libpty.so
new file mode 100644
index 00000000000..0b21e9bf0cb
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libpty.so
diff --git a/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libspawner.so b/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libspawner.so
new file mode 100644
index 00000000000..896d09a9cd7
--- /dev/null
+++ b/core/org.eclipse.cdt.core.linux.x86_64/os/linux/x86_64/libspawner.so
diff --git a/core/org.eclipse.cdt.core.linux/library/Makefile b/core/org.eclipse.cdt.core.linux/library/Makefile
index 02d519057b3..78a65c2f1e8 100644
--- a/core/org.eclipse.cdt.core.linux/library/Makefile
+++ b/core/org.eclipse.cdt.core.linux/library/Makefile
@@ -15,7 +15,7 @@ CC=gcc
 CPPFLAGS = -I. -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
 CFLAGS +=-fpic -D_REENTRANT -D_GNU_SOURCE
 
-INSTALL_DIR = ../os/$(OS)/$(ARCH)
+INSTALL_DIR = ../../org.eclipse.cdt.core.linux.$(ARCH)/os/$(OS)/$(ARCH)
 
 LIB_NAME_SPAWNER = libspawner.so
 LIB_NAME_FULL_SPAWNER = $(INSTALL_DIR)/libspawner.so