components/runtime/smalltalk/stack-spur/Makefile
@@ -19,14 +19,19 @@ # # opensmalltalk-vm can be built both in 32 and 64bit # since december 2023 version 5.0.3339 we only deliver ELF64 bit executables # because the required 32bit libraries are no longer available # # we deliver our own script squeak.ips as driver script # # the driver script checks (with ckformat) the Smalltalk image # image format 6521 or 7033 : start VM 32bit # image format 6521 or 7033 : start VM 32bit (not included any longer) # image format 68021 or 68533 : start VM 64bit BUILD_BITS=32_and_64 BUILD_BITS=64 USE_COMMON_TEST_MASTER= no # the SSL module is supporting 1.1 and 3.x but SUnit testframework is not USE_OPENSSL10=yes include ../../../../make-rules/shared-macros.mk @@ -35,9 +40,9 @@ # sometimes the Stack VM is generated from a different VMMaker as the Cog VM COMPONENT_NAME= stack-spur COMPONENT_VERSION= 5.0.3328 GIT_TAG= sun-v5.0.60 PLUGIN_REV= 5.0-202306181455 COMPONENT_VERSION= 5.0.3339 GIT_TAG= sun-v5.0.61 PLUGIN_REV= 5.0-202312211904 COMPONENT_SUMMARY= The OpenSmalltalk Stack Spur Virtual Machine COMPONENT_PROJECT_URL= http://www.squeak.org COMPONENT_FMRI= runtime/smalltalk/stack-spur @@ -51,7 +56,7 @@ COMPONENT_SRC= opensmalltalk-vm-$(GIT_TAG) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= sha256:35ec9cc7ea6128e4d62b93cefd9555ffeaf03123c7e52f4a8025e1849e8f170e COMPONENT_ARCHIVE_HASH= sha256:68bdf1b20c9eeed85b054e888fcf3fe56afab2f9976ad77cb770d115b9303593 COMPONENT_ARCHIVE_URL= https://codeload.github.com/cstes/opensmalltalk-vm/tar.gz/$(GIT_TAG) # run SUnit tests in the build directories on 32bit and 64bit Squeak images components/runtime/smalltalk/stack-spur/manifests/sample-manifest.p5m
@@ -23,8 +23,6 @@ license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' file path=usr/bin/$(MACH64)/ckformat file path=usr/bin/$(MACH64)/squeak file path=usr/bin/ckformat file path=usr/bin/squeak file path=usr/doc/squeak/COPYING @@ -33,52 +31,29 @@ file path=usr/doc/squeak/README.Contributing file path=usr/doc/squeak/README.Keyboard file path=usr/doc/squeak/README.Sound file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/ClipboardExtendedPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/VectorEnginePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-sound-OSS.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-sound-Sun.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202304081342-64bit/vm-sound-pulse.so file path=usr/lib/squeak/5.0-202304081342-32bit/B3DAcceleratorPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/ClipboardExtendedPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/DESPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/FileAttributesPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/ImmX11Plugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/LocalePlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/MD5Plugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/SHA2Plugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/Squeak3D.so file path=usr/lib/squeak/5.0-202304081342-32bit/SqueakFFIPrims.so file path=usr/lib/squeak/5.0-202304081342-32bit/SqueakSSL.so file path=usr/lib/squeak/5.0-202304081342-32bit/UUIDPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/UnicodePlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/UnixOSProcessPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/VectorEnginePlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/XDisplayControlPlugin.so file path=usr/lib/squeak/5.0-202304081342-32bit/squeak file path=usr/lib/squeak/5.0-202304081342-32bit/vm-display-X11.so file path=usr/lib/squeak/5.0-202304081342-32bit/vm-display-null.so file path=usr/lib/squeak/5.0-202304081342-32bit/vm-sound-OSS.so file path=usr/lib/squeak/5.0-202304081342-32bit/vm-sound-Sun.so file path=usr/lib/squeak/5.0-202304081342-32bit/vm-sound-null.so file path=usr/lib/squeak/5.0-202304081342-32bit/vm-sound-pulse.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/B3DAcceleratorPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/ClipboardExtendedPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/DESPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/FileAttributesPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/ImmX11Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/LocalePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/MD5Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/SHA2Plugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/SqueakFFIPrims.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/SqueakSSL.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/VectorEnginePlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/squeak file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-display-X11.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-sound-OSS.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-sound-Sun.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-sound-null.so file path=usr/lib/$(MACH64)/squeak/5.0-202312211904-64bit/vm-sound-pulse.so hardlink path=usr/share/man/man1/inisqueak.1 target=squeak.1 file path=usr/share/man/man1/squeak.1 file path=usr/squeak components/runtime/smalltalk/stack-spur/manifests/stack-spur-display-X11.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes #
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -27,7 +27,6 @@ file inisqueak5 path=usr/bin/inisqueak5 file squeak.ips path=usr/bin/squeak5 file usr/bin/ckformat path=usr/bin/ckformat5 file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/squeak mode=0555 file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/squeak mode=0555 file usr/doc/squeak/COPYING path=usr/share/doc/squeak-$(IPS_COMPONENT_VERSION)/COPYING file usr/doc/squeak/COPYRIGHT path=usr/share/doc/squeak-$(IPS_COMPONENT_VERSION)/COPYRIGHT components/runtime/smalltalk/stack-spur/manifests/stack-spur-ssl.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes #
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes #
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes #
@@ -1,15 +1,15 @@ --- opensmalltalk-vm-sun-v5.0.60/platforms/Cross/vm/sqSCCSVersion.h Sun Jun 18 16:55:24 2023 +++ p0/opensmalltalk-vm-sun-v5.0.60/platforms/Cross/vm/sqSCCSVersion.h Sun Jun 18 19:29:42 2023 --- opensmalltalk-vm-sun-v5.0.61/platforms/Cross/vm/sqSCCSVersion.h Thu Dec 21 20:04:39 2023 +++ p0/opensmalltalk-vm-sun-v5.0.61/platforms/Cross/vm/sqSCCSVersion.h Fri Dec 29 17:20:08 2023 @@ -30,13 +30,13 @@ #if SUBVERSION # define PREFIX "r" -static char SvnRawRevisionString[] = "$Rev$"; +static char SvnRawRevisionString[] = "$Rev: 202306181455 $"; +static char SvnRawRevisionString[] = "$Rev: 202312211904 $"; # define REV_START (SvnRawRevisionString + 6) -static char SvnRawRevisionDate[] = "$Date$"; +static char SvnRawRevisionDate[] = "$Date: Sun Jun 18 16:55:24 2023 +0200 $"; +static char SvnRawRevisionDate[] = "$Date: Thu Dec 21 20:04:39 2023 +0100 $"; # define DATE_START (SvnRawRevisionDate + 7) -static char SvnRawRepositoryURL[] = "$URL$"; @@ -22,12 +22,12 @@ #elif GIT # define PREFIX "" -static char GitRawRevisionString[] = "$Rev$"; +static char GitRawRevisionString[] = "$Rev: 202306181455 $"; +static char GitRawRevisionString[] = "$Rev: 202312211904 $"; # define REV_START (GitRawRevisionString + 6) # define REV_TIME_START (GitRawRevisionString + 14) -static char GitRawRevisionDate[] = "$Date$"; +static char GitRawRevisionDate[] = "$Date: Sun Jun 18 16:55:24 2023 +0200 $"; +static char GitRawRevisionDate[] = "$Date: Thu Dec 21 20:04:39 2023 +0100 $"; # define DATE_START (GitRawRevisionDate + 7) -static char GitRawRepositoryURL[] = "$URL$"; @@ -35,7 +35,7 @@ # define URL_START (GitRawRepositoryURL + 6) -static char GitRawRevisionShortHash[] = "$CommitHash$"; +static char GitRawRevisionShortHash[] = "$CommitHash: 6937bd774 $"; +static char GitRawRevisionShortHash[] = "$CommitHash: 3db97957c $"; # define SHORTHASH_START (GitRawRevisionShortHash + 13) static char * components/runtime/smalltalk/stack-spur/patches/03-sqPluginsSCCSVersion.patch
@@ -1,11 +1,11 @@ --- opensmalltalk-vm-sun-v5.0.60/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sun Jun 18 16:55:24 2023 +++ p0/opensmalltalk-vm-sun-v5.0.60/platforms/Cross/plugins/sqPluginsSCCSVersion.h Sun Jun 18 19:29:42 2023 --- opensmalltalk-vm-sun-v5.0.61/platforms/Cross/plugins/sqPluginsSCCSVersion.h Thu Dec 21 20:04:39 2023 +++ p0/opensmalltalk-vm-sun-v5.0.61/platforms/Cross/plugins/sqPluginsSCCSVersion.h Fri Dec 29 17:20:07 2023 @@ -9,10 +9,10 @@ */ #if SUBVERSION -static char SvnRawPluginsRevisionString[] = "$Rev$"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202306181455 $"; +static char SvnRawPluginsRevisionString[] = "$Rev: 202312211904 $"; # define PLUGINS_REV_START (SvnRawPluginsRevisionString + 6) -static char SvnRawPluginsRepositoryURL[] = "$URL$"; @@ -18,7 +18,7 @@ # undef URL_START #elif GIT -static char GitRawPluginsRevisionString[] = "$Rev$"; +static char GitRawPluginsRevisionString[] = "$Rev: 202306181455 $"; +static char GitRawPluginsRevisionString[] = "$Rev: 202312211904 $"; # define PLUGINS_REV_START (GitRawPluginsRevisionString + 6) -static char GitRawPluginsRepositoryURL[] = "$URL$"; components/runtime/smalltalk/stack-spur/pkg5
@@ -19,11 +19,11 @@ "x11/library/mesa" ], "fmris": [ "runtime/smalltalk/stack-spur", "runtime/smalltalk/stack-spur-display-X11", "runtime/smalltalk/stack-spur-nodisplay", "runtime/smalltalk/stack-spur-ssl", "runtime/smalltalk/stack-spur-vep" "runtime/smalltalk/stack-spur-vep", "runtime/smalltalk/stack-spur" ], "name": "stack-spur" } components/runtime/smalltalk/stack-spur/squeak.ips
@@ -6,7 +6,7 @@ # Last edited: 2013-11-13 19:51:35 by piumarta on emilia PATH=/usr/bin:/bin PLUGIN_REV=5.0-202306181455 PLUGIN_REV=5.0-202312211904 realpath () { path="$1" components/runtime/smalltalk/stack-spur/stack-spur-display-X11.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -42,9 +42,3 @@ file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/Squeak3D.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/XDisplayControlPlugin.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/vm-display-X11.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/B3DAcceleratorPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/ClipboardExtendedPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/ImmX11Plugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/Squeak3D.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/XDisplayControlPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/vm-display-X11.so components/runtime/smalltalk/stack-spur/stack-spur-nodisplay.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -27,7 +27,6 @@ file inisqueak5 path=usr/bin/inisqueak5 file squeak.ips path=usr/bin/squeak5 file usr/bin/ckformat path=usr/bin/ckformat5 file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/squeak mode=0555 file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/squeak mode=0555 file usr/doc/squeak/COPYING path=usr/share/doc/squeak-$(IPS_COMPONENT_VERSION)/COPYING file usr/doc/squeak/COPYRIGHT path=usr/share/doc/squeak-$(IPS_COMPONENT_VERSION)/COPYRIGHT @@ -51,9 +50,3 @@ file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/UnixOSProcessPlugin.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/vm-display-null.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/vm-sound-null.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/DESPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/MD5Plugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/SHA2Plugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/UnixOSProcessPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/vm-display-null.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/vm-sound-null.so components/runtime/smalltalk/stack-spur/stack-spur-ssl.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -27,4 +27,3 @@ depend type=require fmri=pkg:/runtime/smalltalk/stack-spur-nodisplay@$(IPS_COMPONENT_VERSION)-$(BRANCHID) file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/SqueakSSL.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/SqueakSSL.so components/runtime/smalltalk/stack-spur/stack-spur-vep.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -27,4 +27,3 @@ depend type=require fmri=pkg:/runtime/smalltalk/stack-spur-nodisplay@$(IPS_COMPONENT_VERSION)-$(BRANCHID) file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/VectorEnginePlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/VectorEnginePlugin.so components/runtime/smalltalk/stack-spur/stack-spur.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2020, 2021 David Stes # Copyright 2020, 2021, 2023 David Stes # @@ -41,9 +41,3 @@ file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/UUIDPlugin.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/UnicodePlugin.so file path=usr/lib/$(MACH64)/squeak/$(PLUGIN_REV)-64bit/vm-sound-pulse.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/FileAttributesPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/LocalePlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/SqueakFFIPrims.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/UUIDPlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/UnicodePlugin.so file path=usr/lib/squeak/$(PLUGIN_REV)-32bit/vm-sound-pulse.so components/runtime/smalltalk/stack-spur/test/results-32.master
@@ -1,19 +1 @@ SUnit Results Squeak5.3 solaris2.11 Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3328] Failed Tests 'BitBltTest>>#testAllAlphasRgbMul' 'OrderedDictionaryTest>>#testGrow' Errors 'MCDependencySorterTest>>#testCascadingUnresolved' 'MCDependencySorterTest>>#testCycle' 'MCDependencySorterTest>>#testExtraProvisions' 'MCDependencySorterTest>>#testMultiRequirementOrdering' 'MCDependencySorterTest>>#testSimpleOrdering' 'MCDependencySorterTest>>#testSimpleUnresolved' 'MCDependencySorterTest>>#testUnusedAlternateProvider' 'SocketTest>>#testSocketReuse' Total Number of Passed Tests: 4690 Total Number of Failures: 2 Total Number of Errors: 8
@@ -1,7 +1,7 @@ SUnit Results Squeak5.3 solaris2.11 Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3328] Open Smalltalk Stack VM [StackInterpreterPrimitives VMMaker.oscog-eem.3339] Failed Tests 'BitBltTest>>#testAllAlphasRgbMul' 'OrderedDictionaryTest>>#testGrow' components/runtime/smalltalk/stack-spur/test/testrunner.sh
@@ -19,12 +19,13 @@ # export SQUEAK_PLUGINS # download squeak.image to current directory # since december 2023 we no longer test/include 32bit binaries case $BITS in 32) $COMPONENT_DIR/inisqueak5 -32 -n > $LOGFILE 2>&1 ;; # 32) $COMPONENT_DIR/inisqueak5 -32 -n > $LOGFILE 2>&1 ;; 32) ;; 64) $COMPONENT_DIR/inisqueak5 -n > $LOGFILE 2>&1 ;; *) echo "Unknown BITS $BITS";exit 1;; esac # start squeak binary from the build dir $BUILD_DIR/squeak squeak.image $COMPONENT_DIR/test/testrunner.st > $LOGFILE 2>&1
