Skip to content

Commit 7b62560

Browse files
authored
Merge pull request #366 from akgrant43/Issue365
365: Remove PharoV50.sources from linux builds
2 parents b7ca5ed + 143bea7 commit 7b62560

File tree

3 files changed

+3
-60
lines changed

3 files changed

+3
-60
lines changed

build.linux32ARMv6/editpharoinstall.sh

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ INSTALLDIR="$1"
77
shift
88
cd $INSTALLDIR
99

10-
if [ "$1" = -source ]; then
11-
SourceFile="$2"
12-
shift; shift
13-
else
14-
SourceFile="PharoV50"
15-
fi
16-
mkdir -p "$OSVMROOTDIR/sources"
17-
SOURCE=$OSVMROOTDIR/sources/$SourceFile.sources
18-
test -f $SOURCE || wget -O $SOURCE http://files.pharo.org/sources/$SourceFile
19-
2010
if [ -f squeak ]; then
2111
mv squeak pharo
2212
sed -i 's/squeak/pharo/g' pharo
@@ -29,13 +19,4 @@ rm -rf man doc
2919
LIBDIR="`echo lib/squeak/[0-9.-]*`"
3020
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/pharo
3121
test -d lib/squeak && mv lib/squeak lib/pharo
32-
LIBDIR="`echo lib/pharo/[0-9.-]*`"
33-
if [ "$1" = -copysource ]; then
34-
cp $SOURCE $LIBDIR
35-
elif [ -h $SOURCE ]; then
36-
ln "`readlink $SOURCE`" $LIBDIR
37-
elif [ -f $SOURCE ]; then
38-
ln $SOURCE $LIBDIR
39-
else
40-
echo "can't find `basename $SOURCE`" 1>&2
41-
fi
22+

build.linux32x86/editpharoinstall.sh

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ INSTALLDIR="$1"
77
shift
88
cd $INSTALLDIR
99

10-
if [ "$1" = -source ]; then
11-
SourceFile="$2"
12-
shift; shift
13-
else
14-
SourceFile="PharoV50"
15-
fi
16-
mkdir -p "$OSVMROOTDIR/sources"
17-
SOURCE=$OSVMROOTDIR/sources/$SourceFile.sources
18-
test -f $SOURCE || wget -O $SOURCE http://files.pharo.org/sources/$SourceFile
19-
2010
if [ -f squeak ]; then
2111
mv squeak pharo
2212
sed -i 's/squeak/pharo/g' pharo
@@ -29,13 +19,4 @@ rm -rf man doc
2919
LIBDIR="`echo lib/squeak/[0-9.-]*`"
3020
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/pharo
3121
test -d lib/squeak && mv lib/squeak lib/pharo
32-
LIBDIR="`echo lib/pharo/[0-9.-]*`"
33-
if [ "$1" = -copysource ]; then
34-
cp $SOURCE $LIBDIR
35-
elif [ -h $SOURCE ]; then
36-
ln "`readlink $SOURCE`" $LIBDIR
37-
elif [ -f $SOURCE ]; then
38-
ln $SOURCE $LIBDIR
39-
else
40-
echo "can't find `basename $SOURCE`" 1>&2
41-
fi
22+

build.linux64x64/editpharoinstall.sh

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ INSTALLDIR="$1"
77
shift
88
cd $INSTALLDIR
99

10-
if [ "$1" = -source ]; then
11-
SourceFile="$2"
12-
shift; shift
13-
else
14-
SourceFile="PharoV50"
15-
fi
16-
mkdir -p "$OSVMROOTDIR/sources"
17-
SOURCE=$OSVMROOTDIR/sources/$SourceFile.sources
18-
test -f $SOURCE || wget -O $SOURCE http://files.pharo.org/sources/$SourceFile
19-
2010
if [ -f squeak ]; then
2111
mv squeak pharo
2212
sed -i 's/squeak/pharo/g' pharo
@@ -29,13 +19,4 @@ rm -rf man doc
2919
LIBDIR="`echo lib/squeak/[0-9.-]*`"
3020
test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/pharo
3121
test -d lib/squeak && mv lib/squeak lib/pharo
32-
LIBDIR="`echo lib/pharo/[0-9.-]*`"
33-
if [ "$1" = -copysource ]; then
34-
cp $SOURCE $LIBDIR
35-
elif [ -h $SOURCE ]; then
36-
ln "`readlink $SOURCE`" $LIBDIR
37-
elif [ -f $SOURCE ]; then
38-
ln $SOURCE $LIBDIR
39-
else
40-
echo "can't find `basename $SOURCE`" 1>&2
41-
fi
22+

0 commit comments

Comments
 (0)