Removing submodule in favour of rust crate (#2756)

* Removing submodule

* Fixing UI dependency structure.

* Merging RS and JS package

* Updating release script to push also rs files

* fix merge gone wrong

* Fixing compilation
This commit is contained in:
Tomasz Drwięga
2016-10-22 20:07:12 +02:00
committed by Arkadiy Paronyan
parent 20591e882e
commit aca82fb84b
18 changed files with 158 additions and 62 deletions

View File

@@ -1,4 +1,5 @@
#!/bin/bash
set -e
# change into the build directory
pushd `dirname $0`
@@ -7,6 +8,16 @@ cd ../.build
# variables
UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
# Create proper directory structure
mkdir -p build
mv * build || true
mkdir -p src
# Copy rust files
cp ../Cargo.precompiled.toml Cargo.toml
cp ../build.rs .
cp ../src/lib.rs* ./src/
# init git
rm -rf ./.git
git init

View File

@@ -1,19 +1,11 @@
#!/bin/bash
set -e
# change into the submodule build directory
# change into main dir
pushd `dirname $0`
cd ../build
cd ../../
if [ -z "$1" ]; then
popd
echo "Usage: $0 <sha-commit>"
exit 1
fi
git fetch
git fetch origin $1
git merge $1 -X theirs
cargo update -p parity-ui-precompiled
popd
exit 0