Bug 410027 - Retire 'eclipse.platform.releng.maps.git'
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 799b29c..84beac9 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -33,7 +33,6 @@
<property name="repo.src" value="../../../eclipse.platform.swt"/>
<property name="repo.bin" value="../../../eclipse.platform.swt.binaries"/>
- <property name="repo.releng" value="../../../eclipse.platform.releng.maps"/>
<property name="src_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/>
<property name="src_win32" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/>
@@ -560,9 +559,6 @@
<!-- Update the version files -->
<property name="increment_version_target" value="increment_version"/>
<antcall target="${increment_version_target}"/>
-
- <!-- Update the buildnotes_swt.html file -->
- <!--antcall target="update_buildnotes"/-->
<!-- Commit the files -->
<antcall target="commit_sources"/>
@@ -600,47 +596,21 @@
<replace file="${repo.src}/${file_make_common}" token="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/>
</target>
- <!-- Params: swt_new_tag -->
- <target name="update_buildnotes" depends="get_tag, get_new_tag">
- <property name="MILESTONE" value=""/>
- <tstamp>
- <format property="header.time" pattern="EEEE MMMMM dd, yyyy" offset="1" unit="day"/>
- </tstamp>
- <tstamp>
- <format property="url.to.time" pattern="yyyy-MM-dd'+'HH'%3A'mm'%3A'ss'+%2B0000'" timezone="gmt"/>
- </tstamp>
-
- <exec dir="${repo.src}" executable="git" failonerror="true" outputproperty="gitlog">
- <arg line="log --pretty='%ad' --date=iso -1 ${swt_tag}"/>
+ <!-- Set swt_tag to the current tag in the swt map file -->
+ <target name="get_tag" unless="swt_tag" depends="get_version">
+ <exec dir="${repo.bin}" executable="git" failonerror="true" outputproperty="tags">
+ <arg line="tag -l v${swt_version}*"/>
</exec>
<script language="javascript">
- <![CDATA[
- gitlog = project.getProperty("gitlog");
- gitlog = gitlog.replaceAll("\\+", "%2B");
- gitlog = gitlog.replaceAll("\\:", "%3A");
- gitlog = gitlog.replaceAll("\\s", "+");
- project.setProperty("url.from.time", gitlog);
- ]]>
+ <![CDATA[
+ tags = project.getProperty("tags").split("\n");
+ if (tags.length > 1) {
+ project.setProperty("swt_tag", tags[tags.length - 1]);
+ } else {
+ project.setProperty("swt_tag", "v" + project.getProperty("swt_version"));
+ }
+ ]]>
</script>
- <echo> Searching bugs from "${url.from.time}" to "${url.to.time}" with milestone -> "${MILESTONE}"</echo>
-
- <property name="match_line" value="SWT</h1>"/>
- <property name="delimiter" value=" "/>
- <property name="url" value="https://bugs.eclipse.org/bugs/buglist.cgi?bug_file_loc=;bug_file_loc_type=allwordssubstr;bug_id=;bugidtype=include;chfield=resolution;target_milestone=${MILESTONE};chfieldfrom=${url.from.time};chfieldto=${url.to.time};chfieldvalue=FIXED;classification=Eclipse;component=SWT;email1=;email2=;emailtype1=substring;emailtype2=substring;field-1-0-0=classification;field-1-1-0=product;field-1-2-0=component;field0-0-0=noop;keywords=;keywords_type=allwords;long_desc=;long_desc_type=allwordssubstr;product=Platform;query_format=advanced;remaction=;short_desc=;short_desc_type=allwordssubstr;status_whiteboard=;status_whiteboard_type=allwordssubstr;type-1-0-0=anyexact;type-1-1-0=anyexact;type-1-2-0=anyexact;type0-0-0=noop;value-1-0-0=Eclipse;value-1-1-0=Platform;value-1-2-0=SWT;value0-0-0=;votes=;query_based_on="/>
- <property name="body" value="${delimiter}${delimiter}<h2>SWT Build ${swt_new_tag} - ${header.time}</h2>${delimiter}${delimiter}<blockquote>${delimiter}<a href=${url}>Bugs fixed</a>${delimiter}</blockquote>"/>
- <replace file="${repo.src}/${file_build_notes}" token="${match_line}" value="${match_line}${body}"/>
- </target>
-
- <!-- Set swt_tag to the current tag in the swt map file -->
- <target name="get_tag" unless="swt_tag">
- <loadfile property="swt_tag" srcfile="${repo.releng}/${file_swt_map}">
- <filterchain>
- <tokenfilter delimoutput="">
- <containsstring contains="plugin@org.eclipse.swt=GIT,tag="/>
- <replaceregex pattern=".*(v\d\d\d\d[a-z]?).*" replace="\1"/>
- </tokenfilter>
- </filterchain>
- </loadfile>
<echo>Current tag=${swt_tag}.</echo>
</target>
@@ -751,23 +721,6 @@
<exec dir="${repo.bin}" executable="git" failonerror="true">
<arg line="tag v${swt_new_tag}"/>
</exec>
-
- <antcall target="update_swt_map"/>
- </target>
-
- <target name="update_swt_map" depends="get_new_tag">
- <!-- update and commit map file -->
- <replaceregexp file="${repo.releng}/${file_swt_map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/>
-
- <exec dir="${repo.releng}" executable="git" failonerror="true">
- <arg line="add '${file_swt_map}'"/>
- </exec>
- <exec dir="${repo.releng}" executable="git" failonerror="true">
- <arg line="status"/>
- </exec>
- <exec dir="${repo.releng}" executable="git" failonerror="true">
- <arg line="commit -m 'SWT contribution v${swt_new_tag}'"/>
- </exec>
</target>
<target name="check_sha1_file" unless="natives_changed">
@@ -1153,18 +1106,6 @@
<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000">
<arg line="reset --hard origin/${TAG}"/>
</exec>
- <property name="MAPS_TAG" value="${TAG}"/>
- <antcall target="init_repo">
- <param name="repo" value="eclipse.platform.releng.maps"/>
- <param name="repo.exists" value="repo.releng.exists"/>
- <param name="checkout_tag" value="${MAPS_TAG}"/>
- </antcall>
- <exec dir="../../../../${TAG}/eclipse.platform.releng.maps" executable="git" failonerror="true">
- <arg line="fetch"/>
- </exec>
- <exec dir="../../../../${TAG}/eclipse.platform.releng.maps" executable="git" failonerror="true">
- <arg line="reset --hard origin/${MAPS_TAG}"/>
- </exec>
</target>
<target name="push_remote" depends="get_tag">
@@ -1186,16 +1127,6 @@
<exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true">
<arg line="push origin ${TAG}"/>
</exec>
- <exec dir="../../../../${TAG}/eclipse.platform.releng.maps" executable="git" failonerror="true">
- <arg line="fetch"/>
- </exec>
- <property name="MAPS_TAG" value="${TAG}"/>
- <exec dir="../../../../${TAG}/eclipse.platform.releng.maps" executable="git" failonerror="true">
- <arg line="rebase origin/${MAPS_TAG}"/>
- </exec>
- <exec dir="../../../../${TAG}/eclipse.platform.releng.maps" executable="git" failonerror="true">
- <arg line="push origin ${MAPS_TAG}"/>
- </exec>
<exec dir="${repo.src}" executable="git" failonerror="true">
<arg line="push origin refs/tags/${swt_tag}"/>
</exec>
