Skip to content

Commit 02cb976

Browse files
committed
Revert r45925: undo accidental bulk commit
git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45926 379a1393-f5fb-40a0-bcee-ef074d9b53f7
1 parent ca26619 commit 02cb976

File tree

3 files changed

+19
-22
lines changed

3 files changed

+19
-22
lines changed

vice/build/macOS/bindist.sh

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

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

vice/src/buildtools/updateindex.sh

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

77
#VERBOSE=1
88

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
9+
if sed -i 'p' $(mktemp) 2>/dev/null
10+
then
11+
# GNU sed
12+
SED_I="sed -i"
1413
else
15-
echo No GNU sed found
16-
exit 2
14+
# BSD sed
15+
SED_I="sed -i ''"
1716
fi
1817

1918
README=doc/html/index.html
@@ -90,7 +89,7 @@ else
9089
TOPLINE="$TOPLINE.$VBUILD"
9190
fi
9291
TOPLINE="$TOPLINE released"
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
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
9493
fi
9594

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

119118
LINE=`grep "vice-[0-9]\+\.[0-9]\+\.*[0-9]*\.tar\.gz" < $README`
@@ -136,7 +135,7 @@ else
136135
LINE="$LINE.$VBUILD"
137136
fi
138137
LINE="$LINE-win"
139-
LC_ALL=C $SED -i -e "s:VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win:$LINE:g" $README
138+
LC_ALL=C $SED_I -e "s:VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win:$LINE:g" $README
140139
fi
141140

142141
LINE=`grep "VICE-[0-9]\+\.[0-9]\+\.*[0-9]*-win" < $README`
@@ -156,7 +155,7 @@ else
156155
if [ "$VBUILD" != "0" ]; then
157156
LINE="$LINE.$VBUILD"
158157
fi
159-
LC_ALL=C $SED -i -e "s:VICE [0-9]\+\.[0-9]\+\.*[0-9]*:$LINE:g" $README
158+
LC_ALL=C $SED_I -e "s:VICE [0-9]\+\.[0-9]\+\.*[0-9]*:$LINE:g" $README
160159
fi
161160

162161
LINE=`grep "VICE [0-9]\+\.[0-9]\+\.*[0-9]*" < $README`
@@ -177,7 +176,7 @@ else
177176
LINE="$LINE.$VBUILD"
178177
fi
179178
LINE="$LINE.dmg"
180-
LC_ALL=C $SED -i -e "s:[0-9]\+\.[0-9]\+\.*[0-9]*.dmg:$LINE:g" $README
179+
LC_ALL=C $SED_I -e "s:[0-9]\+\.[0-9]\+\.*[0-9]*.dmg:$LINE:g" $README
181180
fi
182181

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

vice/src/buildtools/updatereadme.sh

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

77
#VERBOSE=1
88

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
9+
if sed -i 'p' $(mktemp) 2>/dev/null
10+
then
11+
# GNU sed
12+
SED_I="sed -i"
1413
else
15-
echo No GNU sed found
16-
exit 2
14+
# BSD sed
15+
SED_I="sed -i ''"
1716
fi
1817

1918
README=README
@@ -92,7 +91,7 @@ else
9291
fi
9392
TOPLINE="$TOPLINE "
9493
TOPLINE="$TOPLINE$MONTH $YEAR"
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
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
9695
fi
9796

9897
TOPLINE=`grep " \+VICE \+[0-9]\+\.[0-9]\+[\.]*[0-9]* \+[A-Z][a-z][a-z] 20[0-9][0-9]" < $README`
@@ -115,7 +114,7 @@ else
115114
LINE="$LINE.$VBUILD"
116115
fi
117116
LINE="$LINE of VICE"
118-
LC_ALL=C $SED -i -e "s:This is version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+of VICE:$LINE:g" $README
117+
LC_ALL=C $SED_I -e "s:This is version [0-9]\+\.[0-9]\+[\.]*[0-9]* \+of VICE:$LINE:g" $README
119118
fi
120119

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

0 commit comments

Comments
 (0)