simplify build, almost remove python
This commit is contained in:
parent
cb88b306ab
commit
597be05199
4 changed files with 26 additions and 51 deletions
|
@ -23,9 +23,10 @@ To install from source or make changes to the application, continue reading belo
|
||||||
### One-time Setup
|
### One-time Setup
|
||||||
|
|
||||||
1. Clone this repo
|
1. Clone this repo
|
||||||
2. `INSTALL_DEPENDENCIES=true ./build.sh`
|
2. `DEPS=true ./build.sh`
|
||||||
|
|
||||||
This will download and install the LBRY app and its dependencies, including [the LBRY daemon](https://github.com/lbryio/lbry) and command line utilities like `node` and `yarn`. The LBRY app requires Node >= 6; if you have an earlier version of Node installed and want to keep it, you can use [nvm](https://github.com/creationix/nvm) to switch back and forth.
|
This will download and install the LBRY app and its dependencies, including [the LBRY daemon](https://github.com/lbryio/lbry) and command line utilities like `node` and `yarn`. \
|
||||||
|
The LBRY app requires Node >= 6; if you have an earlier version of Node installed and want to keep it, you can use [nvm](https://github.com/creationix/nvm) to switch back and forth.
|
||||||
|
|
||||||
### Running
|
### Running
|
||||||
|
|
||||||
|
|
|
@ -30,30 +30,13 @@ if [ -n "${TEAMCITY_VERSION:-}" -o -n "${APPVEYOR:-}" ]; then
|
||||||
FULL_BUILD="true"
|
FULL_BUILD="true"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$FULL_BUILD" == "true" ]; then
|
DEPS="${DEPS:-$FULL_BUILD}"
|
||||||
INSTALL_DEPENDENCIES="true"
|
if [ "$DEPS" != "true" ]; then
|
||||||
else
|
|
||||||
INSTALL_DEPENDENCIES="${INSTALL_DEPENDENCIES:-false}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$INSTALL_DEPENDENCIES" != "true" ]; then
|
|
||||||
echo -e "\033[1;36mDependencies will NOT be installed. Run with \"INSTALL_DEPENDENCIES=true\" to install dependencies, or \"FULL_BUILD=true\" to install dependencies and build a complete app.\x1b[m"
|
echo -e "\033[1;36mDependencies will NOT be installed. Run with \"INSTALL_DEPENDENCIES=true\" to install dependencies, or \"FULL_BUILD=true\" to install dependencies and build a complete app.\x1b[m"
|
||||||
else
|
else
|
||||||
# install dependencies
|
# install dependencies
|
||||||
echo -e "\033[0;32mInstalling Dependencies\x1b[m"
|
echo -e "\033[0;32mInstalling Dependencies\x1b[m"
|
||||||
"$BUILD_DIR/prebuild.sh"
|
"$BUILD_DIR/install_deps.sh"
|
||||||
|
|
||||||
VENV="$BUILD_DIR/venv"
|
|
||||||
if [ -d "$VENV" ]; then
|
|
||||||
rm -rf "$VENV"
|
|
||||||
fi
|
|
||||||
virtualenv "$VENV"
|
|
||||||
set +u
|
|
||||||
source "$VENV/bin/activate"
|
|
||||||
set -u
|
|
||||||
# "python pip install" required to support path names with spaces (may be fixed in pip 10)
|
|
||||||
python "`which pip`" install -r "$BUILD_DIR/requirements.txt"
|
|
||||||
python "$BUILD_DIR/set_version.py"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
|
[ -d "$ROOT/dist" ] && rm -rf "$ROOT/dist"
|
||||||
|
@ -140,9 +123,13 @@ if [ "$FULL_BUILD" == "true" ]; then
|
||||||
# electron-build has a publish feature, but I had a hard time getting
|
# electron-build has a publish feature, but I had a hard time getting
|
||||||
# it to reliably work and it also seemed difficult to configure. Not proud of
|
# it to reliably work and it also seemed difficult to configure. Not proud of
|
||||||
# this, but it seemed better to write my own.
|
# this, but it seemed better to write my own.
|
||||||
python "$BUILD_DIR/upload_assets.py"
|
VENV="$BUILD_DIR/venv"
|
||||||
|
if [ -d "$VENV" ]; then
|
||||||
deactivate
|
rm -rf "$VENV"
|
||||||
|
fi
|
||||||
|
virtualenv "$VENV"
|
||||||
|
"$VENV/bin/pip" install -r "$BUILD_DIR/requirements.txt"
|
||||||
|
"$VENV/bin/python" "$BUILD_DIR/upload_assets.py"
|
||||||
|
|
||||||
echo -e '\033[0;32mBuild and packaging complete.\x1b[m'
|
echo -e '\033[0;32mBuild and packaging complete.\x1b[m'
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
set -x
|
|
||||||
|
|
||||||
|
|
||||||
LINUX=false
|
LINUX=false
|
||||||
OSX=false
|
OSX=false
|
||||||
|
@ -52,6 +50,9 @@ if ! cmd_exists python; then
|
||||||
$INSTALL python2.7
|
$INSTALL python2.7
|
||||||
elif $OSX; then
|
elif $OSX; then
|
||||||
brew install python
|
brew install python
|
||||||
|
else
|
||||||
|
echo "python2.7 required"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -66,6 +67,9 @@ if ! cmd_exists pip; then
|
||||||
$INSTALL python-pip
|
$INSTALL python-pip
|
||||||
elif $OSX; then
|
elif $OSX; then
|
||||||
$SUDO easy_install pip
|
$SUDO easy_install pip
|
||||||
|
else
|
||||||
|
echo "pip required"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
$SUDO pip install --upgrade pip
|
$SUDO pip install --upgrade pip
|
||||||
fi
|
fi
|
||||||
|
@ -84,6 +88,9 @@ if ! cmd_exists node; then
|
||||||
$INSTALL nodejs
|
$INSTALL nodejs
|
||||||
elif $OSX; then
|
elif $OSX; then
|
||||||
brew install node
|
brew install node
|
||||||
|
else
|
||||||
|
echo "node required"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -95,16 +102,17 @@ if ! cmd_exists yarn; then
|
||||||
$SUDO apt-get install yarn
|
$SUDO apt-get install yarn
|
||||||
elif $OSX; then
|
elif $OSX; then
|
||||||
brew install yarn
|
brew install yarn
|
||||||
|
else
|
||||||
|
echo "yarn required"
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! cmd_exists unzip; then
|
if ! cmd_exists unzip; then
|
||||||
if $LINUX; then
|
if $LINUX; then
|
||||||
$INSTALL unzip
|
$INSTALL unzip
|
||||||
elif $OSX; then
|
else
|
||||||
echo "unzip required"
|
echo "unzip required"
|
||||||
exit 1
|
exit 1
|
||||||
# not sure this works, but OSX should come with unzip
|
|
||||||
# brew install unzip
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
|
@ -1,21 +0,0 @@
|
||||||
"""Set the package version to the output of `git describe`"""
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import os.path
|
|
||||||
import sys
|
|
||||||
import fileinput
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
|
||||||
filename = os.path.abspath(
|
|
||||||
os.path.join(os.path.abspath(__file__), '..', '..', 'ui', 'js', 'lbryio.js'))
|
|
||||||
for line in fileinput.input(filename, inplace=True):
|
|
||||||
if line.startswith(' enabled: false'):
|
|
||||||
print(' enabled: true')
|
|
||||||
else:
|
|
||||||
print(line, end='')
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
sys.exit(main())
|
|
Loading…
Add table
Reference in a new issue