Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2021-01-19 08:36:22 +0000
committerManoj Palat2021-01-22 06:31:10 +0000
commit46ba52bd29c3f19e33d1143d7bc53fd28f2450cb (patch)
tree12de1824aedb7fa68a9f31bb002ff11be1b84082
parent3c46376e7756e2a66ab99e594bc33dbba24e28ee (diff)
downloadeclipse.jdt.core-46ba52bd29c3f19e33d1143d7bc53fd28f2450cb.tar.gz
eclipse.jdt.core-46ba52bd29c3f19e33d1143d7bc53fd28f2450cb.tar.xz
eclipse.jdt.core-46ba52bd29c3f19e33d1143d7bc53fd28f2450cb.zip
Bug 570356 - [15] export-ecj.xml error without NashornI20210124-1800I20210123-1800I20210123-0020
Change-Id: I39f04c43da9dca1d83f189329219e76dedf5552c Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--org.eclipse.jdt.core/scripts/export-ecj.xml43
1 files changed, 33 insertions, 10 deletions
diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
index 4acbe27265..41b22321f8 100644
--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2007, 2014 IBM Corporation and others.
+ Copyright (c) 2007, 2020 IBM Corporation and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
@@ -24,15 +24,38 @@
<matches pattern="\d+\.\d+\.\d+.*" string="${bundleVersion}"/>
</condition>
<fail message="bundleVersion variable had unexpected format. Should be digits.digits.digits,ANY but was ${bundleVersion}" unless="bundleVersionOK"/>
- <script language="javascript">
- var bundleVersion = project.getProperty("bundleVersion");
- var pattern = new RegExp(/^(\d+)\.(\d+)\.(\d+)\.(.*)$/);
- var sArray = pattern.exec(bundleVersion); // sArray 0 is "whole match"
- project.setProperty("bundleVersionMajor", sArray[1]);
- project.setProperty("bundleVersionMinor", sArray[2]);
- project.setProperty("bundleVersionService", sArray[3]);
- project.setProperty("bundleVersionQualifer", sArray[4])
- </script>
+ <loadresource property="bundleVersionMajor">
+ <string value="${bundleVersion}"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^(\d+)\.(\d+)\.(\d+)\.(.*)$" replace="\1"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <loadresource property="bundleVersionMinor">
+ <string value="${bundleVersion}"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^(\d+)\.(\d+)\.(\d+)\.(.*)$" replace="\2"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <loadresource property="bundleVersionService">
+ <string value="${bundleVersion}"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^(\d+)\.(\d+)\.(\d+)\.(.*)$" replace="\3"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+ <loadresource property="bundleVersionQualifer">
+ <string value="${bundleVersion}"/>
+ <filterchain>
+ <tokenfilter>
+ <replaceregex pattern="^(\d+)\.(\d+)\.(\d+)\.(.*)$" replace="\4"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
<property name="ecj-temp-folder" value="${basedir}/ecj-temp-folder" />
<property name="ecj-temp-src-folder" value="${basedir}/ecj-temp-src-folder" />
<mkdir dir="${ecj-temp-src-folder}" />

Back to the top