Skip to content

Commit ca26619

Browse files
committed
Ignore built macos launcher binary
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45925 379a1393-f5fb-40a0-bcee-ef074d9b53f7
1 parent 4d283a2 commit ca26619

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

vice/build/macOS/bindist.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ BUILD_FLAGS="\
8383
--with-png \
8484
--with-resid \
8585
--with-vorbis \
86+
--disable-pdf-docs \
8687
"
8788

8889
if [ "$(uname -m)" == "x86_64" ]; then

vice/src/buildtools/updateindex.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
#VERBOSE=1
88

9-
if sed -i 'p' $(mktemp) 2>/dev/null
10-
then
11-
# GNU sed
12-
SED_I="sed -i"
9+
# Make sure we're using GNU sed, not BSD sed
10+
if sed --version >/dev/null 2>&1; then
11+
SED=sed
12+
elif gsed --version >/dev/null 2>&1; then
13+
SED=gsed
1314
else
14-
# BSD sed
15-
SED_I="sed -i ''"
15+
echo No GNU sed found
16+
exit 2
1617
fi
1718

1819
README=doc/html/index.html
@@ -89,7 +90,7 @@ else
8990
TOPLINE="$TOPLINE.$VBUILD"
9091
fi
9192
TOPLINE="$TOPLINE released"
92-
LC_ALL=C $SED_I -e "s:[\(][0-9]\+ [A-Z][a-z]* 20[0-9][0-9][\)] Version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+released:$TOPLINE:g" $README
93+
LC_ALL=C $SED -i -e "s:[\(][0-9]\+ [A-Z][a-z]* 20[0-9][0-9][\)] Version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+released:$TOPLINE:g" $README
9394
fi
9495

9596
TOPLINE=`grep "([0-9]\+ [A-Z][a-z]* 20[0-9][0-9]) Version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+released" < $README`
@@ -112,7 +113,7 @@ else
112113
LINE="$LINE.$VBUILD"
113114
fi
114115
LINE="$LINE.tar.gz"
115-
LC_ALL=C $SED_I -e "s:vice-[0-9]\+\.[0-9]\+\.*[0-9]*\.tar\.gz:$LINE:g" $README
116+
LC_ALL=C $SED -i -e "s:vice-[0-9]\+\.[0-9]\+\.*[0-9]*\.tar\.gz:$LINE:g" $README
116117
fi
117118

118119
LINE=`grep "vice-[0-9]\+\.[0-9]\+\.*[0-9]*\.tar\.gz" < $README`
@@ -135,7 +136,7 @@ else
135136
LINE="$LINE.$VBUILD"
136137
fi
137138
LINE="$LINE-win"
138-
LC_ALL=C $SED_I -e "s:VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win:$LINE:g" $README
139+
LC_ALL=C $SED -i -e "s:VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win:$LINE:g" $README
139140
fi
140141

141142
LINE=`grep "VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win" < $README`
@@ -155,7 +156,7 @@ else
155156
if [ "$VBUILD" != "0" ]; then
156157
LINE="$LINE.$VBUILD"
157158
fi
158-
LC_ALL=C $SED_I -e "s:VICE [0-9]\+\.[0-9]\+\.*[0-9]*:$LINE:g" $README
159+
LC_ALL=C $SED -i -e "s:VICE [0-9]\+\.[0-9]\+\.*[0-9]*:$LINE:g" $README
159160
fi
160161

161162
LINE=`grep "VICE [0-9]\+\.[0-9]\+\.*[0-9]*" < $README`
@@ -176,7 +177,7 @@ else
176177
LINE="$LINE.$VBUILD"
177178
fi
178179
LINE="$LINE.dmg"
179-
LC_ALL=C $SED_I -e "s:[0-9]\+\.[0-9]\+\.*[0-9]*.dmg:$LINE:g" $README
180+
LC_ALL=C $SED -i -e "s:[0-9]\+\.[0-9]\+\.*[0-9]*.dmg:$LINE:g" $README
180181
fi
181182

182183
LINE=`grep "[0-9]\+\.[0-9]\+\.*[0-9]*.dmg" < $README`

vice/src/buildtools/updatereadme.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66

77
#VERBOSE=1
88

9-
if sed -i 'p' $(mktemp) 2>/dev/null
10-
then
11-
# GNU sed
12-
SED_I="sed -i"
9+
# Make sure we're using GNU sed, not BSD sed
10+
if sed --version >/dev/null 2>&1; then
11+
SED=sed
12+
elif gsed --version >/dev/null 2>&1; then
13+
SED=gsed
1314
else
14-
# BSD sed
15-
SED_I="sed -i ''"
15+
echo No GNU sed found
16+
exit 2
1617
fi
1718

1819
README=README
@@ -91,7 +92,7 @@ else
9192
fi
9293
TOPLINE="$TOPLINE "
9394
TOPLINE="$TOPLINE$MONTH $YEAR"
94-
LC_ALL=C $SED_I -e "s: \+VICE \+[0-9]\+\.[0-9]\+[\.]*[0-9]* \+[A-Z][a-z][a-z] 20[0-9][0-9]:$TOPLINE:g" $README
95+
LC_ALL=C $SED -i -e "s: \+VICE \+[0-9]\+\.[0-9]\+[\.]*[0-9]* \+[A-Z][a-z][a-z] 20[0-9][0-9]:$TOPLINE:g" $README
9596
fi
9697

9798
TOPLINE=`grep " \+VICE \+[0-9]\+\.[0-9]\+[\.]*[0-9]* \+[A-Z][a-z][a-z] 20[0-9][0-9]" < $README`
@@ -114,7 +115,7 @@ else
114115
LINE="$LINE.$VBUILD"
115116
fi
116117
LINE="$LINE of VICE"
117-
LC_ALL=C $SED_I -e "s:This is version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+of VICE:$LINE:g" $README
118+
LC_ALL=C $SED -i -e "s:This is version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+of VICE:$LINE:g" $README
118119
fi
119120

120121
LINE=`grep "This is version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+of VICE" < $README`

0 commit comments

Comments
 (0)