Set the VM_VERSION to 7.0rc1/4.7rc1 (spur/v3).

Fix the macos Makefiles to have getversion depend on the file that defines VM_VERSION.

Author: eliotmiranda

building/macos32x86/common/Makefile.vm

@@ -131,7 +131,7 @@ INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
-SCCSVER:=$(PLATDIR)/Cross/vm/sqSCCSVersion.h
+SCCSVER:=$(CROSSDIR)/sqSCCSVersion.h
 
 ifneq ($(shell grep 'GitRawRevisionString.*$$Rev$$.' $(SCCSVER)),)
 $(shell bash -c "cd ../../../scripts; ./updateSCCSVersions")
@@ -149,7 +149,7 @@ svnver:
 	@-echo $(SVNREV)
 
 # N.B. getversion is *not* cross compiled; it must run here and now
-getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h
+getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqVirtualMachine.h $(SCCSVER)
 	$(CC) -x c -DVERSION_PROGRAM=1 $(INCLUDES) $(DEPFLAGS) $< -o $@
 	$(POSTCOMPILE)
 

building/macos64ARMv8/common/Makefile.vm

@@ -139,7 +139,7 @@ INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
-SCCSVER:=$(PLATDIR)/Cross/vm/sqSCCSVersion.h
+SCCSVER:=$(CROSSDIR)/sqSCCSVersion.h
 
 ifneq ($(shell grep 'GitRawRevisionString.*$$Rev$$.' $(SCCSVER)),)
 $(shell bash -c "cd ../../../scripts; ./updateSCCSVersions")
@@ -157,7 +157,7 @@ svnver:
 	@-echo $(SVNREV)
 
 # N.B. getversion is *not* cross compiled; it must run here and now
-getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h
+getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqVirtualMachine.h $(SCCSVER)
 	$(CC) -x c -DVERSION_PROGRAM=1 $(INCLUDES) $(DEPFLAGS) $< -o $@
 	$(POSTCOMPILE)
 

building/macos64x64/common/Makefile.vm

@@ -139,7 +139,7 @@ INCLUDES:= $(addprefix -I,. $(SRCDIRS))
 #############################################################################
 # Ensure version control info is up-to-date, and extract it from the file.
 #
-SCCSVER:=$(PLATDIR)/Cross/vm/sqSCCSVersion.h
+SCCSVER:=$(CROSSDIR)/sqSCCSVersion.h
 
 ifneq ($(shell grep 'GitRawRevisionString.*$$Rev$$.' $(SCCSVER)),)
 $(shell bash -c "cd ../../../scripts; ./updateSCCSVersions")
@@ -157,7 +157,7 @@ svnver:
 	@-echo $(SVNREV)
 
 # N.B. getversion is *not* cross compiled; it must run here and now
-getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqSCCSVersion.h
+getversion: $(OSXCOMMONDIR)/version.c deps/version.d $(CROSSDIR)/sqVirtualMachine.h $(SCCSVER)
 	$(CC) -x c -DVERSION_PROGRAM=1 $(INCLUDES) $(DEPFLAGS) $< -o $@
 	$(POSTCOMPILE)
 

platforms/Cross/vm/sqVirtualMachine.h

@@ -7,9 +7,9 @@
 #include "interp.h"
 
 #if SPURVM
-# define VM_VERSION "5.0"
+# define VM_VERSION "7.0rc1"
 #else
-# define VM_VERSION "4.5"
+# define VM_VERSION "4.7rc1"
 #endif
 
 #ifndef VM_PROXY_MAJOR