Attachment 216389 Details for Bug 372794 – Part I

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Part I

buildLinux64InCBI.patch (text/plain), 3.17 KB, created by Krzysztof Daniel

on 2012-05-29 06:37:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-05-29 06:37:52 EDT

Size: 3.17 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
>index 5cbb412..420eba7 100644
>--- a/bundles/org.eclipse.swt/buildFragment.xml
>+++ b/bundles/org.eclipse.swt/buildFragment.xml
>@@ -584,4 +584,30 @@
> 			extraManifests="${extraManifests}"
> 			extraSourceLocations="${extraSourceLocations}"/>
> 	</target>
>+
>+	
>+	<target name="build.cfiles" depends="init">
>+		<mkdir dir="${build.result.folder}/library"/>
>+		<copy todir="${build.result.folder}/library">
>+			<fileset dir="${plugindir}/Eclipse SWT/common/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT AWT/gtk/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT Mozilla/common/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT OpenGL/glx/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT PI/cairo/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT PI/common/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT PI/gtk/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT Program/cde/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT Program/gnome/library"/>
>+			<fileset dir="${plugindir}/Eclipse SWT WebKit/gtk/library"/>
>+		</copy>
>+	</target>
>+
>+	<target name="build.nativeLibraries" depends="build.cfiles">
>+		<exec dir="${build.result.folder}/library" executable="sh">
>+			<env key="OUTPUT_DIR" value="${build.result.folder}"/>
>+			<arg line="${build.result.folder}/library/build.sh"/>
>+			<arg line="install"/>
>+		</exec>
>+	</target>
>+
> </project>
>diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml
>index 37e7c13..89b3f0f 100644
>--- a/bundles/org.eclipse.swt/pom.xml
>+++ b/bundles/org.eclipse.swt/pom.xml
>@@ -23,4 +23,37 @@
>   <artifactId>org.eclipse.swt</artifactId>
>   <version>3.100.0-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
>+
>+  <profiles>
>+    <profile>
>+      <activation>
>+        <file>
>+	  
>+          <missing>../../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64/libswt-atk-gtk-4229.so</missing>
>+        </file>	
>+      </activation>
>+      <build>
>+        <plugins>
>+          <plugin>
>+            <artifactId>maven-antrun-plugin</artifactId>
>+            <version>1.7</version>
>+            <executions>
>+              <execution>
>+                <phase>compile</phase>
>+                <configuration>
>+                  <target>
>+                    <ant antfile="build.xml" target="build.nativeLibraries" 
>+			dir="../../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.x86_64"/>
>+                  </target>
>+                </configuration>
>+                <goals>
>+                  <goal>run</goal>
>+                </goals>
>+            </execution>
>+          </executions>
>+        </plugin>
>+      </plugins>
>+    </build>
>+    </profile>
>+  </profiles>
> </project>
>diff --git a/pom.xml b/pom.xml
>index d3ce904..0b3d0d8 100644
>--- a/pom.xml
>+++ b/pom.xml
>@@ -27,8 +27,8 @@
>   <packaging>pom</packaging>
> 
>   <modules>
>-<!-- 
>     <module>bundles/org.eclipse.swt</module>
>+<!--
>     <module>bundles/org.eclipse.swt.opengl</module>
>     <module>bundles/org.eclipse.swt.tools</module>
>     <module>examples/org.eclipse.swt.examples</module>

Actions: View | Diff

Attachments on bug 372794: 216389 | 216654 | 216655 | 217276