VERSION: rework versioning management

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-03-19 12:31:30 +01:00
parent f7763c7181
commit d4852d3ac3
13 changed files with 31 additions and 28 deletions

10
VERSION
View File

@ -1 +1,9 @@
devel
# VERSION: set full version, use "devel" for development version
OPENELEC_VERSION="devel"
# OS_VERSION: OS Version
OS_VERSION="2.0"
# ADDON_VERSION: Addon version
ADDON_VERSION="2.1"

View File

@ -17,15 +17,8 @@ fi
ROOT=`pwd`
PROJECT_DIR="$ROOT/projects"
OPENELEC_VERSION=`cat VERSION`
if [ "$OPENELEC_VERSION" = "devel" ]; then
OS_VERSION="2.0"
else
OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
OS_VERSION="$OS_MAJOR_VERSION.$OS_MINOR_VERSION"
fi
# include versioning
. ./VERSION
# read project options if available
if [ -f "$PROJECT_DIR/$PROJECT/options" ]; then
@ -71,6 +64,11 @@ fi
# forcing install of all packages (yes/no)
FORCE_INSTALL="no"
# install devtools on development builds
if [ "$OPENELEC_VERSION" = "devel" ]; then
DEVTOOLS=yes
fi
# read options from $HOME if available
if [ -f "$HOME/.openelec/options" ]; then
. $HOME/.openelec/options

View File

@ -34,10 +34,6 @@ FAKEROOT_SCRIPT=$ROOT/.fakeroot.$PROJECT.$TARGET_ARCH
. config/sources
if [ "$OPENELEC_VERSION" = devel ]; then
DEVTOOLS=yes
fi
MAKE="$ROOT/$TOOLCHAIN/bin/make"
MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
SED="sed -i"

View File

@ -25,3 +25,4 @@
mkdir -p $INSTALL/usr/share/xbmc/addons/os.openelec.settings
cp -R $PKG_DIR/source/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings
cp -R $PKG_DIR/config/* $INSTALL/usr/share/xbmc/addons/os.openelec.settings
$SED "s|@OS_VERSION@|$OS_VERSION|g" -i $INSTALL/usr/share/xbmc/addons/os.openelec.settings/addon.xml

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -304,5 +304,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -305,5 +305,5 @@
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$OS_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

View File

@ -57,7 +57,7 @@ if [ -f $PKG_DIR/addon ]; then
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
-e "s|@PKG_NAME@|$PKG_NAME|g" \
-e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \
-e "s|@ADDON_VERSION@|$ADDON_VERSION.$PKG_REV|g" \
-e "s|@PKG_ADDON_TYPE@|$PKG_ADDON_TYPE|g" \
-e "s|@REQUIRES@|$REQUIRES|g" \
-e "s|@PKG_SHORTDESC@|$PKG_SHORTDESC|g" \
@ -90,11 +90,11 @@ if [ -f $PKG_DIR/addon ]; then
cd $ADDON_BUILD
echo "*** compressing Addon $PKG_ADDON_ID ... ***"
zip -rq $PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
zip -rq $PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $PKG_ADDON_ID;
cd -
mkdir -p $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $ADDON_BUILD/$PKG_ADDON_ID-$OS_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$OS_VERSION.$PKG_REV.txt
cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$OS_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
mkdir -p $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $ADDON_BUILD/$PKG_ADDON_ID-$ADDON_VERSION.$PKG_REV.zip $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID
cp $PKG_DIR/changelog.txt $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/changelog-$ADDON_VERSION.$PKG_REV.txt
cp $PKG_DIR/icon/icon.png $TARGET/$ADDONS/$ADDON_VERSION/$PROJECT/$TARGET_ARCH/$PKG_ADDON_ID/icon.png
fi