Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Merge pull request #165 from LiskHQ/160-Remove_lisk-node
Browse files Browse the repository at this point in the history
Remove lisk-node - Closes #160
  • Loading branch information
Isabella Dell committed Jul 10, 2017
2 parents e67724b + 9bde3b0 commit e3e60fd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 29 deletions.
24 changes: 1 addition & 23 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -147,23 +147,6 @@ echo "--------------------------------------------------------------------------
exec_cmd "cp -f ../shared.sh ../scripts/* $BUILD_NAME/"
exec_cmd "cp -fR ../etc $BUILD_NAME/"

echo "Building lisk-node..."
echo "--------------------------------------------------------------------------"
if [ ! -f "$LISK_NODE_FILE" ]; then
exec_cmd "wget $LISK_NODE_URL -O $LISK_NODE_FILE"
fi
if [ ! -f "$LISK_NODE_DIR/$LISK_NODE_OUT" ]; then
exec_cmd "rm -rf $LISK_NODE_DIR"
exec_cmd "tar -zxvf $LISK_NODE_FILE"
cd "$LISK_NODE_DIR" || exit 2
apply_patches "node"
exec_cmd "./configure --without-npm $LISK_NODE_CONFIG"
exec_cmd "make --jobs=$JOBS"
cd ../ || exit 2
fi
exec_cmd "mkdir -p $BUILD_NAME/nodejs"
exec_cmd "cp -f $LISK_NODE_DIR/$LISK_NODE_OUT $BUILD_NAME/nodejs/"

echo "Building node..."
echo "--------------------------------------------------------------------------"
if [ ! -f "$NODE_FILE" ]; then
Expand Down Expand Up @@ -200,11 +183,7 @@ exec_cmd "GZIP=-6 tar -czf ../release/$BUILD_NAME.tar.gz $BUILD_NAME"
# Create $NOVER_BUILD_NAME.tar.gz
exec_cmd "mv -f $BUILD_NAME $NOVER_BUILD_NAME"
exec_cmd "GZIP=-6 tar -czf ../release/$NOVER_BUILD_NAME.tar.gz $NOVER_BUILD_NAME"

# Create lisk-node-$OS-$ARCH.tar.gz
cd "$NOVER_BUILD_NAME" || exit 2
exec_cmd "GZIP=-6 tar -czf ../../release/lisk-node-$OS-$ARCH.tar.gz nodejs"
cd ../ || exit 2
cd ../"$NOVER_BUILD_NAME" || exit 2

# Create lisk-source.tar.gz
exec_cmd "mv -f $VERSION lisk-source"
Expand All @@ -215,7 +194,6 @@ echo "--------------------------------------------------------------------------
cd ../release || exit 2
exec_cmd "$SHA_CMD $BUILD_NAME.tar.gz > $BUILD_NAME.tar.gz.SHA256"
exec_cmd "$SHA_CMD $NOVER_BUILD_NAME.tar.gz > $NOVER_BUILD_NAME.tar.gz.SHA256"
exec_cmd "$SHA_CMD lisk-node-$OS-$ARCH.tar.gz > lisk-node-$OS-$ARCH.tar.gz.SHA256"
exec_cmd "$SHA_CMD lisk-source.tar.gz > lisk-source.tar.gz.SHA256"
cd ../src || exit 2

Expand Down
6 changes: 0 additions & 6 deletions config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,6 @@ LISK_NETWORK="BUILD_NETWORK"
LISK_URL="https://downloads.lisk.io/lisk/$LISK_NETWORK/$VERSION/$LISK_FILE"
LISK_CONFIG=""

LISK_NODE_DIR="lisk-node-6.10.3-lisk"
LISK_NODE_FILE="$LISK_NODE_DIR.tar.gz"
LISK_NODE_URL="https://github.com/LiskHQ/lisk-node/archive/v6.10.3-lisk.tar.gz"
LISK_NODE_OUT="out/Release/node"
LISK_NODE_CONFIG=""

NODE_DIR="node-v6.10.3"
NODE_FILE="$NODE_DIR.tar.gz"
NODE_URL="https://nodejs.org/download/release/v6.10.3/$NODE_FILE"
Expand Down

0 comments on commit e3e60fd

Please sign in to comment.