Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-11-14 06:19:32 +0000
committerSravan Kumar Lakkimsetti2018-11-14 06:38:28 +0000
commitb23625d4825e5c9c05f626b898d5b3c7455f0a11 (patch)
tree19ddc9e2f20509daab415f0297f2d0deb103632f /bundles/org.eclipse.swt/buildSWT.xml
parent048da7cf58ce03ae436ec97d9184ce8a05c70ee8 (diff)
downloadeclipse.platform.swt-b23625d4825e5c9c05f626b898d5b3c7455f0a11.tar.gz
eclipse.platform.swt-b23625d4825e5c9c05f626b898d5b3c7455f0a11.tar.xz
eclipse.platform.swt-b23625d4825e5c9c05f626b898d5b3c7455f0a11.zip
Bug 541123 - SWT Build Failed due to incorrect number of libraries built
Bug 536766 - Drop 32-bit support This reverts commit c992dfc8169c8f76d68b1dc8b4dbc725badd6385. Change-Id: I99dc415c906c35d48a4a0e71d9a9eee76c72cf0b Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml14
1 files changed, 3 insertions, 11 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 411a88a183..1c63a48abd 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -67,17 +67,9 @@
</antcall>
<antcall target="check_fragment_libraries">
<param name="library_count" value="8"/>
- <param name="fragment" value="org.eclipse.swt.gtk.linux.x86"/>
- </antcall>
- <antcall target="check_fragment_libraries">
- <param name="library_count" value="8"/>
<param name="fragment" value="org.eclipse.swt.gtk.linux.x86_64"/>
</antcall>
<antcall target="check_fragment_libraries">
- <param name="library_count" value="5"/>
- <param name="fragment" value="org.eclipse.swt.win32.win32.x86"/>
- </antcall>
- <antcall target="check_fragment_libraries">
<param name="library_count" value="4"/>
<param name="fragment" value="org.eclipse.swt.win32.win32.x86_64"/>
</antcall>
@@ -86,14 +78,14 @@
<target name="check_fragment_libraries" depends="get_version">
<echo>Checking ${fragment}</echo>
<property name="checkdir" value="~/build/check_libraries"/>
- <property name="library_count" value="36"/>
+ <property name="library_count" value="23"/>
<property name="fragment" value=""/>
- <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
<filename regex="[0-9][0-9][0-9][0-9]."/>
<filename regex="${swt_version}."/>
<exclude name="**/.git/**"/>
</fileset>
- <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/org.eclipse.swt.cocoa.macosx.*/**">
+ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64le/**, **/org.eclipse.swt.gtk.linux.x86_64/**, **/org.eclipse.swt.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**">
<filename regex="[0-9][0-9][0-9][0-9]."/>
<filename regex="${swt_version}." negate="true"/>
<exclude name="**/.git/**"/>

Back to the top