From d4852d3ac378ebac6a26cbf67d634111e8577a8d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 19 Mar 2012 12:31:30 +0100 Subject: [PATCH] VERSION: rework versioning management Signed-off-by: Stephan Raue --- VERSION | 10 +++++++++- config/options | 16 +++++++--------- config/path | 4 ---- packages/mediacenter/xbmc-addon-settings/install | 1 + projects/ATV/options | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/Ultra/options | 2 +- projects/Virtual/options | 2 +- scripts/create_addon | 12 ++++++------ 13 files changed, 31 insertions(+), 28 deletions(-) diff --git a/VERSION b/VERSION index d64531f130..d82170ac81 100644 --- a/VERSION +++ b/VERSION @@ -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" + diff --git a/config/options b/config/options index c1c0dfd8ac..c52297c1d0 100644 --- a/config/options +++ b/config/options @@ -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 diff --git a/config/path b/config/path index bfeacc5a72..eb7cfd044d 100644 --- a/config/path +++ b/config/path @@ -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" diff --git a/packages/mediacenter/xbmc-addon-settings/install b/packages/mediacenter/xbmc-addon-settings/install index c2686f63ee..8bdfac1944 100755 --- a/packages/mediacenter/xbmc-addon-settings/install +++ b/packages/mediacenter/xbmc-addon-settings/install @@ -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 diff --git a/projects/ATV/options b/projects/ATV/options index 115edb0ba0..5b0a04b6ce 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -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" diff --git a/projects/Fusion/options b/projects/Fusion/options index 57115788ed..8dbd4b2ef4 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -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" diff --git a/projects/Generic/options b/projects/Generic/options index 2002b84dd3..7bbcf4e28e 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -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" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 56c380e130..22ef9bc89d 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -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" diff --git a/projects/ION/options b/projects/ION/options index 117d43a77e..97275897da 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -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" diff --git a/projects/Intel/options b/projects/Intel/options index 651d82b5ae..f1edfe7461 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -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" diff --git a/projects/Ultra/options b/projects/Ultra/options index 1ff8f2cb66..41ea17d5af 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -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" diff --git a/projects/Virtual/options b/projects/Virtual/options index 704b272ff4..84ccd396f8 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -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" diff --git a/scripts/create_addon b/scripts/create_addon index 283e22f617..91deb49460 100755 --- a/scripts/create_addon +++ b/scripts/create_addon @@ -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