| author | Silenio Quarti | 2012-10-18 11:01:10 (EDT) |
|---|---|---|
| committer | Bogdan Gheorghe | 2012-10-18 12:27:22 (EDT) |
| commit | 27a9fb3f146d735ae12359a56c947d40f37f819d (patch) (side-by-side diff) | |
| tree | e501a01c1c519f8ceab578fe80f50ccad0605800 | |
| parent | 41a5595979da8f21dbf47ec66acf9a053cfe4d03 (diff) | |
| download | eclipse.platform.swt-27a9fb3f146d735ae12359a56c947d40f37f819d.zip eclipse.platform.swt-27a9fb3f146d735ae12359a56c947d40f37f819d.tar.gz eclipse.platform.swt-27a9fb3f146d735ae12359a56c947d40f37f819d.tar.bz2 | |
Bug 392214 - UnsatisfiedLinkError on Kepler
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 7c0921d..e006fd5 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -411,7 +411,10 @@ <arg line="diff ${SHA1}"/> </exec> <condition property="source_changed"> - <length string="${diffs}" trim="true" when="greater" length="0"/> + <or> + <length string="${SHA1}" trim="true" when="equal" length="0"/> + <length string="${diffs}" trim="true" when="greater" length="0"/> + </or> </condition> <echo>Has source changes: ${source_changed}, compared against:</echo> <exec dir="${repo.src}" executable="git" failonerror="true"> @@ -773,7 +776,10 @@ <!-- Check for changes --> <exec dir="${repo.src}" executable="git" failonerror="true" outputproperty="diffs"> - <arg line="diff ${SHA1} ${library_src}"/> + <or> + <length string="${SHA1}" trim="true" when="equal" length="0"/> + <length string="${diffs}" trim="true" when="greater" length="0"/> + </or> </exec> <condition property="natives_changed"> <length string="${diffs}" trim="true" when="greater" length="0"/> |