Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Shanmugam2017-11-29 05:37:02 +0000
committerLakshmi Shanmugam2017-11-29 05:37:48 +0000
commit556831a53249972f7640d75e2c1db0b86940da86 (patch)
tree36d7b76a852f1883c612ed727476a89222b9493f /bundles/org.eclipse.swt/buildSWT.xml
parentb31b16ae32d9c089f2d683c1da2b3db0bd97b3a1 (diff)
downloadeclipse.platform.swt-556831a53249972f7640d75e2c1db0b86940da86.tar.gz
eclipse.platform.swt-556831a53249972f7640d75e2c1db0b86940da86.tar.xz
eclipse.platform.swt-556831a53249972f7640d75e2c1db0b86940da86.zip
Bug 527472: Cleanup buildSWT.xml
The build unnecessarily renames and commits the libraries for unsupported platforms. Fix is to include only the fragments that are currently built/supported in fileset. Change-Id: I76e9dcc8ccbd3b4aaf71e0f3fe633b56cbb47a2a
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index d3c8cf5cae..4f70c88e18 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -87,14 +87,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="80"/>
+ <property name="library_count" value="44"/>
<property name="fragment" value=""/>
- <fileset id="match" dir="${repo.bin}/bundles/${fragment}">
+ <fileset id="match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64*/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/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}">
+ <fileset id="not_match" dir="${repo.bin}/bundles/${fragment}" includes="**/org.eclipse.swt.gtk.linux.ppc64*/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/org.eclipse.swt.cocoa.macosx.*/**">
<filename regex="[0-9][0-9][0-9][0-9]."/>
<filename regex="${swt_version}." negate="true"/>
<exclude name="**/.git/**"/>
@@ -591,7 +591,7 @@
<!-- Params: fragment, swt_version -->
<target name="commit_binaries" depends="get_version">
<!-- Get libraries to remove from repo -->
- <fileset id="removeid" dir="${repo.bin}">
+ <fileset id="removeid" dir="${repo.bin}" includes="**/org.eclipse.swt.gtk.linux.ppc64*/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/org.eclipse.swt.cocoa.macosx.*/**">
<filename regex="[0-9][0-9][0-9][0-9]."/>
<filename regex="${swt_version}." negate="true"/>
<exclude name="**/.git/**"/>
@@ -605,7 +605,7 @@
<property name="rfiles" refid="removeid"/>
<!-- Get list of files to commit -->
- <fileset id="addid" dir="${repo.bin}">
+ <fileset id="addid" dir="${repo.bin}" includes="**/org.eclipse.swt.gtk.linux.ppc64*/**, **/org.eclipse.swt.gtk.linux.x86*/**, **/org.eclipse.swt.win32.*/**, **/org.eclipse.swt.cocoa.macosx.*/**">
<include name="bundles/*/*${swt_version}*"/>
<include name="bundles/*/build.sha1"/>
<exclude name="**/.git/**"/>
@@ -1019,7 +1019,7 @@
<equals arg1="${swt.os}" arg2="win32"/>
</condition>
<property name="remotetmpdir" value="${remotebuilddir}/${fragment}.${TAG}"/>
- <property name="lib_output" value="${remotetmpdir}/libs"/>
+ <property name="lib_output" value="${remotetmpdir}/libs"/>
<condition property="build_task" value="build_win_slave" else="build_remote_slave">
<equals arg1="${swt.ws}" arg2="win32"/>
</condition>

Back to the top