diff options
author | Lakshmi Shanmugam | 2020-05-18 06:33:31 +0000 |
---|---|---|
committer | Lakshmi Shanmugam | 2020-05-19 05:10:08 +0000 |
commit | b69209f789e98f492fdd732764390b5040c8b863 (patch) | |
tree | ef4aa7661401e37ef134a7d978847dc80ff6e5f5 | |
parent | 248bc58797f262b0dfb437926cfd6e6ac14e55f3 (diff) | |
download | eclipse.platform.swt-b69209f789e98f492fdd732764390b5040c8b863.tar.gz eclipse.platform.swt-b69209f789e98f492fdd732764390b5040c8b863.tar.xz eclipse.platform.swt-b69209f789e98f492fdd732764390b5040c8b863.zip |
Bug 548535 - 4.12 SWT.jar's version.txt incorrect
This reverts commit f2ba416efc8d19fa6f4d7d019e63b670865a3abc.
Put the correct version in version.txt. Fix the version updation in
buildSWT.xml.
Change-Id: I81515524d1f77dec1a589a0c013bcbdb8b239a85
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/common/version.txt | 1 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/buildFragment.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt new file mode 100644 index 0000000000..2dc3aad9cd --- /dev/null +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/version.txt @@ -0,0 +1 @@ +version 4.934
\ No newline at end of file diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml index 01425604da..244a263c68 100644 --- a/bundles/org.eclipse.swt/buildFragment.xml +++ b/bundles/org.eclipse.swt/buildFragment.xml @@ -108,6 +108,7 @@ <fileset dir="${temp.folder}/@dot.src" includes="**/*.properties"/> <fileset dir="${temp.folder}/@dot.src/library/" excludes="**/*.sh"/> <zipfileset dir="${temp.folder}/@dot.src/library/" includes="**/*.sh" filemode="755"/> + <fileset dir="${temp.folder}/@dot.src" includes="**/version.txt"/> <fileset dir="${fragmentdir}" includes="about.html,about_files/"/> </zip> <delete dir="${temp.folder}/@dot.src"/> @@ -119,6 +120,7 @@ <fileset dir="${temp.folder}/@dot.src" includes="**/*.java"/> <fileset dir="${temp.folder}/@dot.src" includes="**/*.properties"/> <fileset dir="${temp.folder}/@dot.src/library/"/> + <fileset dir="${temp.folder}/@dot.src" includes="**/version.txt"/> <fileset dir="${fragmentdir}" includes="about.html,about_files/"/> </copy> <delete dir="${temp.folder}/@dot.src"/> diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 5e178e8baa..2062383413 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -46,6 +46,7 @@ <property name="src_cocoa" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/cocoa/library'"/> <property name="file_library" value="bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java"/> <property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/> + <property name="file_version" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/> <property name="file_src_pom" value="bundles/org.eclipse.swt/pom.xml"/> <property name="file_bin_parent_pom" value="bundles/binaries-parent/pom.xml"/> @@ -294,7 +295,7 @@ <target name="commit_sources" depends="get_version" if="natives_changed"> <exec dir="${repo.src}" executable="git" failonerror="true"> - <arg line="add '${file_library}' '${file_make_common}' "/> + <arg line="add '${file_library}' '${file_version}' '${file_make_common}' "/> </exec> <exec dir="${repo.src}" executable="git" failonerror="true"> <arg line="status"/> @@ -317,6 +318,7 @@ <replace file="${repo.src}/${file_library}" token="MAJOR_VERSION = ${maj_ver}" value="MAJOR_VERSION = ${new_maj_ver}"/> <replace file="${repo.src}/${file_library}" token="MINOR_VERSION = ${min_ver}" value="MINOR_VERSION = ${new_min_ver}"/> <replace file="${repo.src}/${file_library}" token="REVISION = ${rev}" value="REVISION = ${new_rev}"/> + <replace file="${repo.src}/${file_version}" token="version ${maj_ver}.${min_ver}" value="version ${new_maj_ver}.${new_min_ver}"/> <replace file="${repo.src}/${file_make_common}" token="min_ver=${min_ver}" value="min_ver=${new_min_ver}"/> <replace file="${repo.src}/${file_make_common}" token="maj_ver=${maj_ver}" value="maj_ver=${new_maj_ver}"/> <replace file="${repo.src}/${file_make_common}" token="rev=${rev}" value="rev=${new_rev}"/> |