From 1f9fab84a648068080ee79e1263351b4f9632324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 24 Feb 2022 17:54:17 +0100 Subject: [PATCH] Remove release.sh/.bat scripts we no longer use --- .../fix_homebrew_paths_in_standalone_zip.py | 66 ------------------- scripts/release.bat | 38 ----------- scripts/release.sh | 56 ---------------- 3 files changed, 160 deletions(-) delete mode 100755 scripts/fix_homebrew_paths_in_standalone_zip.py delete mode 100644 scripts/release.bat delete mode 100755 scripts/release.sh diff --git a/scripts/fix_homebrew_paths_in_standalone_zip.py b/scripts/fix_homebrew_paths_in_standalone_zip.py deleted file mode 100755 index 43f26795c..000000000 --- a/scripts/fix_homebrew_paths_in_standalone_zip.py +++ /dev/null @@ -1,66 +0,0 @@ -# ------------------------------------------------------------------------------ -# 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 -# -# (c) 2016 solidity contributors. -# ----------------------------------------------------------------------------- - -import os -import subprocess -import sys - -def readDependencies(fname): - with subprocess.Popen(['otool', '-L', fname], stdout=subprocess.PIPE) as o: - 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)) diff --git a/scripts/release.bat b/scripts/release.bat deleted file mode 100644 index a1a909ae0..000000000 --- a/scripts/release.bat +++ /dev/null @@ -1,38 +0,0 @@ -@ECHO OFF - -REM --------------------------------------------------------------------------- -REM Batch file for implementing release flow for solidity for Windows. -REM -REM The documentation for solidity is hosted at: -REM -REM https://docs.soliditylang.org -REM -REM --------------------------------------------------------------------------- -REM This file is part of solidity. -REM -REM solidity is free software: you can redistribute it and/or modify -REM it under the terms of the GNU General Public License as published by -REM the Free Software Foundation, either version 3 of the License, or -REM (at your option) any later version. -REM -REM solidity is distributed in the hope that it will be useful, -REM but WITHOUT ANY WARRANTY; without even the implied warranty of -REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -REM GNU General Public License for more details. -REM -REM You should have received a copy of the GNU General Public License -REM along with solidity. If not, see -REM -REM Copyright (c) 2016 solidity contributors. -REM --------------------------------------------------------------------------- - -set CONFIGURATION=%1 -set VERSION=%2 - -set "DLLS=MSVC_DLLS_NOT_FOUND" -FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*" - "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\*") DO set "DLLS=%%d\x86\Microsoft.VC141.CRT\msvc*.dll" - -7z a solidity-windows.zip ^ - .\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^ - "%DLLS%" diff --git a/scripts/release.sh b/scripts/release.sh deleted file mode 100755 index 88aaa5fef..000000000 --- a/scripts/release.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -#------------------------------------------------------------------------------ -# Bash script implementing release flow for solidity for Linux and macOS. -# -# TODO - At the time of writing, we only have ZIPs working. Need to hook up -# support for Homebrew and PPAs. -# -# The documentation for solidity is hosted at: -# -# https://docs.soliditylang.org -# -# ------------------------------------------------------------------------------ -# 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 -# -# (c) 2016 solidity contributors. -#------------------------------------------------------------------------------ - -ZIP_SUFFIX="$1" -ZIP_TEMP_DIR="$(pwd)/build/zip/" - -# There is an implicit assumption here that we HAVE to run from root directory. -REPO_ROOT=$(pwd) - -mkdir -p "$ZIP_TEMP_DIR" - -# Copy all the solidity executables into a temporary directory prior to ZIP creation - -cp "$REPO_ROOT/build/solc/solc" "$ZIP_TEMP_DIR" - -# 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 -# revectoring all the dylib references to be relative to the directory containing the -# application, so that the ZIPs are self-contained, with the only external references -# being for kernel-level dylibs. - -if [[ "$OSTYPE" == "darwin"* ]]; then - python3 "$REPO_ROOT/scripts/fix_homebrew_paths_in_standalone_zip.py" "$ZIP_TEMP_DIR" -fi - -# And ZIP it all up, with a filename suffix passed in on the command-line. -mkdir -p "$REPO_ROOT/upload" -zip -j "$REPO_ROOT/upload/solidity-$ZIP_SUFFIX.zip" "$ZIP_TEMP_DIR/"*