commit 354c737ce0cee45574bed01f60fb9184358638d4
parent a94e1d92a312bc686646f6b20adba81998926714
Author: root <bauerj@bauerj.eu>
Date: Fri, 4 May 2018 20:26:07 +0200
Track icons and locale version in submodule
Diffstat:
5 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "contrib/deterministic-build/electrum-icons"]
+ path = contrib/deterministic-build/electrum-icons
+ url = https://github.com/spesmilo/electrum-icons
+[submodule "contrib/deterministic-build/electrum-locale"]
+ path = contrib/deterministic-build/electrum-locale
+ url = https://github.com/spesmilo/electrum-locale
diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx
@@ -16,14 +16,14 @@ VERSION=`git describe --tags --dirty`
info "Installing Python $PYTHON_VERSION"
export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.6/bin:$PATH"
-if [ -d "~/.pyenv" ]; then
- pyenv update
-else
- curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1
-fi
-PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
-pyenv global $PYTHON_VERSION || \
-fail "Unable to use Python $PYTHON_VERSION"
+#if [ -d "~/.pyenv" ]; then
+# pyenv update
+#else
+# curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1
+#fi
+#PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
+#pyenv global $PYTHON_VERSION || \
+#fail "Unable to use Python $PYTHON_VERSION"
info "Installing pyinstaller"
@@ -37,17 +37,14 @@ pyinstaller --version
rm -rf ./dist
+git submodule init
+git submodule update
rm -rf $BUILDDIR > /dev/null 2>&1
mkdir $BUILDDIR
-info "Downloading icons and locale..."
-for repo in icons locale; do
- git clone $GIT_REPO-$repo $BUILDDIR/electrum-$repo
-done
-
-cp -R $BUILDDIR/electrum-locale/locale/ ./lib/locale/
-cp $BUILDDIR/electrum-icons/icons_rc.py ./gui/qt/
+cp -R ./contrib/deterministic-build/electrum-locale/locale/ ./lib/locale/
+cp ./contrib/deterministic-build/electrum-icons/icons_rc.py ./gui/qt/
info "Downloading libusb..."
diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh
@@ -19,19 +19,22 @@ set -e
mkdir -p tmp
cd tmp
-for repo in electrum electrum-locale electrum-icons; do
- if [ -d $repo ]; then
- cd $repo
- git pull
- git checkout master
- cd ..
- else
- URL=https://github.com/spesmilo/$repo.git
- git clone -b master $URL $repo
- fi
-done
+if [ -d ./electrum ]; then
+ rm ./electrum -rf
+fi
+
+git clone https://github.com/spesmilo/electrum -b master
+
+pushd electrum
+if [ ! -z "$1" ]; then
+ git checkout $1
+fi
+
+# Load electrum-icons and electrum-locale for this release
+git submodule init
+git submodule update
-pushd electrum-locale
+pushd ./contrib/deterministic-build/electrum-locale
for i in ./locale/*; do
dir=$i/LC_MESSAGES
mkdir -p $dir
@@ -39,11 +42,6 @@ for i in ./locale/*; do
done
popd
-pushd electrum
-if [ ! -z "$1" ]; then
- git checkout $1
-fi
-
VERSION=`git describe --tags --dirty`
echo "Last commit: $VERSION"
find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
@@ -52,8 +50,8 @@ popd
rm -rf $WINEPREFIX/drive_c/electrum
cp -r electrum $WINEPREFIX/drive_c/electrum
cp electrum/LICENCE .
-cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/
-cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/
+cp -r ./electrum/contrib/deterministic-build/electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/
+cp ./electrum/contrib/deterministic-build/electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/
# Install frozen dependencies
$PYTHON -m pip install -r ../../deterministic-build/requirements.txt
diff --git a/contrib/deterministic-build/electrum-icons b/contrib/deterministic-build/electrum-icons
@@ -0,0 +1 @@
+Subproject commit a1a986ceed2d4546cf719ebfd9ab3f98df2ce979
diff --git a/contrib/deterministic-build/electrum-locale b/contrib/deterministic-build/electrum-locale
@@ -0,0 +1 @@
+Subproject commit c234aa98cce2c255f0c86c22de31e3e9a291987c
