diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2011-08-09 11:18:48 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2011-08-09 11:18:48 -0400 |
| commit | fa97a29c1590d1f7d6b2031100a6e20c0c54af40 (patch) | |
| tree | 2bdf6f773867fbb42e07612a0d057ca86e055f98 | |
| parent | c7aff8497c0c88044a67cc8667fbfeb12f199728 (diff) | |
| download | eclipse.platform.swt-fa97a29c1590d1f7d6b2031100a6e20c0c54af40.tar.gz eclipse.platform.swt-fa97a29c1590d1f7d6b2031100a6e20c0c54af40.tar.xz eclipse.platform.swt-fa97a29c1590d1f7d6b2031100a6e20c0c54af40.zip | |
commit changed files when incrementing version so that the SHA1 used to
build is updated
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 08c23b6b0d..2d2069faa0 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -457,17 +457,41 @@ </target> <!-- common build tasks --> - <target name="new_release" depends="get_new_release_version"> + <target name="new_release"> <property name="natives_changed" value="true"/> + <property name="increment_version_target" value="increment_release_version"/> <antcall target="new_build"/> </target> <target name="new_build"> <!-- Update the version files --> - <antcall target="increment_version"/> + <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 --> + <exec dir="${repo.src}" executable="git" failonerror="true"> + <arg line="add '${file_library_j2se}' '${file_library_j2me}' '${file_version}' '${file_make_common}' '${file_build_notes}'"/> + </exec> + <exec dir="${repo.src}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.src}" executable="git" failonerror="true"> + <arg line="commit -m 'v${swt_version}'"/> + </exec> </target> <target name="increment_version" depends="check_natives_changed, get_version" if="natives_changed"> + <antcall target="increment_version_impl"/> + </target> + + <target name="increment_release_version" depends="check_natives_changed, get_new_release_version" if="natives_changed"> + <antcall target="increment_version_impl"/> + </target> + + <target name="increment_version_impl"> <echo>Incrementing version from ${swt_version} to ${new_version}...</echo> <replace file="${repo.src}/${file_library_j2se}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/> <replace file="${repo.src}/${file_library_j2me}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/> @@ -501,7 +525,7 @@ project.setProperty("url.from.time", gitlog); ]]> </script> - <echo> Searching bugs from "${url.from.time}" to "${url.to.time}"</echo> + <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=" "/> @@ -514,7 +538,6 @@ <condition property="CVS_TAG" value="" else="-r${TAG}"> <equals arg1="${TAG}" arg2="master"/> </condition> - <echo>CVS_TAG=${CVS_TAG}</echo> </target> <!-- Set swt_tag to the current tag in the swt map file --> @@ -644,20 +667,6 @@ <!--antcall target="check_libraries"/--> <antcall target="check_fragment_libraries"/> - <!-- Update the buildnotes_swt.html file --> - <antcall target="update_buildnotes"/> - - <!-- Commit the files --> - <exec dir="${repo.src}" executable="git" failonerror="true"> - <arg line="add '${file_library_j2se}' '${file_library_j2me}' '${file_version}' '${file_make_common}' '${file_build_notes}'"/> - </exec> - <exec dir="${repo.src}" executable="git" failonerror="true"> - <arg line="status"/> - </exec> - <exec dir="${repo.src}" executable="git" failonerror="true"> - <arg line="commit -m 'v${swt_version}'"/> - </exec> - <exec dir="${repo.src}" executable="git" failonerror="true"> <arg line="tag v${swt_new_tag}"/> </exec> |