Merge pull request #587 from marceltaeumel/marceltaeumel/src-cleanup

Updates src paths to follow Eliot's suggestions

.clang_complete

@@ -1,6 +1,6 @@
 -Iplatforms/Cross/vm
 -Iinclude
--Isrc/vm.32bit.cog.v3
+-Isrc/v3.cog
 -Iplatforms/minheadless/common
 -Iplatforms/minheadless/generic
 -Iplatforms/minheadless/unix

README.md

@@ -133,14 +133,14 @@ in a VM at build time (see plugins.int & plugins.ext in build directories).
 
 The VM source are in directories such as
 ```
-	src/vm.32bit.sista.v3		- Smalltalk Sista V3
-	src/vm.32bit.sista.spur		- Smalltalk Sista Spur
-	src/vm.32bit.cog.spur 		- Smalltalk Cog Spur
-	src/vm.64bit.cog.spur 		- Smalltalk Cog Spur 64-bit
-	src/vm.32bit.stack.spur 	- Smalltalk Stack Spur
-	src/vm.64bit.stack.spur 	- Smalltalk Stack Spur 64-bit
-	src/vm.32bit.cog.v3			- Smalltalk Cog V3
-	src/vm.32bit.stack.v3 		- Smalltalk Stack V3
+	src/v3.sista		- Smalltalk Sista V3
+	src/spur32.sista	- Smalltalk Sista Spur
+	src/spur32.cog 		- Smalltalk Cog Spur
+	src/spur64.cog 		- Smalltalk Cog Spur 64-bit
+	src/spur32.stack 	- Smalltalk Stack Spur
+	src/spur64.stack 	- Smalltalk Stack Spur 64-bit
+	src/v3.cog			- Smalltalk Cog V3
+	src/v3.stack 		- Smalltalk Stack V3
 ```
 
 All plugins are in the directory

building/linux32ARMv6/newspeak.cog.spur/build.assert/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"

building/linux32ARMv6/newspeak.cog.spur/build.debug/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"

building/linux32ARMv6/newspeak.cog.spur/build/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"

building/linux32ARMv6/newspeak.stack.spur/build.assert/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/newspeak.stack.spur/build.debug/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/newspeak.stack.spur/build/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/pharo.cog.spur/build.assert/mvm

@@ -21,7 +21,7 @@ test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
-		--with-src=src/vm.32bit.cog.spur \
+		--with-src=src/spur32.cog \
 		--without-vm-display-fbdev \
 		--enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \

building/linux32ARMv6/pharo.cog.spur/build.debug/mvm

@@ -21,7 +21,7 @@ test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
-		--with-src=src/vm.32bit.cog.spur \
+		--with-src=src/spur32.cog \
 		--without-vm-display-fbdev \
 		--enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \

building/linux32ARMv6/pharo.cog.spur/build/mvm

@@ -39,7 +39,7 @@ test -f config.h || ../../../../platforms/unix/config/configure \
 		--without-npsqueak \
 		--without-vm-display-fbdev \
 		--with-vmversion=5.0 \
-		--with-src=src/vm.32bit.cog.spur \
+		--with-src=src/spur32.cog \
 		--without-vm-display-fbdev \
 		--enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \

building/linux32ARMv6/squeak.cog.spur/build.assert/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.spur \
+		--with-vmversion=5.0 --with-src=src/spur32.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.cog.spur/build.debug/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.spur \
+		--with-vmversion=5.0 --with-src=src/spur32.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.cog.spur/build/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.spur \
+		--with-vmversion=5.0 --with-src=src/spur32.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.cog.v3/build.assert/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.v3 \
+		--with-vmversion=5.0 --with-src=src/v3.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.cog.v3/build.debug/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.v3 \
+		--with-vmversion=5.0 --with-src=src/v3.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.cog.v3/build/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
-		--with-vmversion=5.0 --with-src=src/vm.32bit.cog.v3 \
+		--with-vmversion=5.0 --with-src=src/v3.cog \
 		--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DUSE_MIDI_ALSA -DCOGMTVM=0"

building/linux32ARMv6/squeak.stack.spur/build.assert/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-    --with-vmversion=5.0 --with-src=src/vm.32bit.stack.spur --disable-cogit \
+    --with-vmversion=5.0 --with-src=src/spur32.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/squeak.stack.spur/build.debug/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-    --with-vmversion=5.0 --with-src=src/vm.32bit.stack.spur --disable-cogit \
+    --with-vmversion=5.0 --with-src=src/spur32.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/squeak.stack.spur/build/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-    --with-vmversion=5.0 --with-src=src/vm.32bit.stack.spur --disable-cogit \
+    --with-vmversion=5.0 --with-src=src/spur32.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT"

building/linux32ARMv6/squeak.stack.v3/build.assert/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-	--with-src=src/vm.32bit.stack.v3 --disable-cogit \
+	--with-src=src/v3.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS"

building/linux32ARMv6/squeak.stack.v3/build.debug/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-	--with-src=src/vm.32bit.stack.v3 --disable-cogit \
+	--with-src=src/v3.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS"

building/linux32ARMv6/squeak.stack.v3/build/mvm

@@ -18,7 +18,7 @@ esac
 test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
-	--with-src=src/vm.32bit.stack.v3 --disable-cogit \
+	--with-src=src/v3.stack --disable-cogit \
 	--without-npsqueak --enable-fast-bitblt \
 	TARGET_ARCH="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS"

building/linux32ARMv7/newspeak.cog.spur/build.assert/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32ARMv7/newspeak.cog.spur/build.debug/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32ARMv7/newspeak.cog.spur/build/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure --without-npsqueak \
 		--without-vm-display-fbdev --with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS -DCOGMTVM=0"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32ARMv7/newspeak.stack.spur/build.assert/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32ARMv7/newspeak.stack.spur/build.debug/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32ARMv7/newspeak.stack.spur/build/mvm

@@ -19,7 +19,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 	--with-vmversion=5.0 \
-	--with-src=src/newspeak.vm.32bit.stack.spur --disable-cogit \
+	--with-src=src/spur32.stack.newspeak --disable-cogit \
 	--without-vm-display-fbdev --without-npsqueak \
 	CFLAGS="$OPT"
 rm -f vm/sqUnixMain.o # nuke version info

building/linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"

building/linux32x86/newspeak.cog.spur/build.assert/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2"

building/linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"

building/linux32x86/newspeak.cog.spur/build.debug/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2"

building/linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm

@@ -30,7 +30,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2 -DITIMER_HEARTBEAT=1"

building/linux32x86/newspeak.cog.spur/build/mvm

@@ -30,7 +30,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.cog.spur \
+		--with-src=src/spur32.cog.newspeak \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2"

building/linux32x86/newspeak.stack.spur/build.assert/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.stack.spur  --disable-cogit \
+		--with-src=src/spur32.stack.newspeak  --disable-cogit \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2"

building/linux32x86/newspeak.stack.spur/build.debug/mvm

@@ -29,7 +29,7 @@ test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -
 test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
 test -f config.h || ../../../../platforms/unix/config/configure \
 		--with-vmversion=5.0 \
-		--with-src=src/newspeak.vm.32bit.stack.spur  --disable-cogit \
+		--with-src=src/spur32.stack.newspeak  --disable-cogit \
 		--without-vm-display-fbdev --without-npsqueak \
 	TARGET_ARCH="-m32" \
 	CFLAGS="$OPT -msse2"