diff options
| author | Lakshmi Shanmugam | 2020-07-20 20:14:56 +0000 |
|---|---|---|
| committer | Lakshmi Shanmugam | 2020-07-20 21:51:20 +0000 |
| commit | 1be1e6d16759f67be95f249542700755f8636019 (patch) | |
| tree | 5535d24936b49f1537827d4689f9b17875854dad | |
| parent | 914b0b9901ef4cbc966dfafc4c14829b7d5b9c64 (diff) | |
| download | eclipse.platform.swt-1be1e6d16759f67be95f249542700755f8636019.tar.gz eclipse.platform.swt-1be1e6d16759f67be95f249542700755f8636019.tar.xz eclipse.platform.swt-1be1e6d16759f67be95f249542700755f8636019.zip | |
Build changes for chromium build
Fix adding of files in buildSWT.xml
Add echo statements
Fix library count to 33. Mac chromium executable doesn't have version
number.
Change-Id: Ibd91b5716a2d20f650166dab04b21ea180fc31df
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 1a96f08c67..7d41f2b369 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -79,7 +79,7 @@ <target name="check_fragment_libraries" depends="get_version"> <echo>Checking ${fragment}</echo> <property name="checkdir" value="~/build/check_libraries"/> - <property name="library_count" value="34"/> + <property name="library_count" value="33"/> <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_64/**, **/org.eclipse.swt.win32.win32.x86_64/**, **/org.eclipse.swt.cocoa.macosx.*/**, **/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/**, **/org.eclipse.swt.browser.chromium.win32.win32.x86_64/**, **/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/**"> <filename regex="[0-9][0-9][0-9][0-9]"/> @@ -586,11 +586,14 @@ <!-- Params: fragment, swt_version --> <target name="commit_binaries" depends="get_version"> <!-- Get libraries to remove from repo --> + <echo>swt_version is ${swt_version}</echo> <fileset id="removeid" dir="${repo.bin}"> - <filename regex="[0-9][0-9][0-9][0-9]r[0-9]."/> - <filename regex="${swt_version}." negate="true"/> + <filename regex="[0-9][0-9][0-9][0-9]r[0-9]"/> + <filename regex="${swt_version}" negate="true"/> <exclude name="**/.git/**"/> </fileset> + + <echo>Files to remove is ${toString:removeid}</echo> <!-- Rename libraries that were not built --> <copy todir="${repo.bin}" overwrite="false"> @@ -603,12 +606,15 @@ <fileset id="addid" dir="${repo.bin}"> <include name="bundles/*/*${swt_version}*"/> <include name="bundles/*/webkitextensions${swt_version}/*${swt_version}*"/> - <include name="bundles/*/chromium-*/**"/> + <include name="bundles/*/chromium-*/*${swt_version}*"/> + <include name="bundles/*/chromium-*/*${swt_version}*.app/**"/> <include name="bundles/*/build.sha1"/> <exclude name="**/.git/**"/> <exclude name="**/tmpdir/**"/> </fileset> <property name="afiles" refid="addid"/> + + <echo>Files to add is ${toString:addid}</echo> <script language="javascript"> <![CDATA[ @@ -624,13 +630,18 @@ <fileset dir="${repo.bin}" includes="*${swt_version}*"/> </chmod> + <echo>Removing files</echo> <antcall target="git_rm"/> + + <echo>Adding files</echo> <exec dir="${repo.bin}" executable="git" failonerror="true"> <arg line="add ${added_files}"/> </exec> + <exec dir="${repo.bin}" executable="git" failonerror="true" outputproperty="diffs"> <arg line="diff HEAD"/> </exec> + <condition property="commit_bin_changes"> <length string="${diffs}" trim="true" when="greater" length="0"/> </condition> |