Merge pull request #2817 from ethereum/do_not_copy_so

Do not include soltest and .so files in zip archives.
This commit is contained in:
chriseth 2017-08-25 15:40:40 +02:00 committed by GitHub
commit 0659043575

View File

@ -35,47 +35,12 @@ ZIP_TEMP_DIR=$(pwd)/build/zip/
# There is an implicit assumption here that we HAVE to run from root directory. # There is an implicit assumption here that we HAVE to run from root directory.
REPO_ROOT=$(pwd) REPO_ROOT=$(pwd)
if [[ "$OSTYPE" == "darwin"* ]]; then
DLL_EXT=dylib
else
DLL_EXT=so
fi
mkdir -p $ZIP_TEMP_DIR mkdir -p $ZIP_TEMP_DIR
# Copy all the solidity executables into a temporary directory prior to ZIP creation # Copy all the solidity executables into a temporary directory prior to ZIP creation
cp $REPO_ROOT/build/lllc/lllc $ZIP_TEMP_DIR cp $REPO_ROOT/build/lllc/lllc $ZIP_TEMP_DIR
cp $REPO_ROOT/build/solc/solc $ZIP_TEMP_DIR cp $REPO_ROOT/build/solc/solc $ZIP_TEMP_DIR
cp $REPO_ROOT/build/soltest/soltest $ZIP_TEMP_DIR
# Copy all the dynamic libraries into a temporary directory prior to ZIP creation.
# There are a lot of these, and it would be great if we didn't have to worry about them.
# There is work-in-progress to support static-linkage on the UNIX platforms, which
# is most promising on Alpine Linux using musl. macOS doesn't support statically
# linked binaries (ie. executables which make direct system calls to the kernel.
#
# See https://developer.apple.com/library/mac/qa/qa1118/_index.html.
# See https://github.com/ethereum/webthree-umbrella/issues/495.
cp $REPO_ROOT/build/libdevcore/*.$DLL_EXT $ZIP_TEMP_DIR
cp $REPO_ROOT/build/libevmasm/*.$DLL_EXT $ZIP_TEMP_DIR
cp $REPO_ROOT/build/libsolidity/*.$DLL_EXT $ZIP_TEMP_DIR
# For macOS, we also copy the dynamic libraries for our external dependencies.
# When building from source on your own machine, these libraries will be installed
# globally, using Homebrew, but we don't want to rely on that for these ZIPs, so
# we copy these into the ZIP temporary directory too.
#
# TODO - So what happens for Linux and other UNIX distros in this case?
# There will be runtime dependencies on equivalent SO files being present, likely in
# a completely analogous way. Does that mean that ZIPs are actually useless on such
# distros, because there will be symbol links to global install locations (distro-specific)
# and those files will just be missing on the target machines?
if [[ "$OSTYPE" == "darwin"* ]]; then
cp /usr/local/opt/jsoncpp/lib/libjsoncpp.1.dylib $ZIP_TEMP_DIR
fi
# For macOS, we run a fix-up script which alters all of the symbolic links within # For macOS, we run a fix-up script which alters all of the symbolic links within
# the executables and dynamic libraries such that the ZIP becomes self-contained, by # the executables and dynamic libraries such that the ZIP becomes self-contained, by