summaryrefslogtreecommitdiffstats
path: root/build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index d30c57b0..a7a1c6ab 100755
--- a/build.sh
+++ b/build.sh
@@ -59,8 +59,8 @@ export BUILDROOT=$GERRITROOT/framework/build
export ONOSRC=$GERRITROOT/framework/src/onos
export ONOSROOT=$BUILDROOT/onos
export ONOS_ROOT=$BUILDROOT/onos
-export ANT_HOME=$GERRITROOT/framework/build/ant/apache-ant-1.9.6
-export M2_HOME=$GERRITROOT/framework/build/maven/build
+export ANT_HOME=$BUILDROOT/ant/apache-ant-1.9.6
+export M2_HOME=$BUILDROOT/maven/build
export M2=$M2_HOME/bin
export PATH=$PATH:$ANT_HOME/bin:$M2:$JAVA_HOME/bin
export KARAF_ROOT=$BUILDROOT/karaf/$KARAF_VERSION
@@ -292,6 +292,7 @@ buildONOS()
cp $PATCHES/$PATCH_PATH_1/* $BUILDROOT/$PATCH_PATH_1/
fi
cd $ONOSROOT
+ ln -sf $KARAF_ROOT/apache-karaf-$KARAF_VERSION apache-karaf-$KARAF_VERSION
mvn clean install
if [ -f "$ONOSROOT/tools/build/envDefaults" ]; then
export ONOSVERSION="`cat $ONOSROOT/tools/build/envDefaults | grep "export ONOS_POM_VERSION" \
@@ -306,6 +307,7 @@ buildONOS()
cp -v $PATCHES/$PATCH_PATH_1/* $BUILDROOT/$PATCH_PATH_1/
fi
cd $ONOSROOT
+ ln -sf $KARAF_ROOT/apache-karaf-$KARAF_VERSION apache-karaf-$KARAF_VERSION
mvn clean install
if [ -f "$ONOSROOT/tools/build/envDefaults" ]; then
export ONOSVERSION="`cat $ONOSROOT/tools/build/envDefaults | grep "export ONOS_POM_VERSION" \