diff options
| author | wsnipex <wsnipex@a1.net> | 2014-05-31 11:07:02 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2014-06-30 09:17:12 +0200 |
| commit | 5e266372993396ee38fbc2a5d80514dff4e8158b (patch) | |
| tree | 4674481ffed45509d01acdb3f7e44b3d8b236100 /tools | |
| parent | fb8f055fe26ee6d166528bf50040a270899d04af (diff) | |
autogenerate xbmc version dependent files
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Linux/packaging/mk-debian-package.sh | 4 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml.in (renamed from tools/android/packaging/xbmc/AndroidManifest.xml) | 4 | ||||
| -rwxr-xr-x | tools/buildsteps/osx32/package | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/osx64/package | 2 | ||||
| -rwxr-xr-x | tools/darwin/Support/makepythoninterface.command | 1 | ||||
| -rw-r--r-- | tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in | 4 | ||||
| -rw-r--r-- | tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in | 4 | ||||
| -rwxr-xr-x | tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in (renamed from tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh) | 4 |
8 files changed, 13 insertions, 12 deletions
diff --git a/tools/Linux/packaging/mk-debian-package.sh b/tools/Linux/packaging/mk-debian-package.sh index 5fd2efc976..9a39dfc1c0 100755 --- a/tools/Linux/packaging/mk-debian-package.sh +++ b/tools/Linux/packaging/mk-debian-package.sh @@ -73,8 +73,8 @@ function getVersion { getGitRev if [[ $RELEASEV == "auto" ]] then - local MAJORVER=$(grep VERSION_MAJOR $REPO_DIR/xbmc/GUIInfoManager.h | awk '{ print $3 }') - local MINORVER=$(grep VERSION_MINOR $REPO_DIR/xbmc/GUIInfoManager.h | awk '{ print $3 }') + local MAJORVER=$(grep VERSION_MAJOR $REPO_DIR/version.txt | awk '{ print $2 }') + local MINORVER=$(grep VERSION_MINOR $REPO_DIR/version.txt | awk '{ print $2 }') RELEASEV=${MAJORVER}.${MINORVER} else PACKAGEVERSION="${RELEASEV}~git$(date '+%Y%m%d.%H%M')-${TAG}" diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml b/tools/android/packaging/xbmc/AndroidManifest.xml.in index d69a5b330c..3edc5142e5 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -2,8 +2,8 @@ <!-- BEGIN_INCLUDE(manifest) --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.xbmc.xbmc" - android:versionCode="139701" - android:versionName="14.0-ALPHA1" > + android:versionCode="@APP_VERSION_CODE@" + android:versionName="@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@-@APP_VERSION_TAG@" > <!-- This is the platform API where NativeActivity was introduced. --> <uses-sdk android:minSdkVersion="14" /> diff --git a/tools/buildsteps/osx32/package b/tools/buildsteps/osx32/package index 5bce61925a..ca9c655123 100755 --- a/tools/buildsteps/osx32/package +++ b/tools/buildsteps/osx32/package @@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx32 . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/tools/darwin/packaging/xbmc-osx/;./mkdmg-xbmc-osx.sh $Configuration +cd $WORKSPACE/tools/darwin/packaging/xbmc-osx/; sh ./mkdmg-xbmc-osx.sh $Configuration #rename for upload #e.x. xbmc-20130314-8c2fb31-Frodo-i386.dmg diff --git a/tools/buildsteps/osx64/package b/tools/buildsteps/osx64/package index ac50195325..6ce8da47e6 100755 --- a/tools/buildsteps/osx64/package +++ b/tools/buildsteps/osx64/package @@ -2,7 +2,7 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx64 . $WORKSPACE/tools/buildsteps/defaultenv -cd $WORKSPACE/tools/darwin/packaging/xbmc-osx/;./mkdmg-xbmc-osx.sh $Configuration +cd $WORKSPACE/tools/darwin/packaging/xbmc-osx/; sh ./mkdmg-xbmc-osx.sh $Configuration #rename for upload #e.x. xbmc-20130314-8c2fb31-Frodo-x86_64.dmg diff --git a/tools/darwin/Support/makepythoninterface.command b/tools/darwin/Support/makepythoninterface.command index 50d3a2233b..ec2d2b42ef 100755 --- a/tools/darwin/Support/makepythoninterface.command +++ b/tools/darwin/Support/makepythoninterface.command @@ -8,4 +8,5 @@ fi if [ "$ACTION" = build ] ; then make -f ${SRCROOT}/codegenerator.mk + make -f ${SRCROOT}/xbmc/gen-compileinfo.mk fi diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in index ec15372fd9..a40af5ab9f 100644 --- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in +++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in @@ -45,8 +45,8 @@ fi PACKAGE=org.xbmc.xbmc-atv2 -VERSION=14.0 -REVISION=0~alpha1 +VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ +REVISION=0~@APP_VERSION_TAG_LC@ ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in index be99c0cb79..1db595e49a 100644 --- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in +++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in @@ -46,8 +46,8 @@ fi PACKAGE=org.xbmc.xbmc-ios -VERSION=14.0 -REVISION=0~alpha1 +VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ +REVISION=0~@APP_VERSION_TAG_LC@ ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh b/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in index efec7f80c4..60764d2f28 100755 --- a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh +++ b/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in @@ -24,8 +24,8 @@ ARCHITECTURE=`file $XBMC/Contents/MacOS/XBMC | awk '{print $NF}'` PACKAGE=org.xbmc.xbmc-osx -VERSION=14.0 -REVISION=0~alpha1 +VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@ +REVISION=0~@APP_VERSION_TAG_LC@ ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_macosx-intel-${ARCHITECTURE} echo Creating $PACKAGE package version $VERSION revision $REVISION |