projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deprecate the repo option
[osm/UI.git]
/
BUILD.sh
diff --git
a/BUILD.sh
b/BUILD.sh
index
289d11a
..
17e2443
100755
(executable)
--- a/
BUILD.sh
+++ b/
BUILD.sh
@@
-56,7
+56,7
@@
while true; do
echo
echo "SYNOPSIS:"
echo " $0 -h|--help"
echo
echo "SYNOPSIS:"
echo " $0 -h|--help"
- echo " $0 [--install] [PLATFORM_
REPOSITORY] [PLATFORM_
VERSION]"
+ echo " $0 [--install] [PLATFORM_VERSION]"
echo
echo "DESCRIPTION:"
echo " Prepare current system to run $MODULE. By default, the system"
echo
echo "DESCRIPTION:"
echo " Prepare current system to run $MODULE. By default, the system"
@@
-64,7
+64,6
@@
while true; do
echo " $MODULE can be installed from a Debian package repository."
echo
echo " --install: install $MODULE from package"
echo " $MODULE can be installed from a Debian package repository."
echo
echo " --install: install $MODULE from package"
- echo " PLATFORM_REPOSITORY (optional): name of the RIFT.ware repository."
echo " PLATFORM_VERSION (optional): version of the platform packages to be installed."
echo
exit 0;;
echo " PLATFORM_VERSION (optional): version of the platform packages to be installed."
echo
exit 0;;
@@
-79,8
+78,7
@@
set -x # Print commands before executing them
###############################################################################
# Set up repo and version
###############################################################################
# Set up repo and version
-PLATFORM_REPOSITORY=${1:-OSM3}
-PLATFORM_VERSION=${2:-5.2.0.2.72254}
+PLATFORM_VERSION=${1:-5.2.0.3.73627}
###############################################################################
# Main block
###############################################################################
# Main block
@@
-92,22
+90,20
@@
cd $(dirname $0)
curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add -
# always use the same file name so that updates will overwrite rather than enable a second repo
curl http://repos.riftio.com/public/xenial-riftware-public-key | sudo apt-key add -
# always use the same file name so that updates will overwrite rather than enable a second repo
-sudo curl -o /etc/apt/sources.list.d/rift.list http://buildtracker.riftio.com/repo_file/ub16/${PLATFORM_REPOSITORY}/
sudo apt-get update
sudo apt-get update
+echo "deb https://artifactory.riftio.com/debian-OSM xenial main" >/etc/apt/source.list.d/rift.list
sudo apt install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION}
if $installFromPackages; then
# Install module and platform from packages
sudo apt install -y --allow-downgrades rw.tools-container-tools=${PLATFORM_VERSION} rw.tools-scripts=${PLATFORM_VERSION}
if $installFromPackages; then
# Install module and platform from packages
- sudo -H /usr/rift/container_tools/mkcontainer --modes $MODULE --r
epo ${PLATFORM_REPOSITORY} --r
w-version ${PLATFORM_VERSION}
+ sudo -H /usr/rift/container_tools/mkcontainer --modes $MODULE --rw-version ${PLATFORM_VERSION}
else
# Install environment to build module
else
# Install environment to build module
- sudo -H /usr/rift/container_tools/mkcontainer --modes $MODULE-dev --repo ${PLATFORM_REPOSITORY} --rw-version ${PLATFORM_VERSION}
- sudo -H apt install -y nodejs
- sudo -H npm install -g forever
+ sudo -H /usr/rift/container_tools/mkcontainer --modes $MODULE-dev --rw-version ${PLATFORM_VERSION}
# Build and install module
make -j16
# Build and install module
make -j16