Skip to content

Commit

Permalink
Namecoin: Rebrand AppImage build scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
JeremyRand committed Feb 7, 2019
1 parent 406bd75 commit 5232b34
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
install:
- sudo docker build --no-cache -t electrum-appimage-builder-img ./contrib/build-linux/appimage/
script:
- sudo docker run --name electrum-appimage-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/appimage electrum-appimage-builder-img ./build.sh
- sudo docker run --name electrum-appimage-builder-cont -v $PWD:/opt/electrum-nmc --rm --workdir /opt/electrum-nmc/contrib/build-linux/appimage electrum-appimage-builder-img ./build.sh
after_success: true
- stage: release check
install:
Expand Down
8 changes: 4 additions & 4 deletions contrib/build-linux/appimage/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AppImage binary for Electrum
AppImage binary for Electrum-NMC
============================

This assumes an Ubuntu host, but it should not be too hard to adapt to another
Expand All @@ -25,9 +25,9 @@ folder.
```
$ sudo docker run -it \
--name electrum-appimage-builder-cont \
-v $PWD:/opt/electrum \
-v $PWD:/opt/electrum-nmc \
--rm \
--workdir /opt/electrum/contrib/build-linux/appimage \
--workdir /opt/electrum-nmc/contrib/build-linux/appimage \
electrum-appimage-builder-img \
./build.sh
```
Expand All @@ -38,4 +38,4 @@ folder.
## FAQ

### How can I see what is included in the AppImage?
Execute the binary as follows: `./electrum*.AppImage --appimage-extract`
Execute the binary as follows: `./electrum-nmc*.AppImage --appimage-extract`
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/apprun.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/x86_64-linux-gnu${L
export PATH="${APPDIR}/usr/bin:${PATH}"
export LDFLAGS="-L${APPDIR}/usr/lib/x86_64-linux-gnu -L${APPDIR}/usr/lib"

exec "${APPDIR}/usr/bin/python3.6" -s "${APPDIR}/usr/bin/electrum" "$@"
exec "${APPDIR}/usr/bin/python3.6" -s "${APPDIR}/usr/bin/electrum-nmc" "$@"
10 changes: 5 additions & 5 deletions contrib/build-linux/appimage/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
CONTRIB="$PROJECT_ROOT/contrib"
DISTDIR="$PROJECT_ROOT/dist"
BUILDDIR="$CONTRIB/build-linux/appimage/build/appimage"
APPDIR="$BUILDDIR/electrum.AppDir"
APPDIR="$BUILDDIR/electrum-nmc.AppDir"
CACHEDIR="$CONTRIB/build-linux/appimage/.cache/appimage"

# pinned versions
Expand All @@ -16,7 +16,7 @@ LIBSECP_VERSION="452d8e4d2a2f9f1b5be6b02e18f1ba102e5ca0b4"


VERSION=`git describe --tags --dirty --always`
APPIMAGE="$DISTDIR/electrum-$VERSION-x86_64.AppImage"
APPIMAGE="$DISTDIR/electrum-nmc-$VERSION-x86_64.AppImage"

rm -rf "$BUILDDIR"
mkdir -p "$APPDIR" "$CACHEDIR" "$DISTDIR"
Expand Down Expand Up @@ -100,15 +100,15 @@ info "preparing electrum-locale."
exit 1
fi
for i in ./locale/*; do
dir="$PROJECT_ROOT/electrum/$i/LC_MESSAGES"
dir="$PROJECT_ROOT/electrum_nmc/$i/LC_MESSAGES"
mkdir -p $dir
msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
done
popd
)


info "installing electrum and its dependencies."
info "installing electrum-nmc and its dependencies."
mkdir -p "$CACHEDIR/pip_cache"
"$python" -m pip install --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
"$python" -m pip install --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
Expand All @@ -121,7 +121,7 @@ cp "/usr/lib/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"


info "desktop integration."
cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop"
cp "$PROJECT_ROOT/electrum-nmc.desktop" "$APPDIR/electrum-nmc.desktop"
cp "$PROJECT_ROOT/icons/electrum.png" "$APPDIR/electrum.png"


Expand Down

0 comments on commit 5232b34

Please sign in to comment.