From 17f06a91d2c190cc49d7c41854e0fe877288202c Mon Sep 17 00:00:00 2001 From: Marcel Taeumel Date: Thu, 26 Aug 2021 15:35:56 +0200 Subject: [PATCH] Fixes all remaining references to src paths, unrelated to ci [ci skip] --- .clang_complete | 2 +- README.md | 16 ++++++++-------- deploy/packaging/Makefile.debian | 2 +- deploy/packaging/pharo7-ui-common.spec | 4 ++-- deploy/packaging/pharo7-vm-core/debian/rules | 4 ++-- platforms/unix/config/mkmf | 2 +- scripts/findUnofficialFiles | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.clang_complete b/.clang_complete index 482926c98f..ae347397e8 100644 --- a/.clang_complete +++ b/.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 diff --git a/README.md b/README.md index 720a624d36..f36f22fc9d 100644 --- a/README.md +++ b/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 diff --git a/deploy/packaging/Makefile.debian b/deploy/packaging/Makefile.debian index fe7c301709..b7a9fc4180 100644 --- a/deploy/packaging/Makefile.debian +++ b/deploy/packaging/Makefile.debian @@ -11,7 +11,7 @@ version_from_travis: build_srcpackage: @echo "Generating source package" - cp -a $(BASE_DIR)/src/vm.32bit.cog.spur $(BASE_DIR)/src/vm.64bit.cog.spur $(BASE_DIR)/platforms $(BASE_DIR)/LICENSE $(BASE_DIR)/mkNamedPrims.sh $(BASE_DIR)/src pharo7-vm-core/ + cp -a $(BASE_DIR)/src/spur32.cog $(BASE_DIR)/src/spur64.cog $(BASE_DIR)/platforms $(BASE_DIR)/LICENSE $(BASE_DIR)/mkNamedPrims.sh $(BASE_DIR)/src pharo7-vm-core/ mkdir -p pharo7-vm-core/building/linux32x86/ cp -a $(BASE_DIR)/building/linux32x86/pharo.cog.spur pharo7-vm-core/building/linux32x86/ cp -a editpharoinstall.sh pharo7-vm-core/building/linux32x86/ diff --git a/deploy/packaging/pharo7-ui-common.spec b/deploy/packaging/pharo7-ui-common.spec index 84f7cd0227..8c399a3bc5 100644 --- a/deploy/packaging/pharo7-ui-common.spec +++ b/deploy/packaging/pharo7-ui-common.spec @@ -30,12 +30,12 @@ Requires: bash %global vm_cppflags -DNDEBUG -DDEBUGVM=0 -D_GNU_SOURCE -DCOGMTVM=0 -DPharoVM -DIMMUTABILITY=1 -DITIMER_HEARTBEAT=1 %ifarch x86_64 -%global vmsources src/vm.64bit.cog.spur +%global vmsources src/spur64.cog %global vm_cflags -msse2 %global vm_extra_cppflags %{nil} %endif %ifarch %{ix86} -%global vmsources src/vm.32bit.cog.spur +%global vmsources src/spur32.cog %global vm_cflags -msse2 %global vm_extra_cppflags -D_FILE_OFFSET_BITS=64 %endif diff --git a/deploy/packaging/pharo7-vm-core/debian/rules b/deploy/packaging/pharo7-vm-core/debian/rules index e9610c3c94..89fa4edcc0 100755 --- a/deploy/packaging/pharo7-vm-core/debian/rules +++ b/deploy/packaging/pharo7-vm-core/debian/rules @@ -9,11 +9,11 @@ export EXTRA_CFLAGS:= ifeq ($(DEB_BUILD_ARCH),i386) EXTRA_CFLAGS:=-msse2 EXTRA_CPPFLAGS:=$(EXTRA_CPPFLAGS) -D_FILE_OFFSET_BITS=64 -SOURCES:=src/vm.32bit.cog.spur +SOURCES:=src/spur32.cog endif ifeq ($(DEB_BUILD_ARCH),amd64) EXTRA_CFLAGS:=-msse2 -SOURCES:=src/vm.64bit.cog.spur +SOURCES:=src/spur64.cog endif # Make sure that dpkg-buildflags are passed to the building process diff --git a/platforms/unix/config/mkmf b/platforms/unix/config/mkmf index 08c25c76c0..3490f02d7c 100755 --- a/platforms/unix/config/mkmf +++ b/platforms/unix/config/mkmf @@ -76,7 +76,7 @@ mkmf() { for x in ${dirs}; do d=${x}/${name} if [ "${name}" = "vm" ]; then - # e.g, platforms/unix/vm would be okay but src/vm.64bit.cog.spur/vm is not + # e.g, platforms/unix/vm would be okay but src/spur64.cog/vm is not if test ! -d ${d}; then d=${x}; fi fi if test -d ${d}; then diff --git a/scripts/findUnofficialFiles b/scripts/findUnofficialFiles index 0f21f6265b..9e624c3ba6 100755 --- a/scripts/findUnofficialFiles +++ b/scripts/findUnofficialFiles @@ -1,5 +1,5 @@ #!/bin/sh # List any files with an un-checked-in package version comment "* VMMaker-..." -find ${@-src/vm.32bit.cog.v3 src/vm.32bit.stack.v3 src/vm.32bit.cog.spur src/vm.32bit.stack.spur src/vm.64bit.stack.spur src/vm.64bit.cog.spur src/newsqueak.vm.32bit.cog.spur src/newspeak.vm.64bit.cog.spur src/newsqueak.vm.32bit.stack.spur src/vm.32bit.sista.spur} -type f -a -name '*.[ch]' \ +find ${@-src/v3.cog src/v3.stack src/spur32.cog src/spur32.stack src/spur64.stack src/spur64.cog src/spur32.cog.newspeak src/spur32.stack.newspeak src/spur64.cog.newspeak src/spur64.stack.newspeak src/spur32.cog.lowcode src/spur32.stack.lowcode src/spur64.cog.lowcode src/spur64.stack.lowcode src/spur32.sista src/spur64.sista} -type f -a -name '*.[ch]' \ -exec egrep -l '\* VMMaker|\* VMConstruction|\* Freetype-Plugin|\* Cog-' {} \;