Skip to content

Commit

Permalink
Disambiguate the pharo and squeak linux builds by prepending either "…
Browse files Browse the repository at this point in the history
…sq" or "ph"

to the installation directoriews added to products.  Apologies if this breaks
clients of builds but it needs to be done.
  • Loading branch information
eliotmiranda committed Oct 4, 2016
1 parent 4f8e499 commit e1a0749
Show file tree
Hide file tree
Showing 44 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion build.linux32ARMv6/pharo.cog.spur/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert PharoVM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxhtRPi
INSTALLDIR=assert/phcogspurlinuxhtRPi
OPT="-g3 -O1 -fwrapv -DDEBUGVM=0 -DPharoVM"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/pharo.cog.spur/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug PharoVM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspurlinuxhtRPi
INSTALLDIR=debug/phcogspurlinuxhtRPi
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1 -DPharoVM"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/pharo.cog.spur/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# PharoVM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxhtRPi
INSTALLDIR=phcogspurlinuxhtRPi
OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0 -DPharoVM"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.cog.spur/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxhtRPi
INSTALLDIR=assert/sqcogspurlinuxhtRPi
OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.cog.spur/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspurlinuxhtRPi
INSTALLDIR=debug/sqcogspurlinuxhtRPi
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.cog.spur/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxhtRPi
INSTALLDIR=sqcogspurlinuxhtRPi
OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.spur/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stkspurlinuxhtRPi
INSTALLDIR=assert/sqstkspurlinuxhtRPi
OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.spur/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/stkspurlinuxhtRPi
INSTALLDIR=debug/sqstkspurlinuxhtRPi
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.spur/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Stack Spur VM and threaded heartbeat
INSTALLDIR=stkspurlinuxhtRPi
INSTALLDIR=sqstkspurlinuxhtRPi
OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.v3/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stklinuxhtRPi
INSTALLDIR=assert/sqstklinuxhtRPi
OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.v3/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/stklinuxhtRPi
INSTALLDIR=debug/sqstklinuxhtRPi
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32ARMv6/squeak.stack.v3/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=stklinuxhtRPi
INSTALLDIR=sqstklinuxhtRPi
OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

if [ $# -ge 1 ]; then
Expand Down
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and itimer heartbeat
INSTALLDIR=assert/cogspurlinux
INSTALLDIR=assert/phcogspurlinux
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/pharo.cog.spur/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxht
INSTALLDIR=assert/phcogspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"
OPT="$OPT -DPharoVM"

Expand Down
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Spur VM with VM profiler and itimer heartbeat
INSTALLDIR=debug/cogspurlinux
INSTALLDIR=debug/phcogspurlinux
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/pharo.cog.spur/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspurlinuxht
INSTALLDIR=debug/phcogspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"
OPT="$OPT -DPharoVM"

Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/pharo.cog.spur/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxht
INSTALLDIR=phcogspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxht
INSTALLDIR=assert/sqcogspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspurlinuxht
INSTALLDIR=debug/sqcogspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.spur.immutability/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxht
INSTALLDIR=sqcogspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.spur/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspurlinuxht
INSTALLDIR=assert/sqcogspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.spur/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspurlinuxht
INSTALLDIR=debug/sqcogspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.spur/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspurlinuxht
INSTALLDIR=sqcogspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.v3/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/coglinuxht
INSTALLDIR=assert/sqcoglinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.v3/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/coglinuxht
INSTALLDIR=debug/sqcoglinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.cog.v3/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# VM with VM profiler and threaded heartbeat
INSTALLDIR=coglinuxht
INSTALLDIR=sqcoglinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.sista.spur/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/sistaspurlinuxht
INSTALLDIR=assert/sqsistaspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.sista.spur/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/sistaspurlinuxht
INSTALLDIR=debug/sqsistaspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.sista.spur/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=sistaspurlinuxht
INSTALLDIR=sqsistaspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.spur/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stkspurlinuxht
INSTALLDIR=assert/sqstkspurlinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.spur/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/stkspurlinuxht
INSTALLDIR=debug/sqstkspurlinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.spur/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=stkspurlinuxht
INSTALLDIR=sqstkspurlinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.v3/build.assert/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# assert Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stklinuxht
INSTALLDIR=assert/sqstklinuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.v3/build.debug/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# debug Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/stklinuxht
INSTALLDIR=debug/sqstklinuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux32x86/squeak.stack.v3/build/mvm
Expand Up @@ -7,7 +7,7 @@ i*86) ;; # we're good
fi ;;
esac
# Stack VM with VM profiler and threaded heartbeat
INSTALLDIR=stklinuxht
INSTALLDIR=sqstklinuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspur64linuxht
INSTALLDIR=assert/sqcogspur64linuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspur64linuxht
INSTALLDIR=debug/sqcogspur64linuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.cog.spur.immutability/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspur64linuxht
INSTALLDIR=sqcogspur64linuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.cog.spur/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/cogspur64linuxht
INSTALLDIR=assert/sqcogspur64linuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.cog.spur/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/cogspur64linuxht
INSTALLDIR=debug/sqcogspur64linuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.cog.spur/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=cogspur64linuxht
INSTALLDIR=sqcogspur64linuxht
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.stack.spur/build.assert/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# assert Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=assert/stkspur64linuxht
INSTALLDIR=assert/sqstkspur64linuxht
OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.stack.spur/build.debug/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# debug Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=debug/stkspur64linuxht
INSTALLDIR=debug/sqstkspur64linuxht
OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

if [ $# -ge 1 ]; then
Expand Down
2 changes: 1 addition & 1 deletion build.linux64x64/squeak.stack.spur/build/mvm
@@ -1,6 +1,6 @@
#!/bin/bash -e
# Stack Spur VM with VM profiler and threaded heartbeat
INSTALLDIR=stkspur64linuxht
INSTALLDIR=sqstkspur64linuxht
OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0"

if [ $# -ge 1 ]; then
Expand Down

0 comments on commit e1a0749

Please sign in to comment.