mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
4ee2114127
This commit is the culmination of several months of work to decouple Solidity from the webthree-umbrella so that it can be developed in parallel with cpp-ethereum (the Ethereum C++ runtime) and so that even for the Solidity unit-tests there is no hard-dependency onto the C++ runtime. The Tests-over-IPC refactoring was a major step in the same process which was already committed. This commit contains the following changes: - A subset of the CMake functionality in webthree-helpers was extracted and tailored for Solidity into ./cmake. Further cleanup is certainly possible. - A subset of the libdevcore functionality in libweb3core was extracted and tailored for Solidity into ./libdevcore. Further cleanup is certainly possible - The gas price constants in EVMSchedule were orphaned into libevmasm. - Some other refactorings and cleanups were made to sever unnecessary EVM dependencies in the Solidity unit-tests. - TravisCI and Appveyor support was added, covering builds and running of the unit-tests (Linux and macOS only for now) - A bug-fix was made to get the Tests-over-IPC running on macOS. - There are still reliability issues in the unit-tests, which need immediate attention. The Travis build has been flipped to run the unit-tests 5 times, to try to flush these out. - The Emscripten automation which was previously in webthree-umbrella was merged into the TravisCI automation here. - The development ZIP deployment step has been commented out, but we will want to read that ONLY for release branch. Further iteration on these changes will definitely be needed, but I feel these have got to sufficient maturity than holding them back further isn't winning us anything. It is go time :-)
66 lines
2.8 KiB
Python
Executable File
66 lines
2.8 KiB
Python
Executable File
# ------------------------------------------------------------------------------
|
|
# This Python script is used within the OS X release process, to ensure
|
|
# that the standalone OS X ZIP files which we make are actually
|
|
# standalone, and not implicitly dependent on Homebrew installs for
|
|
# external libraries which we use.
|
|
#
|
|
# This implicit dependencies seem to show up only where we have
|
|
# external dependencies which are dependent on each other, and the
|
|
# path from one to another is an absolute path to "/usr/local/opt",
|
|
# the Homebrew install location. External dependencies which only
|
|
# depend on system libraries are fine. Our main applications seem
|
|
# to be fine.
|
|
#
|
|
# An example of a dependency which requires this fix-up at the time
|
|
# of writing is the following dependency edge:
|
|
#
|
|
# libjsonrpccpp-client.0.dylib
|
|
# -> /usr/local/opt/jsoncpp/lib/libjsoncpp.0.dylib
|
|
#
|
|
# See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac
|
|
# for a little overview of "install_name_tool" and "otool".
|
|
#
|
|
# ------------------------------------------------------------------------------
|
|
# This file is part of solidity.
|
|
#
|
|
# solidity is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# solidity is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with solidity. If not, see <http://www.gnu.org/licenses/>
|
|
#
|
|
# (c) 2016 solidity contributors.
|
|
# -----------------------------------------------------------------------------
|
|
|
|
import os
|
|
import subprocess
|
|
import sys
|
|
|
|
|
|
def readDependencies(fname):
|
|
with open(fname) as f:
|
|
o = subprocess.Popen(['otool', '-L', fname], stdout=subprocess.PIPE)
|
|
for line in o.stdout:
|
|
if line[0] == '\t':
|
|
library = line.split(' ', 1)[0][1:]
|
|
if library.startswith("/usr/local/lib") or library.startswith("/usr/local/opt") or library.startswith("/Users/"):
|
|
if (os.path.basename(library) != os.path.basename(fname)):
|
|
command = "install_name_tool -change " + \
|
|
library + " @executable_path/./" + \
|
|
os.path.basename(library) + " " + fname
|
|
print command
|
|
os.system("chmod +w " + fname)
|
|
os.system(command)
|
|
|
|
root = sys.argv[1]
|
|
for (dirpath, dirnames, filenames) in os.walk(root):
|
|
for filename in filenames:
|
|
readDependencies(os.path.join(root, filename))
|