mirror of
https://github.com/wahyd4/gvm.git
synced 2026-08-10 05:16:13 +10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3fe1e1804a | ||
|
|
b64d5b3fd9 | ||
|
|
98d72f6705 | ||
|
|
922f5c7201 | ||
|
|
3e89f78cca | ||
|
|
eb1124d897 | ||
|
|
5e202a67ff |
@@ -1,5 +1,5 @@
|
||||
Version: 0.0.6
|
||||
State: Development
|
||||
State: Stable
|
||||
|
||||
CHANGES:
|
||||
* Added gvm pkg install to replace gvminstall
|
||||
|
||||
+29
-8
@@ -4,6 +4,7 @@ source_dir=$GVM_ROOT/tmp/$3/src
|
||||
build_dir=$GVM_ROOT/tmp/$3/build
|
||||
package_name=$3
|
||||
version=$4
|
||||
mode=$5
|
||||
|
||||
function download_package() {
|
||||
if [ ! -d "$cache_dir" ]; then
|
||||
@@ -19,8 +20,8 @@ function download_package() {
|
||||
|
||||
function select_version() {
|
||||
if [ "$version" != "" ]; then
|
||||
cd $source_dir && git pull &&
|
||||
git checkout $version > /dev/null 2>&1
|
||||
cd $source_dir && git pull &> /dev/null &&
|
||||
git checkout $version &> /dev/null
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "Invalid version $version"
|
||||
exit 1
|
||||
@@ -37,23 +38,33 @@ function setup_build_env() {
|
||||
|
||||
function check_deps() {
|
||||
export GOPATH=$build_dir
|
||||
echo "build package in ${build_dir}"
|
||||
if [ -f "$source_dir/Package.gvm" ]; then
|
||||
mkdir -p $build_dir/deps
|
||||
echo "loading dependent packages into ${build_dir}/deps"
|
||||
for line in `cat $source_dir/Package.gvm | grep ^pkg | awk '{ print $2 }'`; do
|
||||
CUR_PKG=$GVM_ROOT/pkgs/pkg.gvm/$line/current
|
||||
if [ -e "$CUR_PKG/BUILD_VERSION" ]; then
|
||||
echo "$line: `cat $CUR_PKG/BUILD_VERSION`" >> $build_dir/manifest
|
||||
else
|
||||
gvm pkg install $line
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to install dependency $line"
|
||||
if [[ "$mode" == "strict" ]]; then
|
||||
echo "ERROR: Couldnt find package: $line please build it first"
|
||||
exit 1
|
||||
else
|
||||
gvm pkg install $line
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to install dependency $line"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
#echo "ERROR: Couldnt find package: $line"
|
||||
#exit 1
|
||||
fi
|
||||
export GOPATH=$GOPATH:$CUR_PKG
|
||||
#go linker complains and quits building when GOPATH has more than 14 paths
|
||||
#export GOPATH=$GOPATH:$CUR_PKG
|
||||
cp -rf ${CUR_PKG}/pkg ${build_dir}/deps
|
||||
done
|
||||
export GOPATH=$GOPATH:${build_dir}/deps
|
||||
fi
|
||||
echo ":complete" >> $build_dir/manifest
|
||||
}
|
||||
|
||||
function build_package() {
|
||||
@@ -70,10 +81,20 @@ function build_package() {
|
||||
cat "$build_dir/build.log"
|
||||
exit 1
|
||||
fi
|
||||
echo "Running tests..."
|
||||
cd $source_dir && gvmake test >> $build_dir/build.log 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "ERROR: Failed tests"
|
||||
cat "$build_dir/build.log"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
function install_package() {
|
||||
mkdir -p $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
if [ -f "$source_dir/Package.gvm" ]; then
|
||||
rm -rf $build_dir/deps
|
||||
fi
|
||||
cp -r $build_dir/* $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER &&
|
||||
rm -f $GVM_ROOT/pkgs/pkg.gvm/$package_name/current &&
|
||||
ln -s $GVM_ROOT/pkgs/pkg.gvm/$package_name/$BUILD_NUMBER $GVM_ROOT/pkgs/pkg.gvm/$package_name/current &&
|
||||
|
||||
Reference in New Issue
Block a user