Merge pull request #4866 from wsnipex/versioning
authorjmarshallnz <jcmarsha@gmail.com>
Wed, 2 Jul 2014 07:04:11 +0000 (19:04 +1200)
committerjmarshallnz <jcmarsha@gmail.com>
Wed, 2 Jul 2014 07:04:11 +0000 (19:04 +1200)
automatic versioning

1  2 
XBMC.xcodeproj/project.pbxproj
project/VS2010Express/XBMC.vcxproj
project/VS2010Express/XBMC.vcxproj.filters
tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in
tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in
xbmc/GUIInfoManager.cpp

Simple merge
Simple merge
@@@ -47,10 -45,9 +47,10 @@@ f
  
  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
 +XBMCSIZE="$(du -s -k ${XBMC} | awk '{print $1}')"
  
  echo Creating $PACKAGE package version $VERSION revision $REVISION
  ${SUDO} rm -rf $DIRNAME/$PACKAGE
@@@ -48,10 -46,9 +48,10 @@@ f
  
  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
 +XBMCSIZE="$(du -s -k ${XBMC} | awk '{print $1}')"
  
  echo Creating $PACKAGE package version $VERSION revision $REVISION
  ${SUDO} rm -rf $DIRNAME/$PACKAGE
Simple merge