Moves all flavors of CogVM sources into "src/" folder. http://lists.squeakfoundation.org/pipermail/vm-dev/2021-July/036540.html
Moves all build folders down to "building/" folder. Chose "building" over "build" to avoid conflicts with common build systems. http://lists.squeakfoundation.org/pipermail/vm-dev/2021-July/036551.html You can view, comment on, or merge this pull request online at:
https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/573
-- Commit Summary --
* Removes all generated source files of the VM (not the plugins). * re-add all VM sources at the new location * In build files, replaces occurrences of "/src/vm" with "/src/vm.32bit.cog.v3" * For Window and macOS, updates makefiles to point to new src directories. * In linux 32-bit v3 build files, make vm version and source path consistently explicit. Do not rely on the default value for the "with-src" variable from autoconf script. * In all remaining linux build mvm files, updates "--with-src" variable. Not yet working because platforms/unix/config still needs to be adapted. * Updates remaining occurrences of old-style source paths (e.g. spur64src) with new ones (e.g. src/vm.64bit.cog.spur). * CogVM source as per VMMaker.oscog-eem.2985 * Updates autoconf files to use the new source folder, which does not need the extra "/vm" suffix. * Updates src paths in cmake (minheadless only). Also minor cleanup. * I missed a spot. Not sure why .clang_complete is in here at all. * Move all build directories into "building", dropping the prefix "build.". Note that "building" instead of "build" because the latter is a common pattern for build systems. So we want to keep that name available to avoid conflicts. * Replaces "build." with "building/".
-- File Changes --
M .clang_complete (2) M .gitignore (59) M CMakeLists.txt (166) M README.md (56) D build.linux32ARMv6/HowToBuild (264) D build.linux32ARMv6/newspeak.cog.spur/build.assert/mvm (31) D build.linux32ARMv6/newspeak.cog.spur/build.debug/mvm (31) D build.linux32ARMv6/newspeak.cog.spur/build/mvm (31) D build.linux32ARMv6/newspeak.stack.spur/build.assert/mvm (31) D build.linux32ARMv6/newspeak.stack.spur/build.debug/mvm (31) D build.linux32ARMv6/newspeak.stack.spur/build/mvm (31) D build.linux32ARMv6/pharo.cog.spur/build.assert/mvm (35) D build.linux32ARMv6/pharo.cog.spur/build.debug/mvm (35) D build.linux32ARMv6/pharo.cog.spur/build/mvm (58) D build.linux32ARMv6/squeak.cog.spur/build.assert/mvm (29) D build.linux32ARMv6/squeak.cog.spur/build.debug/mvm (29) D build.linux32ARMv6/squeak.cog.spur/build/mvm (29) D build.linux32ARMv6/squeak.cog.v3/build.assert/mvm (29) D build.linux32ARMv6/squeak.cog.v3/build.debug/mvm (29) D build.linux32ARMv6/squeak.cog.v3/build/mvm (29) D build.linux32ARMv6/squeak.stack.spur/build.assert/mvm (29) D build.linux32ARMv6/squeak.stack.spur/build.debug/mvm (29) D build.linux32ARMv6/squeak.stack.spur/build/mvm (29) D build.linux32ARMv6/squeak.stack.v3/build.assert/mvm (29) D build.linux32ARMv6/squeak.stack.v3/build.debug/mvm (29) D build.linux32ARMv6/squeak.stack.v3/build/mvm (29) D build.linux32ARMv7/HowToBuild (259) D build.linux32ARMv7/newspeak.cog.spur/build.assert/mvm (30) D build.linux32ARMv7/newspeak.cog.spur/build.debug/mvm (30) D build.linux32ARMv7/newspeak.cog.spur/build/mvm (30) D build.linux32ARMv7/newspeak.stack.spur/build.assert/mvm (30) D build.linux32ARMv7/newspeak.stack.spur/build.debug/mvm (30) D build.linux32ARMv7/newspeak.stack.spur/build/mvm (30) D build.linux32x86/HowToBuild (307) D build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm (39) D build.linux32x86/newspeak.cog.spur/build.assert/mvm (41) D build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm (39) D build.linux32x86/newspeak.cog.spur/build.debug/mvm (41) D build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm (40) D build.linux32x86/newspeak.cog.spur/build/mvm (42) D build.linux32x86/newspeak.stack.spur/build.assert/mvm (41) D build.linux32x86/newspeak.stack.spur/build.debug/mvm (41) D build.linux32x86/newspeak.stack.spur/build/mvm (42) D build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm (39) D build.linux32x86/nsnac.cog.spur/build.assert/mvm (41) D build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm (39) D build.linux32x86/nsnac.cog.spur/build.debug/mvm (41) D build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm (40) D build.linux32x86/nsnac.cog.spur/build/mvm (42) D build.linux32x86/pharo.cog.spur.lowcode/build.assert.itimerheartbeat/mvm (36) D build.linux32x86/pharo.cog.spur.lowcode/build.assert/mvm (39) D build.linux32x86/pharo.cog.spur.lowcode/build.debug.itimerheartbeat/mvm (36) D build.linux32x86/pharo.cog.spur.lowcode/build.debug/mvm (38) D build.linux32x86/pharo.cog.spur.lowcode/build.itimerheartbeat/mvm (54) D build.linux32x86/pharo.cog.spur.lowcode/build/mvm (55) D build.linux32x86/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm (38) D build.linux32x86/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm (38) D build.linux32x86/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm (57) D build.linux32x86/pharo.cog.spur/build.assert.itimerheartbeat/mvm (37) D build.linux32x86/pharo.cog.spur/build.assert/mvm (40) D build.linux32x86/pharo.cog.spur/build.debug.itimerheartbeat/mvm (37) D build.linux32x86/pharo.cog.spur/build.debug/mvm (40) D build.linux32x86/pharo.cog.spur/build.itimerheartbeat/mvm (56) D build.linux32x86/pharo.cog.spur/build/mvm (58) D build.linux32x86/pharo.sista.spur/build.assert.itimerheartbeat/mvm (46) D build.linux32x86/pharo.sista.spur/build.assert/mvm (46) D build.linux32x86/pharo.sista.spur/build.debug.itimerheartbeat/mvm (49) D build.linux32x86/pharo.sista.spur/build.debug/mvm (49) D build.linux32x86/pharo.sista.spur/build.itimerheartbeat/mvm (50) D build.linux32x86/pharo.sista.spur/build/mvm (51) D build.linux32x86/pharo.stack.spur.lowcode/build.assert.itimerheartbeat/mvm (36) D build.linux32x86/pharo.stack.spur.lowcode/build.assert/mvm (39) D build.linux32x86/pharo.stack.spur.lowcode/build.debug.itimerheartbeat/mvm (36) D build.linux32x86/pharo.stack.spur.lowcode/build.debug/mvm (38) D build.linux32x86/pharo.stack.spur.lowcode/build.itimerheartbeat/mvm (53) D build.linux32x86/pharo.stack.spur.lowcode/build/mvm (55) D build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm (36) D build.linux32x86/squeak.cog.spur/build.assert/mvm (36) D build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm (36) D build.linux32x86/squeak.cog.spur/build.debug/mvm (37) D build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm (37) D build.linux32x86/squeak.cog.spur/build/mvm (37) D build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm (34) D build.linux32x86/squeak.cog.v3/build.assert/mvm (34) D build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm (34) D build.linux32x86/squeak.cog.v3/build.debug/mvm (34) D build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm (35) D build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm (35) D build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm (35) D build.linux32x86/squeak.cog.v3/build.multithreaded/mvm (36) D build.linux32x86/squeak.cog.v3/build/mvm (35) D build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm (36) D build.linux32x86/squeak.sista.spur/build.assert/mvm (36) D build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm (36) D build.linux32x86/squeak.sista.spur/build.debug/mvm (36) D build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm (37) D build.linux32x86/squeak.sista.spur/build/mvm (37) D build.linux32x86/squeak.stack.spur/build.assert/mvm (37) D build.linux32x86/squeak.stack.spur/build.debug/mvm (37) D build.linux32x86/squeak.stack.spur/build/mvm (37) D build.linux32x86/squeak.stack.v3/build.assert/mvm (36) D build.linux32x86/squeak.stack.v3/build.debug/mvm (36) D build.linux32x86/squeak.stack.v3/build/mvm (37) D build.linux32x86/third-party/alsa-lib-1.0.17a/include/alsa (1) D build.linux64ARMv8/HowToBuild (350) D build.linux64ARMv8/pharo.stack.spur/build.debug/mvm (35) D build.linux64ARMv8/pharo.stack.spur/build/mvm (57) D build.linux64ARMv8/squeak.cog.spur/build.assert/mvm (31) D build.linux64ARMv8/squeak.cog.spur/build.debug/mvm (31) D build.linux64ARMv8/squeak.cog.spur/build/mvm (32) D build.linux64ARMv8/squeak.cogmt.spur/build.assert/mvm (32) D build.linux64ARMv8/squeak.cogmt.spur/build.debug/mvm (32) D build.linux64ARMv8/squeak.cogmt.spur/build/mvm (33) D build.linux64ARMv8/squeak.stack.spur/build.assert/mvm (29) D build.linux64ARMv8/squeak.stack.spur/build.debug/mvm (32) D build.linux64ARMv8/squeak.stack.spur/build/mvm (33) D build.linux64x64/HowToBuild (259) D build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm (33) D build.linux64x64/newspeak.cog.spur/build.assert/mvm (35) D build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm (33) D build.linux64x64/newspeak.cog.spur/build.debug/mvm (35) D build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm (34) D build.linux64x64/newspeak.cog.spur/build/mvm (36) D build.linux64x64/newspeak.stack.spur/build.assert/mvm (35) D build.linux64x64/newspeak.stack.spur/build.debug/mvm (35) D build.linux64x64/newspeak.stack.spur/build/mvm (36) D build.linux64x64/nsnac.cog.spur/build.assert.itimerheartbeat/mvm (33) D build.linux64x64/nsnac.cog.spur/build.assert/mvm (35) D build.linux64x64/nsnac.cog.spur/build.debug.itimerheartbeat/mvm (33) D build.linux64x64/nsnac.cog.spur/build.debug/mvm (35) D build.linux64x64/nsnac.cog.spur/build.itimerheartbeat/mvm (34) D build.linux64x64/nsnac.cog.spur/build/mvm (36) D build.linux64x64/pharo.cog.spur.minheadless/build.assert.itimerheartbeat/mvm (38) D build.linux64x64/pharo.cog.spur.minheadless/build.debug.itimerheartbeat/mvm (38) D build.linux64x64/pharo.cog.spur.minheadless/build.itimerheartbeat/mvm (57) D build.linux64x64/pharo.cog.spur/build.assert.itimerheartbeat/mvm (33) D build.linux64x64/pharo.cog.spur/build.assert/mvm (33) D build.linux64x64/pharo.cog.spur/build.debug.itimerheartbeat/mvm (33) D build.linux64x64/pharo.cog.spur/build.debug/mvm (33) D build.linux64x64/pharo.cog.spur/build.itimerheartbeat/mvm (49) D build.linux64x64/pharo.cog.spur/build/mvm (49) D build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm (30) D build.linux64x64/squeak.cog.spur/build.assert/mvm (30) D build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm (30) D build.linux64x64/squeak.cog.spur/build.debug/mvm (30) D build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm (31) D build.linux64x64/squeak.cog.spur/build/mvm (44) D build.linux64x64/squeak.stack.spur/build.assert/mvm (31) D build.linux64x64/squeak.stack.spur/build.debug/mvm (31) D build.linux64x64/squeak.stack.spur/build/mvm (30) D build.linux64x64/third-party/alsa-lib-1.0.17a/include/alsa (1) D build.macos32x86/HowToBuild (279) D build.macos32x86/common.minheadless/Makefile.app.newspeak (29) D build.macos32x86/common.minheadless/Makefile.app.squeak (22) D build.macos32x86/common/Makefile.app.newspeak (29) D build.macos32x86/common/Makefile.app.squeak (22) D build.macos32x86/newspeak.cog.spur/Makefile (8) D build.macos32x86/newspeak.stack.spur/Makefile (8) D build.macos32x86/pharo.cog.spur.lowcode/Makefile (32) D build.macos32x86/pharo.cog.spur.minheadless/Makefile (38) D build.macos32x86/pharo.cog.spur/Makefile (32) D build.macos32x86/pharo.cog.v3/Makefile (32) D build.macos32x86/pharo.sista.spur/Makefile (32) D build.macos32x86/pharo.stack.spur.lowcode/Makefile (32) D build.macos32x86/pharo.stack.spur/Makefile (32) D build.macos32x86/squeak.cog.spur/Makefile (11) D build.macos32x86/squeak.cog.v3/Makefile (11) D build.macos32x86/squeak.sista.spur/Makefile (19) D build.macos32x86/squeak.stack.spur/Makefile (11) D build.macos32x86/squeak.stack.v3/Makefile (11) D build.macos32x86/xcode/CarbonTemplate/HowToMakeANewPlugin.txt (21) D build.macos64ARMv8/HowToBuild (271) D build.macos64ARMv8/common/Makefile.app.newspeak (29) D build.macos64ARMv8/common/Makefile.app.squeak (22) D build.macos64ARMv8/pharo.stack.spur.lowcode/Makefile (29) D build.macos64ARMv8/pharo.stack.spur/Makefile (29) D build.macos64ARMv8/squeak.cog.spur/Makefile (13) D build.macos64ARMv8/squeak.sista.spur/Makefile (19) D build.macos64ARMv8/squeak.stack.spur/Makefile (11) D build.macos64x64/HowToBuild (273) D build.macos64x64/common/Makefile.app.newspeak (29) D build.macos64x64/common/Makefile.app.squeak (22) D build.macos64x64/newspeak.cog.spur/Makefile (8) D build.macos64x64/newspeak.stack.spur/Makefile (8) D build.macos64x64/pharo.cog.spur.lowcode/Makefile (32) D build.macos64x64/pharo.cog.spur/Makefile (32) D build.macos64x64/pharo.sista.spur/Makefile (32) D build.macos64x64/pharo.stack.spur.lowcode/Makefile (32) D build.macos64x64/pharo.stack.spur/Makefile (32) D build.macos64x64/squeak.cog.spur/Makefile (13) D build.macos64x64/squeak.sista.spur/Makefile (19) D build.macos64x64/squeak.stack.spur/Makefile (13) D build.sunos32x86/HowToBuild (3) D build.sunos32x86/squeak.cog.spur/build/mvm (44) D build.sunos32x86/squeak.stack.spur/build/mvm (44) D build.sunos64x64/HowToBuild (374) D build.sunos64x64/squeak.cog.spur/build/mvm (39) D build.sunos64x64/squeak.stack.spur/build/mvm (35) D build.win32x86/HowToBuild (215) D build.win32x86/newspeak.cog.spur/Makefile (18) D build.win32x86/newspeak.stack.spur/Makefile (18) D build.win32x86/pharo.cog.spur.lowcode/Makefile (34) D build.win32x86/pharo.cog.spur/Makefile (32) D build.win32x86/pharo.sista.spur/Makefile (34) D build.win32x86/pharo.stack.spur/Makefile (38) D build.win32x86/squeak.cog.spur.lowcode/Makefile (18) D build.win32x86/squeak.cog.spur/Makefile (15) D build.win32x86/squeak.cog.v3/Makefile (15) D build.win32x86/squeak.sista.spur/Makefile (17) D build.win32x86/squeak.stack.spur/Makefile (15) D build.win32x86/squeak.stack.v3/Makefile (15) D build.win64x64/HowToBuild (210) D build.win64x64/newspeak.cog.spur/Makefile (18) D build.win64x64/newspeak.stack.spur/Makefile (18) D build.win64x64/pharo.cog.spur/Makefile (32) D build.win64x64/pharo.stack.spur/Makefile (32) D build.win64x64/squeak.cog.spur/Makefile (15) D build.win64x64/squeak.stack.spur/Makefile (15) A building/linux32ARMv6/HowToBuild (264) R building/linux32ARMv6/asasm (0) R building/linux32ARMv6/editnewspeakinstall.sh (0) R building/linux32ARMv6/editpharoinstall.sh (0) R building/linux32ARMv6/makeall (0) R building/linux32ARMv6/makeallclean (0) R building/linux32ARMv6/makeallmakefiles (0) R building/linux32ARMv6/makeproduct (0) R building/linux32ARMv6/makeproductclean (0) A building/linux32ARMv6/newspeak.cog.spur/build.assert/mvm (31) A building/linux32ARMv6/newspeak.cog.spur/build.debug/mvm (31) A building/linux32ARMv6/newspeak.cog.spur/build/mvm (31) R building/linux32ARMv6/newspeak.cog.spur/makeallclean (0) R building/linux32ARMv6/newspeak.cog.spur/makealldirty (0) R building/linux32ARMv6/newspeak.cog.spur/plugins.ext (0) R building/linux32ARMv6/newspeak.cog.spur/plugins.int (0) A building/linux32ARMv6/newspeak.stack.spur/build.assert/mvm (31) A building/linux32ARMv6/newspeak.stack.spur/build.debug/mvm (31) A building/linux32ARMv6/newspeak.stack.spur/build/mvm (31) R building/linux32ARMv6/newspeak.stack.spur/makeallclean (0) R building/linux32ARMv6/newspeak.stack.spur/makealldirty (0) R building/linux32ARMv6/newspeak.stack.spur/plugins.ext (0) R building/linux32ARMv6/newspeak.stack.spur/plugins.int (0) A building/linux32ARMv6/pharo.cog.spur/build.assert/mvm (35) A building/linux32ARMv6/pharo.cog.spur/build.debug/mvm (35) A building/linux32ARMv6/pharo.cog.spur/build/mvm (58) R building/linux32ARMv6/pharo.cog.spur/makeallclean (0) R building/linux32ARMv6/pharo.cog.spur/makealldirty (0) R building/linux32ARMv6/pharo.cog.spur/plugins.ext (0) R building/linux32ARMv6/pharo.cog.spur/plugins.ext.all (0) R building/linux32ARMv6/pharo.cog.spur/plugins.int (0) R building/linux32ARMv6/pharo.cog.spur/prepare-rpi.sh (0) A building/linux32ARMv6/squeak.cog.spur/build.assert/mvm (29) A building/linux32ARMv6/squeak.cog.spur/build.debug/mvm (29) A building/linux32ARMv6/squeak.cog.spur/build/mvm (29) R building/linux32ARMv6/squeak.cog.spur/makeallclean (0) R building/linux32ARMv6/squeak.cog.spur/makealldirty (0) R building/linux32ARMv6/squeak.cog.spur/plugins.ext (0) R building/linux32ARMv6/squeak.cog.spur/plugins.int (0) A building/linux32ARMv6/squeak.cog.v3/build.assert/mvm (29) A building/linux32ARMv6/squeak.cog.v3/build.debug/mvm (29) A building/linux32ARMv6/squeak.cog.v3/build/mvm (29) R building/linux32ARMv6/squeak.cog.v3/makeallclean (0) R building/linux32ARMv6/squeak.cog.v3/makealldirty (0) R building/linux32ARMv6/squeak.cog.v3/plugins.ext (0) R building/linux32ARMv6/squeak.cog.v3/plugins.int (0) A building/linux32ARMv6/squeak.stack.spur/build.assert/mvm (29) A building/linux32ARMv6/squeak.stack.spur/build.debug/mvm (29) A building/linux32ARMv6/squeak.stack.spur/build/mvm (29) R building/linux32ARMv6/squeak.stack.spur/makeallclean (0) R building/linux32ARMv6/squeak.stack.spur/makealldirty (0) R building/linux32ARMv6/squeak.stack.spur/plugins.ext (0) R building/linux32ARMv6/squeak.stack.spur/plugins.int (0) A building/linux32ARMv6/squeak.stack.v3/build.assert/mvm (29) A building/linux32ARMv6/squeak.stack.v3/build.debug/mvm (29) A building/linux32ARMv6/squeak.stack.v3/build/mvm (29) R building/linux32ARMv6/squeak.stack.v3/makeallclean (0) R building/linux32ARMv6/squeak.stack.v3/makealldirty (0) R building/linux32ARMv6/squeak.stack.v3/plugins.ext (0) R building/linux32ARMv6/squeak.stack.v3/plugins.int (0) R building/linux32ARMv6/third-party/Makefile.lib.extra (0) R building/linux32ARMv6/third-party/Makefile.libgit2 (0) R building/linux32ARMv6/third-party/Makefile.libsdl2 (0) R building/linux32ARMv6/third-party/Makefile.libssh2 (0) R building/linux32ARMv6/third-party/mvm (0) A building/linux32ARMv7/HowToBuild (259) R building/linux32ARMv7/editnewspeakinstall.sh (0) R building/linux32ARMv7/makeall (0) R building/linux32ARMv7/makeallclean (0) R building/linux32ARMv7/makeproduct (0) R building/linux32ARMv7/makeproductclean (0) A building/linux32ARMv7/newspeak.cog.spur/build.assert/mvm (30) A building/linux32ARMv7/newspeak.cog.spur/build.debug/mvm (30) A building/linux32ARMv7/newspeak.cog.spur/build/mvm (30) A building/linux32ARMv7/newspeak.stack.spur/build.assert/mvm (30) A building/linux32ARMv7/newspeak.stack.spur/build.debug/mvm (30) A building/linux32ARMv7/newspeak.stack.spur/build/mvm (30) A building/linux32x86/HowToBuild (307) R building/linux32x86/bochsx64/conf.COG (0) R building/linux32x86/bochsx64/conf.COG.dbg (0) R building/linux32x86/bochsx64/exploration/Makefile (0) R building/linux32x86/bochsx64/makeem (0)
-- Patch Links --
https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/573.patch https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/573.diff
@marceltaeumel pushed 2 commits.
275ed38495f393ccc193b45de7719a2422ec2ce7 In all build files because of extra "buildings" indirection", fix "../" decent into top-level for "platforms", "processors", "scripts", "third-party", and ... the custom top-level "products". Also that specific "cd ../../../;pwd" which occurs in combination with "products". 864026c036a466ce7ac3138d05555d46c097157a In all build files because of the "building" indirection, change all "../" to "../../" for "src/" paths.
@marceltaeumel pushed 1 commit.
19da7e8ddee4d94ed5c73b4e33f4a6374a3eb545 For Windows builds, fixes PLUGINSRCDIR, which needs to be "../../../src" (compared to "../../../src/plugins" on all other platforms).
On 2021-07-16, at 7:10 AM, Marcel Taeumel notifications@github.com wrote:
@marceltaeumel pushed 1 commit.
• 19da7e8 For Windows builds, fixes PLUGINSRCDIR, which needs to be "../../../src" (compared to "../../../src/plugins" on all other platforms).
^^^^^This is the Windows nonsense I referred to earlier. I doubt it actually needs to be this way; originally it was purely because Andreas refused to change the relevant make files.
tim -- tim Rowledge; tim@rowledge.org; http://www.rowledge.org/tim Fractured Idiom:- VISA LA FRANCE - Don't leave chateau without it
@marceltaeumel pushed 1 commit.
4e5bf5859ccceccbc8414a36a6ccb925193a2f52 For all Pharo build files, fixes the regression of "../../third-party" in the Makefile, which should just not point to the top-folder's "third-party" but custom Makefiles for each third-party project.
@marceltaeumel pushed 2 commits.
255b3d2369bcdb016efc32e5fcb2df79f164c03a CogVM source as per VMMaker.oscog-eem.2987 0ac537908c3946e4c466ac1a3f799dcb9edd7ef1 Merge remote-tracking branch 'remotes/origin/Cog' into marceltaeumel/src-cleanup
@marceltaeumel pushed 1 commit.
6439590d0b84906f8bfe58a24e22b58b228381ff In all build files because of extra "buildings" indirection", fix "../" decent into top-level for ".thirdparty-cache".
@marceltaeumel pushed 1 commit.
55a077b6c3250f9503beda54e782821941b21874 For unix, fixes regression in generated Makefiles.
For updates to VMMaker, see `VMMaker.oscog-mt.2987` in VMMakerInbox.
@marceltaeumel pushed 1 commit.
5c69415d1c795417653ca048e45b82a1b0859113 In all build files because of extra "buildings" indirection, fixes references to external "sources" folder. That folder is, for example, automatically created when building the VM in macOS. During app-bundling, the .source file will be downloaded from files.squeak.org and stored in (osvm)/sources/ to then be used in the macOS app bundle. There are Newspeak-specific scripts for Linux and Windows pointing to those sources as well.
@marceltaeumel pushed 2 commits.
9f3da93fb6291cf7fb5bbe7f1e9ffa21a7bf7a23 Restore execute permission on all shell scripts. 6b164bd605d55599fff04c47569e59e394755d53 Merge remote-tracking branch 'origin/marceltaeumel/src-cleanup' into marceltaeumel/src-cleanup
@marceltaeumel pushed 2 commits.
de84852c27aa7d935477400f67f08c062870bff9 CogVM source as per VMMaker.oscog-eem.2989 c488ac4b78e819ecf3836ecb2c20063fdd98ffc9 Merge remote-tracking branch 'remotes/upstream/Cog' into marceltaeumel/src-cleanup
@marceltaeumel pushed 1 commit.
f1c0a952d59937ef9b3a2ed4dea0baef0294836f CogVM source as per VMMaker.oscog-eem.3047
@marceltaeumel pushed 6 commits.
5796836cecf4acbb4df4ed80585e03451f0d46d1 Merge remote-tracking branch 'remotes/upstream/Cog' into marceltaeumel/src-cleanup 947428b4e722b8511a848571ef08268527a9ec90 Recover fixes for mvm error codes for Linux builds. 3c19b33fdc2a7897fc0b4662b088be93da65d5e1 Recover fix for ARMv6 builds, which removes "-m32" flag c179bcfb25acb0ebb5bdff4629b980c4b53541ef Adapt build script to new "building/" path 252a015f7e33092bfb664b5e87ba90f4453b92b3 Recover fix for building third-party libs in lowcode flavors on 32-bit Linux af91d2c318cee23915cec3a12bb79017db1cdefd Fixes path issue to mvm script for building third-party libs for Pharo on Linux
@marceltaeumel pushed 1 commit.
16b1a126d4d714539de5aacb2efd3f518fe69f30 No code generation for CogMIPSELCompiler since 46d713f (via VMMaker.oscog-eem.3031)
@marceltaeumel pushed 1 commit.
532f46654e22c4cea84bffc99ac84e492040b7e9 Fix paths for recent addition of processor simulation on linux64ARMv8. Fix paths in workflow filter.
@marceltaeumel pushed 1 commit.
9ddf2520236bc2f82bef22a0092237100fd5caf8 Fix mkmf path check. Fix typo. All "vm-" plugins wrongfully had the vm sources as dependency.
@marceltaeumel pushed 1 commit.
e592966e193c89a027e546c0ff7651cdf95dad57 Fixes remaining ARMv6 builds. I overlooked some -m32 flags.
@marceltaeumel pushed 1 commit.
30fd4dcbfe47d3a6d6311b5987a0d6e7b6b5ac01 For ARMv6 builds, restores execution flag of asasm binary.
Merged #573 into Cog.
Since v3 is implicitly 32-bits how say we - lose the .32bit & .64bit and just have spur32 & spur64? - lose vm; it's also implicit given the plugins directory So then we'd have src/ ckformat.c examplePlugins.ext examplePlugins.int lowcode.cog.spur32 lowcode.stack.spur32 lowcode.cog.spur64 lowcode.stack.spur64 newspeak.cog.spur32 newspeak.stack.spur32 newspeak.cog.spur64 newspeak.stack.spur64 plugins cog.spur32 cog.v3 sista.spur32 stack.spur32 stack.v3 cog.spur64 sista.spur64 stack.spur64
And to my mind the object memory architecture is primary (since it determines image compatibility), so I would go for ckformat.c examplePlugins.ext examplePlugins.int plugins spur32.cog spur32.cog.lowcode spur32.cog.newspeak spur32.sista spur32.stack spur32.stack.lowcode spur32.stack.newspeak spur64.cog spur64.cog.lowcode spur64.cog.newspeak spur64.sista spur64.stack spur64.stack.lowcode spur64.stack.newspeak v3.cog v3.stack
That makes *much* more sense to me.
Also, all generated files fall foul of scripts/findUnofficialFiles (they are all generated from a dirty VM package). This is a no no :-). BTW, we should merely *move* the generated files from the previous commit into their new positions, not regenerate them. e.g. the fact that spur64src/vm/cogit.c has not been regenerated since VMMaker.oscog-eem.2859 is meaningful (if only to me).
Since v3 is implicitly 32-bits [...]
I made this explicit so that newcomers can see it immediately. No need to hide this information. :-) It also helped me writing the GitHub Actions workflows. There, 32-bit and 64-bit is kind of the primary discriminator. v3 and spur come secondly.
And to my mind the object memory architecture is primary (since it determines image compatibility),
Hmm... I found it helpful to not drop the "vm." prefix and to move both "newspeak" and "lowcode" to the front to indicate that both are flavors not directly connected to the basic osvm development.
Also, all generated files fall foul of scripts/findUnofficialFiles (they are all generated from a dirty VM package). This is a no no :-).
Is there a way to read up on this? I tried to not commit comment-only changes. And because of the "Fix config.h include order"-issue, I got into the habit of re-generating the sources myself to see how good we can use the GitHub-Tooling for such things. :-)
OK, ciao bella.
Hmm... so you did not like the path structure in "src" but merged the PR anyway? I am confused. Well, it's very simple to change the structure as you proposed. I thought I double-checked that with you on vm-dev weeks ago.
In PR #587, I just restored the CogVM sources to what you committed in https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/12b0d50876312a74c51.... See https://github.com/marceltaeumel/opensmalltalk-vm/commit/3254c5460e29e430c3f...
vm-dev@lists.squeakfoundation.org
-
Eliot Miranda -
Marcel Taeumel
-
tim Rowledge