Skip to content

Commit

Permalink
Merge pull request #4 from hpi-swa-lab/SWT_2020
Browse files Browse the repository at this point in the history
Swt 2020
  • Loading branch information
codeZeilen authored Apr 24, 2020
2 parents fc53297 + 777d845 commit 483cddb
Show file tree
Hide file tree
Showing 250 changed files with 80 additions and 51 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ os: osx

env:
global:
- LECTURE=SWA YEAR=2020
- LECTURE=SWT YEAR=2020
matrix:
- RELEASE=5.3alpha STARTRACK=true
- RELEASE=5.3alpha STARTRACK=false
- RELEASE=Trunk STARTRACK=true
- RELEASE=Trunk STARTRACK=false
- RELEASE=5.3 PATCH=19432 STARTRACK=true
- RELEASE=5.3 PATCH=19432 STARTRACK=false

addons:
homebrew:
Expand Down
33 changes: 19 additions & 14 deletions MAKE.command
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,27 @@ SQUEAK_ARGUMENTS=""

set -e

if [ "$RELEASE" == "Trunk" ]
# Environment variables expected by this script:
# RELEASE: The overall release version (e.g. 5.3 or 5.2, etc.)
# PATCH: The build number of the specific image to be downloaded (e.g. 19432)
# SUFFIX: Additional information about the image (e.g. "Trunk") (optional)
function assert_env_variable {
if [ -z "$1" ]
then
echo "Error: Missing environment variable: $2"
exit 1
fi
}
assert_env_variable "$RELEASE" "RELEASE"
assert_env_variable "$PATCH" "PATCH"

echo "This is a Squeak $RELEASE build (patch: $PATCH)."
if [ -n "$SUFFIX" ]
then
# # Trunk release - for now using same version as normal ones
echo "This is a trunk build"
RELEASE="5.3alpha"
SRC_IMAGE="Squeak5.3alpha-19082-64bit"
SRC_URL="http://files.squeak.org/${RELEASE}/${SRC_IMAGE}/${SRC_IMAGE}.zip"
SUFFIX="Trunk"
else
# # Point-release
echo "Build on release: $RELEASE"
RELEASE="5.3alpha"
SRC_IMAGE="Squeak5.3alpha-19064-64bit"
SRC_URL="http://files.squeak.org/${RELEASE}/${SRC_IMAGE}/${SRC_IMAGE}.zip"
SUFFIX=""
echo "Build is marked as '$SUFFIX'"
fi
SRC_IMAGE="Squeak${RELEASE}-${PATCH}-64bit"
SRC_URL="http://files.squeak.org/${RELEASE}/${SRC_IMAGE}/${SRC_IMAGE}.zip"

if [ "$STARTRACK" == "true" ]
then
Expand Down
3 changes: 2 additions & 1 deletion SwaImageConfiguration.st
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ TextEditor destructiveBackWord: true.
"-=-=-=-=-="

Project current resourceManager reset.
Smalltalk cleanUp: true.
Smalltalk cleanUp: true except: {Warning}.
MCHttpRepository clearCredentials.
Environment allInstancesDo: [:env | env purgeUndeclared].
Undeclared removeUnreferencedKeys.
Expand Down Expand Up @@ -193,6 +193,7 @@ Project current in: [:oldProject |
ProjectHistory forget: oldProject.
Project forget: oldProject.
Project current setParent: Project current.
Project rebuildAllProjects.
Preferences disable: #showSharedFlaps.
UIManager default builderClass: MorphicToolBuilder.
"-=-=-=-=-="
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
<key>CFBundleGetInfoString</key>
<string>%NAME%, Squeak %RELEASE%, squeak.cog.spur_macos64x64</string>
<key>CFBundleShortVersionString</key>
<string>5.2</string>
<string>5.3</string>
<key>CFBundleIconFile</key>
<string>Squeak.icns</string>
<key>CFBundleIdentifier</key>
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE.app/Contents/Linux-x86_64/bin/squeak
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/../lib/squeak/5.0-201810190412
BIN=`/usr/bin/dirname "$0"`/../lib/squeak/5.0-202003021730
GDB=
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
export SQUEAK_PLUGINS="$BIN"
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion TEMPLATE.app/Contents/Linux-x86_64/squeak
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# Run the VM, setting SQUEAK_PLUGINS if unset to the VM's containing directory
# if unset, and ensuring LD_LIBRARY_PATH includes the VM's containing directory.
BIN=`/usr/bin/dirname $0`/lib/squeak/5.0-201810190412
BIN=`/usr/bin/dirname "$0"`/lib/squeak/5.0-202003021730
GDB=
if [ "${SQUEAK_PLUGINS-unset}" = unset ]; then
export SQUEAK_PLUGINS="$BIN"
Expand Down
Binary file modified TEMPLATE.app/Contents/MacOS/Squeak
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>B3DAcceleratorPlugin</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.B3DAcceleratorPlugin</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>CameraPlugin</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.CameraPlugin</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>CroquetPlugin</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.CroquetPlugin</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Resources/English.lproj/MainMenu.nib
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>Mpeg3Plugin</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.Mpeg3Plugin</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>Squeak3D</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.Squeak3D</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>SqueakFFIPrims</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.SqueakFFIPrims</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>SqueakSSL</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.SqueakSSL</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>$(LIBNAME)</string>
<string>UnixOSProcessPlugin</string>
<key>CFBundleIconFile</key>
<string>SqueakPlugin.icns</string>
<key>CFBundleIdentifier</key>
<string>org.squeak.$(LIBNAME)</string>
<string>org.squeak.UnixOSProcessPlugin</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
<key>CFBundleSignature</key>
<string>FAST</string>
<key>CFBundleVersion</key>
<string>5.0-201810190412</string>
<string>5.0-202003021730</string>
</dict>
</plist>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions TEMPLATE.app/Contents/Resources/release-notes/5.3

Large diffs are not rendered by default.

Binary file modified TEMPLATE.app/Contents/Win64/FileAttributesPlugin.dll
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/Squeak.exe
Binary file not shown.
Binary file added TEMPLATE.app/Contents/Win64/Squeak3D.dll
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/SqueakConsole.exe
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/SqueakFFIPrims.dll
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/SqueakSSL.dll
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/UUIDPlugin.dll
Binary file not shown.
Binary file modified TEMPLATE.app/Contents/Win64/Win32OSProcessPlugin.dll
Binary file not shown.

0 comments on commit 483cddb

Please sign in to comment.