Skip to content

Commit a66d649

Browse files
committed
adds darkcoin_hash to build, removes ltc_scrypt.so repo
1 parent 6a6e92c commit a66d649

File tree

7 files changed

+32
-4
lines changed

7 files changed

+32
-4
lines changed

Diff for: RELEASE-NOTES

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# Release 0.4.0
2+
3+
* Implement Darkcoin Chainkey module
4+
5+
* Add chain-specfic uri handling, dust, fees, coinbase maturity constants
6+
7+
* add additional default servers
8+
9+
* Update Encompass logo icons
10+
11+
* correct setup.py to correctly compile & include ltc_scrypt
12+
113
# Release 0.3.0
214

315
* Implement VIAcoin ChainKey module

Diff for: contrib/encompass-release/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ RUN xvfb-run -a --server-num=4 wineboot && sleep 5 \
6565

6666

6767
COPY ./helpers/ltc_scrypt.pyd /root/ltc_scrypt.pyd
68+
COPY ./helpers/darkcoin_hash.pyd /root/darkcoin_hash.pyd
6869
COPY ./helpers/make_packages /root/make_packages
6970
COPY ./helpers/make_release /root/make_release
7071
COPY ./helpers/build-binary /usr/bin/build-binary

Diff for: contrib/encompass-release/build

+13-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function buildBinary(){
99
echo "Seems like the build failed. Exiting."
1010
exit
1111
fi
12-
cp $TARGETFOLDER/dist/encompass.exe $(pwd)/releases/Enconpass-$VERSION.exe
12+
cp $TARGETFOLDER/dist/encompass.exe $(pwd)/releases/Encompass-$VERSION.exe
1313
cp $(pwd)/source/encompass-setup.exe $(pwd)/releases/Encompass-$VERSION-setup.exe
1414
cp $(pwd)/repo/dist/* $(pwd)/releases/
1515
if [ "${TYPE}" = "SIGNED" ] ; then
@@ -42,6 +42,17 @@ function buildLtcScrypt() {
4242
ogrisel/python-winbuilder wineconsole --backend=curses Z:\\helpers\\ltc_scrypt-build.bat
4343
cp ltc_scrypt-1.0/build/lib.win32-2.7/ltc_scrypt.pyd helpers/ltc_scrypt.pyd
4444
}
45+
function buildDarkcoinHash() {
46+
## this will be integrated into the main build in a later release
47+
wget https://github.com/guruvan/darkcoin_hash/archive/1.1.tar.gz
48+
tar -xpzvf 1.1.tar.gz
49+
docker run -t -i \
50+
-e WINEPREFIX="/wine/wine-py2.7.8-32" \
51+
-v $(pwd)/darkcoin_hash-1.1:/code \
52+
-v $(pwd)/helpers:/helpers \
53+
ogrisel/python-winbuilder wineconsole --backend=curses Z:\\helpers\\darkcoin_hash-build.bat
54+
cp darkcoin_hash-1.1/build/lib.win32-2.7/darkcoin_hash.pyd helpers/darkcoin_hash.pyd
55+
}
4556

4657
function prepareFile(){
4758
echo "Preparing file for Encompass version $VERSION"
@@ -90,6 +101,7 @@ else
90101
fi
91102

92103
buildLtcScrypt
104+
buildDarkcoinHash
93105
# Build docker image
94106
buildImage
95107

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cd Z:\code
2+
python setup.py build

Diff for: contrib/encompass-release/helpers/make_release

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ cp -v /root/repo/dist/Encompass-$VERSION.zip /opt/wine-electrum/drive_c/encompas
1919
cd /opt/wine-electrum/drive_c/encompass
2020
unzip Encompass-$VERSION.zip
2121
cp -a /root/ltc_scrypt.pyd /opt/wine-electrum/drive_c/encompass/Encompass-$VERSION/lib/chains
22+
cp -a /root/darkcoin_hash.pyd /opt/wine-electrum/drive_c/encompass/Encompass-$VERSION/lib/chains
2223

2324
/usr/bin/build-binary $VERSION

Diff for: lib/chains/ltc_scrypt.so

-67.2 KB
Binary file not shown.

Diff for: setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
for lang in os.listdir('data/wordlist'):
5757
data_files.append((os.path.join(appdata_dir, 'wordlist'), ['data/wordlist/%s' % lang]))
5858

59-
data_files += ('lib/chains', ['lib/chains/ltc_scrypt.so'])
6059

6160
setup(
6261
name="Encompass",
@@ -71,7 +70,8 @@
7170
'qrcode',
7271
'SocksiPy-branch',
7372
'tlslite',
74-
'ltc_scrypt'
73+
'ltc_scrypt',
74+
'darkcoin_hash'
7575
],
7676
package_dir={
7777
'chainkey': 'lib',
@@ -151,6 +151,6 @@
151151
author="Tyler Willis",
152152
author_email="[email protected]",
153153
license="GNU GPLv3",
154-
url="NoneYet",
154+
url="https://maza.club/encompass",
155155
long_description="""Lightweight Multi-Coin Wallet for Electrum-supported coins."""
156156
)

0 commit comments

Comments
 (0)