Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2013-08-23 13:16:28 -0400
committerAlexander Kurtakov2013-08-23 13:16:28 -0400
commit003624c744ec5b9620c78e62b64d67e2ff73189b (patch)
tree03557955eddb4dbca350e83df9deaaccc4a4a2cb
parentd9c6a0d9881715b168067320c9bbc95bc898b86f (diff)
downloadeclipse.platform.swt-003624c744ec5b9620c78e62b64d67e2ff73189b.tar.gz
eclipse.platform.swt-003624c744ec5b9620c78e62b64d67e2ff73189b.tar.xz
eclipse.platform.swt-003624c744ec5b9620c78e62b64d67e2ff73189b.zip
Bug 413293 - Allow building Gtk 2.x and 3.x native parts in one call
This was already possible for remote build but setting the env variable for local build was missing. Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 8288c35a37..32551ae9d8 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -938,6 +938,7 @@
<param name="build_targets" value="install"/>
<param name="libs" value="*pi3*"/>
<param name="exports" value="export GTK_VERSION=3.0;"/>
+ <param name="gtk_version" value="3.0"/>
</antcall>
</target>
@@ -1001,8 +1002,10 @@
</target>
<target name="build_local">
+ <property name="gtk_version" value="2.0" />
<exec dir="${build_dir}" executable="sh" failonerror="true">
<arg line="build.sh"/>
+ <env key="GTK_VERSION" value="${gtk_version}"/>
<env key="MODEL" value="${swt.arch}"/>
<env key="OUTPUT_DIR" value="${output_dir}"/>
<arg line="${targets}"/>

Back to the top