Bug 538526: Configure SWT build scripts for 4.10

Added revision info to SWT version to avoid incrementing minor version
with every native build and delay incrementing major version.

The revision will be incremented when there is a native change/build
The minor version will be incremented by 1 for maintenance stream fixes
The minor version will be incremented by 2 for every quarterly release

Updated the make files to include the revision info in the native
library names as {maj_ver}{min_ver}r{rev}

On windows, the rc files and dlls will use {maj_ver},{min_ver},{rev},0
for file
version.

Change-Id: I8ea6ef8f72837800ad40d4fbf44745b99c349ecd

8 files changed, 61 insertions, 24 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
index 5d4699f416..3a74d90331 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
@@ -19,7 +19,7 @@ include make_common.mak
 SWT_PREFIX=swt
 SWTPI_PREFIX=swt-pi
 WS_PREFIX=cocoa
-SWT_VERSION=$(maj_ver)$(min_ver)
+SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
 SWT_LIB=lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib
 SWTPI_LIB=lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).jnilib
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
index d9e3d21dfc..ff3ffedc74 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java
@@ -36,7 +36,7 @@ public class Library {
 	/**
 	 * SWT revision number (must be >= 0)
 	 */
-	static int REVISION = 0;
+	static int REVISION = 1;
 
 	/**
 	 * The JAVA and SWT versions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 61d71699d7..070cc0c1ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -26,7 +26,7 @@ endif
 
 include make_common.mak
 
-SWT_VERSION=$(maj_ver)$(min_ver)
+SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
 GTK_VERSION=3.0
 
 # Define the various shared libraries to be build.
@@ -52,7 +52,7 @@ ALL_SWT_LIBS = $(SWT_LIB) $(AWT_LIB) $(SWTPI_LIB) $(CAIRO_LIB) $(ATK_LIB) $(GLX_
 # Webkit extension lib has to be put into a separate folder and is treated differently from the other libraries.
 WEBKIT_EXTENSION_LIB = lib$(WEBKIT_EXTENSION_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 WEBEXTENSION_BASE_DIR = webkitextensions
-WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(maj_ver)$(min_ver)
+WEBEXTENSION_DIR = $(WEBEXTENSION_BASE_DIR)$(maj_ver)$(min_ver)r$(rev)
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
 CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
index 4373fe256c..4b0a193b6c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
@@ -28,7 +28,7 @@ endif
 
 include make_common.mak
 
-SWT_VERSION=$(maj_ver)$(min_ver)
+SWT_VERSION=$(maj_ver)$(min_ver)r$(rev)
 GTK_VERSION?=2.0
 
 # Define the various shared libraries to be build.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index 40059b174f..fa72e03574 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -22,7 +22,7 @@
 
 SWT_PREFIX  = swt
 WS_PREFIX   = win32
-SWT_VERSION = $(maj_ver)$(min_ver)
+SWT_VERSION = $(maj_ver)$(min_ver)r$(rev)
 SWT_LIB     = $(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
 SWT_LIBS    = comctl32.lib shell32.lib imm32.lib oleacc.lib usp10.lib wininet.lib Crypt32.lib Shlwapi.lib
 SWT_OBJS    = swt.obj callback.obj c.obj c_stats.obj \
@@ -63,9 +63,9 @@ WEBKITCFLAGS = -c -O1\
 
 #CFLAGS = $(cdebug) $(cflags) $(cvarsmt) $(CFLAGS) \
 CFLAGS = -O1 -DNDEBUG /c $(cflags) $(cvarsmt) $(CFLAGS) \
-	-DSWT_VERSION=$(SWT_VERSION) $(NATIVE_STATS) -DUSE_ASSEMBLER \
+	-DSWT_VERSION=$(maj_ver)$(min_ver) -DSWT_REVISION=$(rev) $(NATIVE_STATS) -DUSE_ASSEMBLER \
 	/I"$(SWT_JAVA_HOME)\include" /I"$(SWT_JAVA_HOME)\include\win32" /I.
-RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver)\" -DSWT_COMMA_VERSION=$(comma_ver)
+RCFLAGS = $(rcflags) $(rcvars) $(RCFLAGS) -DSWT_FILE_VERSION=\"$(maj_ver).$(min_ver).$(rev).0\" -DSWT_COMMA_VERSION=$(comma_ver)
 ldebug = /RELEASE  /INCREMENTAL:NO /NOLOGO
 dlllflags = -dll
 guilibsmt = kernel32.lib  ws2_32.lib mswsock.lib advapi32.lib bufferoverflowu.lib user32.lib gdi32.lib comdlg32.lib winspool.lib
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
index 2eadd119e8..e9fb072b2f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/os_custom.c
@@ -23,7 +23,7 @@ HRESULT DllGetVersion(DLLVERSIONINFO *dvi)
 {
 	dvi->dwMajorVersion = SWT_VERSION / 1000;
 	dvi->dwMinorVersion = SWT_VERSION % 1000;
-	dvi->dwBuildNumber = 0;
+    dvi->dwBuildNumber = SWT_REVISION;
 	dvi->dwPlatformID = DLLVER_PLATFORM_WINDOWS;
 	return 1;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
index 601f0d4e2c..70d7b030d5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak
@@ -14,4 +14,5 @@
 
 maj_ver=4
 min_ver=922
-comma_ver=4,9,2,2
+rev=1
+comma_ver=4,922,1,0
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml
index 0a70cf0f80..10ddab2228 100644
--- a/bundles/org.eclipse.swt/buildSWT.xml
+++ b/bundles/org.eclipse.swt/buildSWT.xml
@@ -358,7 +358,8 @@
 		<echo>Incrementing version from ${swt_version} to ${new_version}...</echo>
 		<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_version}" token="version ${maj_ver}.${min_ver}" value="version ${new_maj_ver}.${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}.${rev}.0" value="version ${new_maj_ver}.${new_min_ver}.${new_rev}.0"/>
 		<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="comma_ver=${comma_ver}" value="comma_ver=${new_comma_ver}"/>
@@ -410,26 +411,29 @@
 		<echo>New tag=${swt_new_tag}.</echo>
 	</target>
 
-	<!-- Set swt_version, new_version, (and min_ver, maj_ver, new_min_ver, new_maj_ver) from the make_common.mak  -->
+	<!-- Set swt_version, new_version, (and rev, min_ver, maj_ver, new_rev, new_min_ver, new_maj_ver) from the make_common.mak  -->
 	<target name="get_version" unless="swt_version">
 		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
 		<script language="javascript">
 		<![CDATA[
+			rev = project.getProperty("rev");
 			min_ver = project.getProperty("min_ver");
 			maj_ver = project.getProperty("maj_ver");
-			new_min_ver = parseInt(min_ver) + 1;
+			new_rev = parseInt(rev) + 1;
+			new_min_ver = min_ver;
 			new_maj_ver = maj_ver;
 			one = new_maj_ver;
-			two = Math.floor(new_min_ver / 100);
-			three = Math.floor((new_min_ver - (two * 100)) / 10);
-			four = Math.floor(new_min_ver - (two * 100) - (three * 10));
+			two = new_min_ver;
+			three = new_rev;
+			four = 0;
+			project.setProperty("new_rev", new_rev);
 			project.setProperty("new_min_ver", new_min_ver);
 			project.setProperty("new_maj_ver", new_maj_ver);
 			project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
    	 	]]>
 		</script>
-		<property name="swt_version" value="${maj_ver}${min_ver}"/>
-		<property name="new_version" value="${new_maj_ver}${new_min_ver}"/>
+		<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
+		<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
 		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
 	</target>
 
@@ -437,27 +441,59 @@
 		<loadproperties srcFile="${repo.src}/${file_make_common}"/>
 		<script language="javascript">
 		<![CDATA[
+			rev = project.getProperty("rev");
 			min_ver = project.getProperty("min_ver");
 			maj_ver = project.getProperty("maj_ver");
-			new_min_ver = (Math.floor(parseInt(min_ver) / 100) + 1) * 100;
+			new_rev = 1;
+			new_min_ver = parseInt(min_ver) + 2;
 			new_maj_ver = maj_ver;
 			if (new_min_ver >= 1000) {
 				new_min_ver = "000";
 				new_maj_ver = parseInt(new_maj_ver) + 1;
 			}
 			one = new_maj_ver;
-			two = Math.floor(new_min_ver / 100);
-			three = Math.floor((new_min_ver - (two * 100)) / 10);
-			four = Math.floor(new_min_ver - (two * 100) - (three * 10));
+			two = new_min_ver;
+			three = new_rev;
+			four = 0;
+			project.setProperty("new_rev", new_rev);
 			project.setProperty("new_min_ver", new_min_ver);
 			project.setProperty("new_maj_ver", new_maj_ver);
 			project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
    	 	]]>
 		</script>
-		<property name="swt_version" value="${maj_ver}${min_ver}"/>
-		<property name="new_version" value="${new_maj_ver}${new_min_ver}"/>
+		<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
+		<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
 		<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
 	</target>
+	
+	<target name="get_new_maintenance_release_version" unless="min_ver">
+			<loadproperties srcFile="${repo.src}/${file_make_common}"/>
+			<script language="javascript">
+			<![CDATA[
+				rev = project.getProperty("rev");
+				min_ver = project.getProperty("min_ver");
+				maj_ver = project.getProperty("maj_ver");
+				new_rev = 1;
+				new_min_ver = parseInt(min_ver) + 1;
+				new_maj_ver = maj_ver;
+				if (new_min_ver >= 1000) {
+					new_min_ver = "000";
+					new_maj_ver = parseInt(new_maj_ver) + 1;
+				}
+				one = new_maj_ver;
+				two = new_min_ver;
+				three = new_rev;
+				four = 0;
+				project.setProperty("new_rev", new_rev);
+				project.setProperty("new_min_ver", new_min_ver);
+				project.setProperty("new_maj_ver", new_maj_ver);
+				project.setProperty("new_comma_ver", one + "," + two + "," + three + "," + four);
+	   	 	]]>
+			</script>
+			<property name="swt_version" value="${maj_ver}${min_ver}r${rev}"/>
+			<property name="new_version" value="${new_maj_ver}${new_min_ver}r${new_rev}"/>
+			<echo>Version=${swt_version}; New=${new_version}; New comma_ver=${new_comma_ver}</echo>
+		</target>
 
 	<!-- Set natives_changed if there are changes in the C code -->
 	<target name="check_natives_changed" unless="natives_changed" depends="get_tag">