Skip to content

Commit e384aca

Browse files
committed
remove mulle-clang from Dockerfile, fix installer and formula
1 parent 84e8d14 commit e384aca

File tree

3 files changed

+4
-27
lines changed

3 files changed

+4
-27
lines changed

.mulle/etc/project/formula-info.sh

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,4 @@ RUN DEBIAN_FRONTEND=noninteractive \
2727
&& wget "https://raw.githubusercontent.com/mulle-sde/mulle-sde/${MULLE_SDE_DEFAULT_VERSION:-release}/bin/installer-all" \
2828
&& chmod 755 installer-all \
2929
&& ./installer-all /usr no \
30-
\
31-
&& wget "https://github.com/mulle-cc/mulle-clang-project/releases/download/17.0.6.0/mulle-clang-17.0.6.0-bookworm-amd64.deb" \
32-
&& dpkg --install "mulle-clang-17.0.6.0-bookworm-amd64.deb"
3330

bin/installer

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -167,29 +167,9 @@ main()
167167
mkdir -p "${share}" || installer_fail "could not create ${share}"
168168
# mkdir -p "${libexec}" || installer_fail "could not create ${libexec}"
169169

170-
case "`uname`" in
171-
*arwin*)
172-
mkdir -p "${bin}" || installer_fail "could not create ${bin}"
173-
install ${VERBOSE} -m "${mode}" "mulle-clang-add-to-xcode" "${bin}/mulle-clang-add-to-xcode" || exit 1
174-
printf "install: ${C_MAGENTA}${C_BOLD}%s${C_RESET}\n" "${bin}/mulle-clang-add-to-xcode" >&2
175-
;;
176-
esac
177-
178-
EXTENSION_DIR="${share}/extensions"
179-
mkdir -p "${EXTENSION_DIR}" || exit 1
180-
cp -Rp ${VERBOSE} "src/mulle-objc" "${EXTENSION_DIR}/" || exit 1
181-
182-
PIX_DIR="${share}/pix"
183-
mkdir -p "${PIX_DIR}" || exit 1
184-
185-
for i in pix/*logo*.txt
186-
do
187-
cp -p ${VERBOSE} "${i}" "${PIX_DIR}/" || exit 1
188-
done
189-
190170
EXTENSION_DIR="${share}/extensions"
191-
mkdir -p "${EXTENSION_DIR}" 2> /dev/null
192-
cp -Rp "src/mulle-objc" "${EXTENSION_DIR}/" || installer_fail "copy to ${EXTENSION_DIR} failed"
171+
mkdir -p "${EXTENSION_DIR}" 2> /dev/null ||
172+
cp -Rp "src/mulle-core" "${EXTENSION_DIR}/" || installer_fail "copy to ${EXTENSION_DIR} failed"
193173
}
194174

195175
main "$@"

0 commit comments

Comments
 (0)