Skip to content
Permalink
Browse files

Merge branch 'Cog' of http://github.com/OpenSmalltalk/opensmalltalk-vm

…into Cog

[no exit version]
  • Loading branch information
eliotmiranda authored and fniephaus committed Aug 17, 2016
2 parents 6c6ab27 + a9f2e94 commit 0cf2d9090d8a69e19045893d0f730c14e05086ba
@@ -5,11 +5,11 @@
"subject": "opensmalltalk"
},
"version": {
"name": "$Rev$",
"name": "$Rev$-no-exit",
"desc": "Automatic build"
},
"files": [
{"includePattern": "./(cog_.*\\.(?:gz|zip))", "uploadPattern": "$1"}
{"includePattern": "./(cog_.*\\.(?:gz|zip))", "uploadPattern": "no-exit/$1"}
],
"publish": true
}
@@ -1,7 +1,7 @@
PR=${TRAVIS_PULL_REQUEST:-${APPVEYOR_PULL_REQUEST_NUMBER:-false}}
BR=${TRAVIS_BRANCH:-${APPVEYOR_REPO_BRANCH}}

if [[ $PR == "false" ]] && ( [[ "$BR" == "Cog" || "$BR" == "master" ]] ); then
if [[ $PR == "false" ]]; then
echo "`cat .bintray.json | .git_filters/RevDateURL.smudge`" > .bintray.json
sed -i.bak 's/$Rev: \([0-9][0-9]*\) \$/\1/' .bintray.json
sed -i.bak 's/$Date: \(.*\) \$/\1/' .bintray.json
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Build a Spur image that starts up in a simple REPL, which is
# really useful for VMMaker simulation testing.
. ./envvars.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
. ./envvars.sh

test -f SpurVMMaker.image || ./buildspurtrunkvmmakerimage.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
. ./envvars.sh

test -f spurreader.image || ./buildspurtrunkreaderimage.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Build a Spur image that starts up in a simple REPL, which is
# really useful for VMMaker simulation testing.
. ./envvars.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
. ./envvars.sh

./updatespurimage.sh
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Sets the VM env var to the r3692 Cog VM for the current platform.
# will download and install the VM in this directory if necessary.

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Sets the VM env var to the r3692 Newspeak Spur VM for the current platform.
# will download and install the VM in this directory if necessary.

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Sets the VM env var to the r3692 Cog Spur VM for the current platform.
# will download and install the VM in this directory if necessary.

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
if [ $# -ne 3 ]; then
echo "Usage: `basename $0` <image> <width> <height>"
exit 1
@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Update the latest Spur image.
. ./envvars.sh

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Update the latest Spur image.
. ./envvars.sh

@@ -1,4 +1,4 @@
#!/bin/sh -e
#!/bin/bash -e
# Upload a trunk46-spur.image/.changes to mirandabanda.org
RemoteUser=eliotmiranda@highland-park.dreamhost.com
RemoteRoot=mirandabanda.org/files/Cog/SpurImages
@@ -315,7 +315,7 @@ beatStateMachine(void *careLess)
perror("pthread_setschedparam failed");
fprintf(stderr,
"Read e.g. https://github.com/OpenSmalltalk/opensmalltalk-vm/releases/tag/r3732#linux\n");
exit(errno);
// exit(errno);
}
beatState = active;
while (beatState != condemned) {

0 comments on commit 0cf2d90

Please sign in to comment.
You can’t perform that action at this time.