From 5c9469655a3401981b1fee7522c08384c97b8ab0 Mon Sep 17 00:00:00 2001
From: Gujs <gujs.lists@gmail.com>
Date: Wed, 2 Mar 2011 19:05:49 +0100
Subject: [PATCH] mkpkg: sync mkpkg_xbmc-dharma-pvr with mkpkg_xbmc-dharma-10.1

---
 tools/mkpkg/mkpkg_xbmc-dharma-pvr | 60 ++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/tools/mkpkg/mkpkg_xbmc-dharma-pvr b/tools/mkpkg/mkpkg_xbmc-dharma-pvr
index 49c6333bf0..61f74aa5da 100755
--- a/tools/mkpkg/mkpkg_xbmc-dharma-pvr
+++ b/tools/mkpkg/mkpkg_xbmc-dharma-pvr
@@ -2,7 +2,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011-2011 Gregor Fuis (gujs@openelec.tv)
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -20,49 +19,62 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-REV="10.0-Dharma"
+PKG_NAME="xbmc-pvr"
+PKG_VERSION="10.0-Dharma-pvr"
+GIT_REPO="-b $PKG_VERSION git://github.com/opdenkamp/xbmc.git"
+DEST_DIR="$PKG_NAME-$PKG_VERSION"
 
 echo "getting sources..."
-  git clone -b Dharma https://github.com/opdenkamp/xbmc.git xbmc-pvr
-  cd xbmc-pvr
-  git checkout 10.0-Dharma-pvr
+  if [ ! -d $DEST_DIR-latest ]; then
+    git clone $GIT_REPO $DEST_DIR-latest
+  fi
+
+  cd $DEST_DIR-latest
+    git checkout $PKG_VERSION
+    git pull
 
 echo "getting version..."
   GIT_REV=`git log -n1 --format=%h`
   echo $GIT_REV
-
-echo "exporting sources..."
-  git checkout-index -a -f --prefix=../xbmc-pvr-$REV/
   cd ..
-  echo "$GIT_REV" > xbmc-pvr-$REV/git.version
 
-echo "seperating theme..."
-  rm -rf xbmc-pvr-theme-Confluence-$REV
-  mv xbmc-pvr-$REV/addons/skin.confluence xbmc-pvr-theme-Confluence-$REV
+echo "copying sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version
 
 echo "cleaning sources..."
-  rm -rf xbmc-pvr-$REV/visualisations
-  rm -rf xbmc-pvr-$REV/lib/libSDL-*
-  rm -rf xbmc-pvr-$REV/lib/libcurl-*
-  rm -rf xbmc-pvr-$REV/project
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git
+
+echo "seperating theme..."
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
            "PackageMaker" "Translator" "XBMCLive" "XprPack" \
            "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf xbmc-pvr-$REV/tools/$i
+    rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/tools/$i
   done
 
   for i in dll a lib so bat; do
-    find xbmc-pvr-$REV -name *.$i -exec rm -rf {} ";"
+    find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";"
   done
 
   # bundled win32 binaries
-  rm -r xbmc-pvr-$REV/xbmc/visualizations/XBMCProjectM/win32
+  rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
 
 echo "packing sources..."
-  tar cvjf xbmc-pvr-$REV.tar.bz2 xbmc-pvr-$REV
-  tar cvjf xbmc-pvr-theme-Confluence-$REV.tar.bz2 xbmc-pvr-theme-Confluence-$REV
+  tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV
+  tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
 
-# echo "remove temporary sourcedir..."
-#  rm -rf xbmc-pvr-$REV
-#  rm -rf xbmc-pvr-theme-Confluence-$REV