Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2017-12-05 06:08:51 +0000
committerAlexander Kurtakov2017-12-05 06:08:51 +0000
commitd3d082282785170b3c46bf628ba9427979d49640 (patch)
treee24aa3332601c4d772c110c6a9f96b8b0a0f3f14
parent577dcf262346a408acd43db7876745decaf50fb8 (diff)
downloadeclipse.platform.swt-d3d082282785170b3c46bf628ba9427979d49640.tar.gz
eclipse.platform.swt-d3d082282785170b3c46bf628ba9427979d49640.tar.xz
eclipse.platform.swt-d3d082282785170b3c46bf628ba9427979d49640.zip
Bug 510905 (Webkit2FuncRetVal)
Fix buildSWT.xml to actually copy and commit versioned webkitextensions dir. Change-Id: Icb206a180fa5b9b48329a855907672ce90cd634c Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/buildSWT.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 2f1fe7d075..a0eedf0f27 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -607,7 +607,7 @@
<!-- Get list of files to commit -->
<fileset id="addid" dir="${repo.bin}">
<include name="bundles/*/*${swt_version}*"/>
- <include name="bundles/*/webkitextensions/*${swt_version}*"/>
+ <include name="bundles/*/webkitextensions${swt_version}/*${swt_version}*"/>
<include name="bundles/*/build.sha1"/>
<exclude name="**/.git/**"/>
<exclude name="**/tmpdir/**"/>
@@ -784,8 +784,8 @@
port="${port}"
keyfile="${keyfile}"
trust="true"/>
- <scp file="swtbuild@${build_machine}:${lib_output}/webkitextensions/*"
- todir="${output_dir}/webkitextensions/"
+ <scp file="swtbuild@${build_machine}:${lib_output}/webkitextensions${swt_version}/*"
+ todir="${output_dir}/webkitextensions${swt_version}/"
port="${port}"
keyfile="${keyfile}"
trust="true"

Back to the top