Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2013-05-11 00:16:18 +0000
committerSilenio Quarti2013-05-11 00:16:18 +0000
commit9dfa4c2a6dd4d9a50fe61ec265bf91bb0ed2263a (patch)
tree8531f642247d9a28076806db13f514414a12b732
parenta9b0a95ada546eed4aa031ac9a7ff1063a053fde (diff)
downloadeclipse.platform.swt-9dfa4c2a6dd4d9a50fe61ec265bf91bb0ed2263a.tar.gz
eclipse.platform.swt-9dfa4c2a6dd4d9a50fe61ec265bf91bb0ed2263a.tar.xz
eclipse.platform.swt-9dfa4c2a6dd4d9a50fe61ec265bf91bb0ed2263a.zip
Bug 407624 - Comparator log shows SWT changed, but version did notv4330a
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 3dd25375ec..aba3ac4d5f 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -812,10 +812,13 @@
</script>
</target>
- <!-- Params: swt.ws, swt.os, swt.arch -->
- <target name="build_fragment" depends="init_fragment,check_sha1_changed" if="natives_changed">
+ <!-- Params: swt.ws, swt.os, swt.arch
+ Note that the build.sha1 file is updated even if the libraries are not built to ensure there is a change
+ in the GIT repo (see bug#407624).
+ -->
+ <target name="build_fragment" depends="init_fragment,check_sha1_changed">
<!-- Build natives -->
- <antcall target="build_libraries"/>
+ <antcall target="build_fragment_libraries"/>
<!-- Update build.sha1 file -->
<exec dir="${repo.src}" executable="git" failonerror="true" outputproperty="HEAD_TAG">
@@ -825,6 +828,9 @@
<entry key="SHA1" value="${HEAD_TAG}"/>
</propertyfile>
</target>
+ <target name="build_fragment_libraries" if="natives_changed">
+ <antcall target="build_libraries"/>
+ </target>
<!-- Params: fragment, swt_version -->
<target name="commit_binaries" depends="get_version">

Back to the top