AaronFiore/electrum
1
0
Fork 0
Code Activity
17,381 Commits 2 Branches 181 Tags
ef87fbd3e53b41a877821bd085bf238d2fd73e4b
Commit Graph

1043 Commits

Author SHA1 Message Date
SomberNight
e679e6074f mac build: add "set -e" 
for sanity...

re touching these files: not sure they are really needed
(but the ~/Library/Python/ and ~/.pyenv folders are no longer there
on the build machine)
 2021-07-16 16:38:31 +02:00
ThomasV
9278a26a7d make_osx: do not download python pkg unnecessarily 2021-07-16 15:55:33 +02:00
ThomasV
09f7d65b31 Merge pull request #7411 from SomberNight/20210715_macos_build 
mac build: download python from python.org instead of using pyenv
 2021-07-16 15:46:12 +02:00
ThomasV
4dd82cef74 set -e in compare_dmg 2021-07-16 15:41:15 +02:00
SomberNight
4fd6282f51 mac build: download python from python.org instead of using pyenv 2021-07-16 01:19:56 +02:00
SomberNight
8c1380ca8b mac build: trivial clean-up 2021-07-15 19:43:15 +02:00
ThomasV
ea24ab593f Merge pull request #7400 from SomberNight/202107_mac_build_pyc 
mac build: don't create __pycache__ folders
 2021-07-14 12:08:06 +02:00
ThomasV
ace113358a fix typo (follow-up prev) 2021-07-13 10:21:14 +02:00
ThomasV
0c17b49e2c compare_dmg: compare two files 2021-07-13 10:01:09 +02:00
SomberNight
659c00e06b mac build: don't create __pycache__ folders 
The .pyc files would get created when a .py module is imported,
which is done during the build for some source files by pyinstaller
(when it analyses imports).

I considered setting PYTHONDONTWRITEBYTECODE=1 in build_tools_util.sh,
to apply to all builds, but am not sure how it would affect the Android build,
where we actually want .pyc files included in the apk.
 2021-07-12 18:07:31 +02:00
ThomasV
b7cc5f329c osx: add script to compare dmg binaries 2021-07-12 15:58:36 +02:00
SomberNight
5b627208f1 mac build: build libusb from source 
fixes https://github.com/spesmilo/electrum/issues/7393
 2021-07-06 19:38:49 +02:00
ThomasV
0b30cf80de macOS builds: remove zip file after notarization 2021-07-03 14:42:53 +02:00
SomberNight
013cf869f1 qt: qrreader: keep both old and new toolchain; try to abstract it away 2021-06-25 16:52:02 +02:00
SomberNight
c1dbcab9bb qt: new qrreader using QtMultimedia; drop CalinsQRReader(mac) 
This commit ports the work of EchterAgo and cculianu from Electron-Cash,
to implement a new toolchain to scan qr codes.

Previously, on Linux and Win, we have been using zbar to access the camera
and read qrcodes; and on macOS we used CalinsQRReader (an objective-C
project by cculianu).

The new toolchain added here can use QtMultimedia to access the camera,
and then feed that image into zbar. When used this way, zbar needs
fewer dependencies and is easier to compile, in particular it can be
compiled for macOS.

The new toolchain works on all three platforms, with some caveats
(see code comments in related commits) -- so we also keep the end-to-end
zbar toolchain; but at least we can drop CalinsQRReader.

The related changes in Electron-Cash are spread over 50+ commits (several PRs and direct
pushes to master), but see in particular:
https://github.com/Electron-Cash/Electron-Cash/pull/1376

some other interesting links:
b2b737001c
163224cf1f
3b31e0fcb1
eda015908e
https://github.com/Electron-Cash/Electron-Cash/pull/1545
052aa06c23
 2021-06-25 16:51:58 +02:00
SomberNight
f1e77b6e43 build: update zbar to fix build issue with autoconf 2.70 
see https://github.com/Electron-Cash/Electron-Cash/pull/2143
see https://github.com/mchehab/zbar/issues/132
 2021-06-25 16:44:35 +02:00
ThomasV
4380f68564 contrib/osx/package.sh: fix paths, add link to issue regarding GCC 10.1 2021-06-24 11:45:29 +02:00
ThomasV
a99e0d9e17 build tools: set ZERO_AR_DATE to have deterministic timestamps on macOS 2021-06-23 15:46:45 +02:00
ghost43
b828627dc6 Merge pull request #6917 from andrewkozlik/slip39 
SLIP-0039 wallet recovery
 2021-06-22 19:44:02 +02:00
SomberNight
e54e6e4e09 build: extend release.sh so that all builders can use it 2021-06-21 19:29:56 +02:00
SomberNight
0e2d147afd windows build: fix build.sh "cp" cmd 
was exiting with non-zero error code due to trying to copy directory

```
9cf9cdda331b565dd95b105d3fe987beefa113ac2c594d83783998017ad52d70  dist/electrum-4.1.4-16-g648fac709-portable.exe
020ceacb3a6fc5986d3ec271985c22c8646d2bb534536b8e2ab774924b21d58f  dist/electrum-4.1.4-16-g648fac709-setup.exe
e65dbbe24fe01e8635d4def088667e65d4e9763e2ab74cbc1aec616b3f2834bc  dist/electrum-4.1.4-16-g648fac709.exe
💬 INFO:  Done.
cp: -r not specified; omitting directory '/home/user/wspace/electrum/contrib/build-wine/../../contrib/build-wine/fresh_clone/electrum/contrib/build-wine/dist/electrum'
```
 2021-06-21 19:29:52 +02:00
SomberNight
9d46fe775a build: try to consolidate instructions and decr codedupe in release.sh 2021-06-18 17:10:15 +02:00
SomberNight
91c913dc0b build/release.sh: add some comments 2021-06-18 16:29:13 +02:00
SomberNight
47ebc49c4c (trivial) build/release.sh: convert indents to spaces 
was mixed tabs/spaces
 2021-06-18 16:29:08 +02:00
SomberNight
3df1c3bbf7 build: rename some scripts 
also, merge sdist/build.sh and sdist/make_tgz into sdist/make_sdist.sh
 2021-06-18 16:29:03 +02:00
SomberNight
0842f4977b build: fresh_clone: turns out we can just clone from a local dir :P 
this saves us some network requests, and reduces trust in github
 2021-06-18 16:28:58 +02:00
SomberNight
5ae167d67d android build: place binaries in ./dist/ instead of ./bin/ 
Let's try to consolidate and have all build scripts put binaries into ./dist/
 2021-06-18 16:28:52 +02:00
ThomasV
9625798a63 release script: follow-up prev commit 2021-06-17 15:02:07 +02:00
ThomasV
66628c0bad contrib/upload: use abbrev=0 2021-06-17 12:18:47 +02:00
ThomasV
9c1a8d7f65 release.sh: fix path for android builds 2021-06-17 12:15:09 +02:00
SomberNight
d3276ee950 build-wine/unsign.sh: allow using before files are uploaded publicly 2021-06-17 12:12:11 +02:00
SomberNight
52fc2f5adb release.sh: make sure correct commit is checked out 2021-06-17 12:05:40 +02:00
SomberNight
81a71ec09b update locale; again :P 
c2c845a82d accidentally undid the previous update
 2021-06-16 20:28:00 +02:00
ThomasV
c2c845a82d follow-up 8ff49fa9bb 2021-06-16 17:14:06 +02:00
SomberNight
60debf9116 update locale 2021-06-16 16:59:44 +02:00
ThomasV
8ff49fa9bb Remove signature verification from make_download. Signatures are verified by the website, before deployment. 2021-06-16 16:54:02 +02:00
SomberNight
dab25e3b24 android build: add exec permission to apkdiff.py, and print hashes 2021-06-10 16:41:37 +02:00
ThomasV
4dc7f4d331 release script: call build_docker_image.sh 2021-06-10 14:40:46 +00:00
ThomasV
8788b64504 Update release script with APK fresh clone instruction. Add android/fresh_clone to gitignore 2021-06-10 14:30:17 +00:00
ghost43
c43896fe6a Merge pull request #7263 from SomberNight/202104_android 
reproducible build for Android apk
 2021-06-10 13:19:41 +00:00
SomberNight
45cb8b5b02 android reproducibility: add Signal's "apkdiff.py" tool, and instructions 2021-06-09 18:34:15 +02:00
SomberNight
3c9346cce2 android build: attempt at reproducible builds 2021-06-09 18:34:09 +02:00
Thorsten Hempel
b990ff78a5 appimage: update libc6-dev package (#7299) 2021-06-04 08:36:23 +00:00
SomberNight
c3ccfd7d19 android build: pin hashes of p4a recipes 2021-05-01 08:07:19 +02:00
SomberNight
5dcafaf082 mac build: link to issue in README 2021-05-01 06:40:28 +02:00
Andrew Kozlik
be7a332624 Add SLIP-0039 wordlist. 2021-04-30 19:43:53 +02:00
SomberNight
ef3293ab6a kivy: relocate atlas so it can be made a submodule later 2021-04-30 16:44:32 +02:00
ThomasV
7789497140 release script: add username to signature file, upload files into airlock. 2021-04-30 10:27:33 +00:00
ThomasV
2b05615995 Do not perform webserver update from release script. 
(see publish.sh and deploy.sh in the electrum-web repo)
 2021-04-28 12:37:15 +00:00
SomberNight
1dfa81e7b6 contrib: fix find_restricted_dependencies for deps with version range 
New release of pyinstaller (4.3) broke the script (which is used by freeze_packages.sh).

-----

Compare:

$ wget https://pypi.org/pypi/pyinstaller/4.3/json
$ cat json | jq ".info.requires_dist"
[
  "setuptools",
  "altgraph",
  "pyinstaller-hooks-contrib (>=2020.6)",
  "importlib-metadata ; python_version < \"3.8\"",
  "macholib (>=1.8) ; sys_platform == \"darwin\"",
  "pefile (>=2017.8.1) ; sys_platform == \"win32\"",
  "pywin32-ctypes (>=0.2.0) ; sys_platform == \"win32\"",
  "tinyaes (>=1.0.0) ; extra == 'encryption'",
  "pytest (>=2.7.3) ; extra == 'hook_testing'",
  "execnet (>=1.5.0) ; extra == 'hook_testing'",
  "psutil ; extra == 'hook_testing'"
]

$ wget https://pypi.org/pypi/pyinstaller/4.2/json | jq .
$ cat json | jq ".info.requires_dist"
null

$ wget https://pypi.org/pypi/qrcode/6.1/json
$ cat json | jq ".info.requires_dist"
[
  "six",
  "colorama ; platform_system == \"Windows\"",
  "tox ; extra == 'dev'",
  "pytest ; extra == 'dev'",
  "mock ; (python_version < \"3\") and extra == 'dev'",
  "zest.releaser[recommended] ; extra == 'maintainer'",
  "pillow ; extra == 'pil'",
  "pytest ; extra == 'test'",
  "pytest-cov ; extra == 'test'",
  "mock ; (python_version < \"3\") and extra == 'test'"
]
 2021-04-26 20:45:40 +02:00