Skip to content

Commit

Permalink
macosx: Make build more portable and general
Browse files Browse the repository at this point in the history 
This broadens the OS X build support to include old and current OS
X/Xcode, and Homebrew/MacPorts.

Support pkgbuild/productbuild + metadata from Mosh-1.2.4-3 package
Search for protobufs in /{usr,opt}/local
Make build select pkgbuild if available, PackageMaker if not
Make PackageBuilder build work on OS X 10.5, XCode 3.1, Macports
Do version substitution
Use generic names for c/c++/cpp
Make build script arch-indepdendent
Changes install dir from /usr to /usr/local

Closes #633.

Signed-off-by: John Hood <cgull@glup.org>
  • Loading branch information
@cgull
cgull committed Jun 21, 2015
1 parent 83bfae7 commit a099638
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 481 deletions.
8 changes: 4 additions & 4 deletions macosx/mosh-1.2.4-3.pkg/Distribution → macosx/Distribution.in
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.6" authoringToolBuild="201">
<title>Mosh 1.2.4</title>
<title>@PACKAGE_VERSION@</title>
<options customize="never" allow-external-scripts="no"/>
<domains enable_anywhere="true"/>
<readme file="ReadMe"/>
<license file="License"/>
<choices-outline>
<line choice="choice0"/>
</choices-outline>
<choice id="choice0" title="Default" customLocation="/">
<choice id="choice0" title="Default" customLocation="/usr">
<pkg-ref id="edu.mit.mosh.mosh.pkg"/>
</choice>
<pkg-ref id="edu.mit.mosh.mosh.pkg" installKBytes="2204" version="1.2.4" auth="Root">#prefix.pkg</pkg-ref>
</installer-script>
<pkg-ref id="edu.mit.mosh.mosh.pkg" installKBytes="2204" version="@PACKAGE_VERSION@" auth="Root">#edu.mit.mosh.mosh.pkg</pkg-ref>
</installer-script>
198 changes: 120 additions & 78 deletions macosx/build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,45 @@
#!/bin/bash

#
# This script is known to work on:
# OS X 10.5.8, Xcode 3.1.2, SDK 10.5, MacPorts 2.3.3
# OS X 10.9.5, Xcode 5.1.1, SDK 10.9, MacPorts 2.3.2
# OS X 10.10.3, XCode 6.3.2, SDK 10.10, Homebrew 0.9.5/8da6986
#
# You may need to set PATH to include the location of your
# PackageMaker binary, if your system is old enough to need that.
# Setting MACOSX_DEPLOYMENT_TARGET will select an SDK as usual.
#
# If you are using Homebrew, you should install protobuf (and any
# other future Homebrew dependencies) with
# `--universal --build-bottle`.
# The first option should be fairly obvious; the second has the side
# effect of disabling Homebrew's overzealous processor optimization
# with (effectively) `-march=native`.
#

set -e

protobuf_LIBS=$(l=libprotobuf.a; for i in /opt/local/lib /usr/local/lib; do if [ -f $i/$l ]; then echo $i/$l; fi; done)
if [ -z "$protobuf_LIBS" ]; then echo "Can't find libprotobuf.a"; exit 1; fi
export protobuf_LIBS
if ! pkg-config --cflags protobuf > /dev/null 2>&1; then
protobuf_CFLAGS=-I$(for i in /opt /usr; do d=$i/local/include; if [ -d $d/google/protobuf ]; then echo $d; fi; done)
if [ "$protobuf_CFLAGS" = "-I" ]; then echo "Can't find protobuf includes"; exit 1; fi
export protobuf_CFLAGS
fi
echo "Building into prefix..."
PREFIX=`pwd`/prefix
PREFIX_i386=`pwd`/prefix_i386
PREFIX_x86_64=`pwd`/prefix_x86_64
#PREFIX_ppc=`pwd`/prefix_ppc
#PREFIX_ppc64=`pwd`/prefix_ppc64
export MACOSX_DEPLOYMENT_TARGET=10.6
#
# XXX This script abuses Configure's --prefix argument badly. It uses
# it as a $DESTDIR, but --prefix can also affect paths in generated
# objects. That is not *currently* a problem in mosh.
#
PREFIX="$(pwd)/prefix"
mkdir -p "$PREFIX"
mkdir -p "$PREFIX_i386"
mkdir -p "$PREFIX_x86_64"
#mkdir -p "$PREFIX_ppc"
#mkdir -p "$PREFIX_ppc64"
ARCHS=" ppc ppc64 i386 x86_64"
pushd .. > /dev/null
Expand All @@ -26,87 +49,106 @@ then
PATH=/opt/local/bin:$PATH ./autogen.sh
fi
echo "Building for x86_64..."
./configure --prefix="$PREFIX_x86_64" \
CC="clang -arch x86_64" CPP="clang -arch x86_64 -E" CXX="clang++ -arch x86_64" \
TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a \
OPENSSL_CFLAGS=" " OPENSSL_LIBS="-lssl -lcrypto -lz"
make clean
make install -j8

echo "Building for i386..."
./configure --prefix="$PREFIX_i386" \
CC="clang -arch i386" CPP="clang -arch i386 -E" CXX="clang++ -arch i386" \
TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a \
OPENSSL_CFLAGS=" " OPENSSL_LIBS="-lssl -lcrypto -lz"
make clean
make install -j8

#echo "Building for ppc..."
#./configure --prefix="$PREFIX_ppc" \
# --target=ppc-apple-darwin --build=i686-apple-darwin --host=ppc-apple-darwin \
# CC="clang -arch ppc -mmacosx-version-min=10.5" CPP="clang -arch ppc -mmacosx-version-min=10.5 -E" CXX="clang++ -arch ppc -mmacosx-version-min=10.5" \
# TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a
#make clean
#make install -j8
#
#echo "Building for ppc64..."
#./configure --prefix="$PREFIX_ppc64" \
# --target=ppc-apple-darwin --build=i686-apple-darwin --host=ppc-apple-darwin \
# CC="clang -arch ppc64 -mmacosx-version-min=10.5" CPP="clang -arch ppc64 -mmacosx-version-min=10.5 -E" CXX="clang++ -arch ppc64 -mmacosx-version-min=10.5" \
# TINFO_LIBS=-lncurses protobuf_LIBS=/opt/local/lib/libprotobuf.a
#make clean
#make install -j8

echo "Building universal binaries..."

cp -r "$PREFIX_x86_64/" "$PREFIX/"

strip "$PREFIX_i386/bin/mosh-client"
strip "$PREFIX_i386/bin/mosh-server"
strip "$PREFIX_x86_64/bin/mosh-client"
strip "$PREFIX_x86_64/bin/mosh-server"
#strip "$PREFIX_ppc/bin/mosh-client"
#strip "$PREFIX_ppc/bin/mosh-server"
#strip "$PREFIX_ppc64/bin/mosh-client"
#strip "$PREFIX_ppc64/bin/mosh-server"

#lipo -create "$PREFIX_ppc/bin/mosh-client" "$PREFIX_ppc64/bin/mosh-client" "$PREFIX_i386/bin/mosh-client" "$PREFIX_x86_64/bin/mosh-client" -output "$PREFIX/bin/mosh-client"
#lipo -create "$PREFIX_ppc/bin/mosh-server" "$PREFIX_ppc64/bin/mosh-server" "$PREFIX_i386/bin/mosh-server" "$PREFIX_x86_64/bin/mosh-server" -output "$PREFIX/bin/mosh-server"
lipo -create "$PREFIX_i386/bin/mosh-client" "$PREFIX_x86_64/bin/mosh-client" -output "$PREFIX/bin/mosh-client"
lipo -create "$PREFIX_i386/bin/mosh-server" "$PREFIX_x86_64/bin/mosh-server" -output "$PREFIX/bin/mosh-server"

perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' "$PREFIX/bin/mosh"

popd > /dev/null
# Build archs one by one.
#
for arch in $ARCHS; do
echo "Building for ${arch}..."
prefix="${PREFIX}_${arch}"
rm -rf "${prefix}"
mkdir "${prefix}"
if ./configure --prefix="${prefix}/local" \
CC="cc -arch ${arch}" CPP="cc -arch ${arch} -E" CXX="c++ -arch ${arch}" \
TINFO_LIBS=-lncurses \
OPENSSL_CFLAGS=" " OPENSSL_LIBS="-lssl -lcrypto -lz" &&
make clean &&
make install -j8 &&
rm -f "${prefix}/etc"
then
# mosh-client built with Xcode 3.1.2 bus-errors if the binary is stripped.
# strip "${prefix}/local/bin/mosh-client" "${prefix}/local/bin/mosh-server"
BUILT_ARCHS="$BUILT_ARCHS $arch"
fi
done
echo "Preprocessing package description..."
PACKAGE_VERSION=`grep PACKAGE_VERSION ../config.h | sed -e 's/^.*"\(.*\)"$/\1/'`
if [ -z "$BUILT_ARCHS" ]; then
echo "No architectures built successfully"
exit 1
fi
INDIR=mosh-package.pmdoc.in
OUTDIR=mosh-package.pmdoc
OUTFILE="Mosh $PACKAGE_VERSION.pkg"
echo "Building universal binaries for archs ${BUILT_ARCHS}..."
mkdir -p "$OUTDIR"
pushd "$INDIR" > /dev/null
rm -rf "$PREFIX"
# Copy one architecture to get all files into place.
for arch in $BUILT_ARCHS; do
cp -Rp "${PREFIX}_${arch}" "${PREFIX}"
break
done
for file in *
do
sed -e 's/$PACKAGE_VERSION/'"$PACKAGE_VERSION"'/g' "$file" > "../$OUTDIR/$file"
# Build fat binaries
# XXX will break with spaces in pathname
for prog in local/bin/mosh-client local/bin/mosh-server; do
archprogs=
for arch in $BUILT_ARCHS; do
archprogs="$archprogs ${PREFIX}_${arch}/$prog"
done
lipo -create $archprogs -output "${PREFIX}/$prog"
done
perl -wlpi -e 's{#!/usr/bin/env perl}{#!/usr/bin/perl}' "$PREFIX/local/bin/mosh"
popd > /dev/null
echo "Running PackageMaker..."
PATH=/Applications/PackageMaker.app/Contents/MacOS:$PATH PackageMaker -d mosh-package.pmdoc -o "$OUTFILE"
PACKAGE_VERSION=$(cat ../VERSION)
OUTFILE="$PACKAGE_VERSION.pkg"
rm -f "$OUTFILE"
if which -s pkgbuild; then
# To replace PackageMaker, you:
# * make a bare package with the build products
# * essentially take the Distribution file that PackageMaker generated and
# use it as the --distribution input file for productbuild
echo "Preprocessing package description..."
PKGID=edu.mit.mosh.mosh.pkg
for file in Distribution; do
sed -e "s/@PACKAGE_VERSION@/${PACKAGE_VERSION}/g" ${file}.in > ${file}
done
echo "Running pkgbuild/productbuild..."
mkdir -p Resources/en.lproj
cp -p copying.rtf Resources/en.lproj/License
cp -p readme.rtf Resources/en.lproj/Readme
pkgbuild --root "$PREFIX" --identifier $PKGID $PKGID
productbuild --distribution Distribution \
--resources Resources \
--package-path . \
"$OUTFILE"
echo "Cleaning up..."
rm -rf $PKGID
else
echo "Preprocessing package description..."
INDIR=mosh-package.pmdoc.in
OUTDIR=mosh-package.pmdoc
mkdir -p "$OUTDIR"
pushd "$INDIR" > /dev/null
for file in *
do
sed -e 's/$PACKAGE_VERSION/'"$PACKAGE_VERSION"'/g' "$file" > "../$OUTDIR/$file"
done
popd > /dev/null
echo "Running PackageMaker..."
env PATH="/Applications/PackageMaker.app/Contents/MacOS:/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS:$PATH" PackageMaker -d mosh-package.pmdoc -o "$OUTFILE" -i edu.mit.mosh.mosh.pkg
echo "Cleaning up..."
rm -rf "$OUTDIR"
fi
echo "Cleaning up..."
rm -r "$OUTDIR"
if [ -f "$OUTFILE" ];
then
echo "Successfully built $OUTFILE."
echo "Successfully built $OUTFILE with archs ${BUILT_ARCHS}."
else
echo "There was an error building $OUTFILE."
false
fi
Loading

0 comments on commit a099638

Please sign in to comment.