From d7bf8826fc1e8c3692504edbe60523dd1327b8a0 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Thu, 29 Nov 2018 11:39:57 +0100 Subject: [PATCH] rename contrib/build-osx as contrib/osx. Move QRReader submodule there. --- .gitmodules | 4 ++-- README.rst | 2 +- contrib/{build-osx => osx}/README.md | 4 ++-- contrib/{build-osx => osx}/base.sh | 0 .../{build-osx => osx}/cdrkit-deterministic.patch | 0 contrib/{build-osx => osx}/make_osx | 12 ++++++------ contrib/{build-osx => osx}/osx.spec | 6 +++--- contrib/{build-osx => osx}/package.sh | 0 electrum/qrscanner.py | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) rename contrib/{build-osx => osx}/README.md (93%) rename contrib/{build-osx => osx}/base.sh (100%) rename contrib/{build-osx => osx}/cdrkit-deterministic.patch (100%) rename contrib/{build-osx => osx}/make_osx (91%) rename contrib/{build-osx => osx}/osx.spec (92%) rename contrib/{build-osx => osx}/package.sh (100%) diff --git a/.gitmodules b/.gitmodules index 34cfeafbd..c6788ecf0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,6 @@ [submodule "contrib/deterministic-build/electrum-locale"] path = contrib/deterministic-build/electrum-locale url = https://github.com/spesmilo/electrum-locale -[submodule "contrib/CalinsQRReader"] - path = contrib/CalinsQRReader +[submodule "contrib/osx/CalinsQRReader"] + path = contrib/osx/CalinsQRReader url = https://github.com/spesmilo/CalinsQRReader diff --git a/README.rst b/README.rst index 3f67724b4..1bb140d86 100644 --- a/README.rst +++ b/README.rst @@ -101,7 +101,7 @@ This directory contains the python dependencies used by Electrum. Mac OS X / macOS -------- -See `contrib/build-osx/`. +See `contrib/osx/`. Windows ------- diff --git a/contrib/build-osx/README.md b/contrib/osx/README.md similarity index 93% rename from contrib/build-osx/README.md rename to contrib/osx/README.md index c1e96d90b..056d9fb84 100644 --- a/contrib/build-osx/README.md +++ b/contrib/osx/README.md @@ -14,7 +14,7 @@ Before starting, make sure that the Xcode command line tools are installed (e.g. cd electrum - ./contrib/build-osx/make_osx + ./contrib/osx/make_osx This creates a folder named Electrum.app. @@ -33,4 +33,4 @@ Copy the Electrum.app directory over and install the dependencies, e.g.: Then you can just invoke `package.sh` with the path to the app: cd electrum - ./contrib/build-osx/package.sh ~/Electrum.app/ \ No newline at end of file + ./contrib/osx/package.sh ~/Electrum.app/ \ No newline at end of file diff --git a/contrib/build-osx/base.sh b/contrib/osx/base.sh similarity index 100% rename from contrib/build-osx/base.sh rename to contrib/osx/base.sh diff --git a/contrib/build-osx/cdrkit-deterministic.patch b/contrib/osx/cdrkit-deterministic.patch similarity index 100% rename from contrib/build-osx/cdrkit-deterministic.patch rename to contrib/osx/cdrkit-deterministic.patch diff --git a/contrib/build-osx/make_osx b/contrib/osx/make_osx similarity index 91% rename from contrib/build-osx/make_osx rename to contrib/osx/make_osx index ff836fd62..b1cf4b724 100755 --- a/contrib/build-osx/make_osx +++ b/contrib/osx/make_osx @@ -72,8 +72,8 @@ cp ./contrib/deterministic-build/electrum-icons/icons_rc.py ./electrum/gui/qt info "Downloading libusb..." curl https://homebrew.bintray.com/bottles/libusb-1.0.22.el_capitan.bottle.tar.gz | \ tar xz --directory $BUILDDIR -cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/build-osx -DoCodeSignMaybe "libusb" "contrib/build-osx/libusb-1.0.dylib" "$APP_SIGN" # If APP_SIGN is empty will be a noop +cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/osx +DoCodeSignMaybe "libusb" "contrib/osx/libusb-1.0.dylib" "$APP_SIGN" # If APP_SIGN is empty will be a noop info "Building libsecp256k1" brew install autoconf automake libtool @@ -85,11 +85,11 @@ git clean -f -x -q ./configure --enable-module-recovery --enable-experimental --enable-module-ecdh --disable-jni make popd -cp $BUILDDIR/secp256k1/.libs/libsecp256k1.0.dylib contrib/build-osx -DoCodeSignMaybe "libsecp256k1" "contrib/build-osx/libsecp256k1.0.dylib" "$APP_SIGN" # If APP_SIGN is empty will be a noop +cp $BUILDDIR/secp256k1/.libs/libsecp256k1.0.dylib contrib/osx +DoCodeSignMaybe "libsecp256k1" "contrib/osx/libsecp256k1.0.dylib" "$APP_SIGN" # If APP_SIGN is empty will be a noop info "Building CalinsQRReader..." -d=contrib/CalinsQRReader +d=contrib/osx/CalinsQRReader pushd $d rm -fr build xcodebuild || fail "Could not build CalinsQRReader" @@ -117,7 +117,7 @@ for d in ~/Library/Python/ ~/.pyenv .; do done info "Building binary" -pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/build-osx/osx.spec || fail "Could not build binary" +pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary" info "Adding bitcoin URI types to Info.plist" plutil -insert 'CFBundleURLTypes' \ diff --git a/contrib/build-osx/osx.spec b/contrib/osx/osx.spec similarity index 92% rename from contrib/build-osx/osx.spec rename to contrib/osx/osx.spec index e48ba97cf..28ac336e4 100644 --- a/contrib/build-osx/osx.spec +++ b/contrib/osx/osx.spec @@ -42,11 +42,11 @@ datas += collect_data_files('keepkeylib') datas += collect_data_files('ckcc') # Add the QR Scanner helper app -datas += [(electrum + "contrib/CalinsQRReader/build/Release/CalinsQRReader.app", "./contrib/CalinsQRReader/build/Release/CalinsQRReader.app")] +datas += [(electrum + "contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app", "./contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app")] # Add libusb so Trezor and Safe-T mini will work -binaries = [(electrum + "contrib/build-osx/libusb-1.0.dylib", ".")] -binaries += [(electrum + "contrib/build-osx/libsecp256k1.0.dylib", ".")] +binaries = [(electrum + "contrib/osx/libusb-1.0.dylib", ".")] +binaries += [(electrum + "contrib/osx/libsecp256k1.0.dylib", ".")] # Workaround for "Retro Look": binaries += [b for b in collect_dynamic_libs('PyQt5') if 'macstyle' in b[0]] diff --git a/contrib/build-osx/package.sh b/contrib/osx/package.sh similarity index 100% rename from contrib/build-osx/package.sh rename to contrib/osx/package.sh diff --git a/electrum/qrscanner.py b/electrum/qrscanner.py index 5d15aad9a..ab1f1341e 100644 --- a/electrum/qrscanner.py +++ b/electrum/qrscanner.py @@ -73,9 +73,9 @@ def scan_barcode_osx(*args_ignored, **kwargs_ignored): import subprocess # NOTE: This code needs to be modified if the positions of this file changes with respect to the helper app! # This assumes the built macOS .app bundle which ends up putting the helper app in - # .app/contrib/CalinsQRReader/build/Release/CalinsQRReader.app. + # .app/contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app. root_ec_dir = os.path.abspath(os.path.dirname(__file__) + "/../") - prog = root_ec_dir + "/" + "contrib/CalinsQRReader/build/Release/CalinsQRReader.app/Contents/MacOS/CalinsQRReader" + prog = root_ec_dir + "/" + "contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app/Contents/MacOS/CalinsQRReader" if not os.path.exists(prog): raise RuntimeError("Cannot start QR scanner; helper app not found.") data = ''