Update xbmc-get-orig-source script to be able to create snapshot from latest SVN.

Also now strips unneeded sources from source tree.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@32386 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 92 insertions, 22 deletions

diff --git a/tools/Linux/packaging/debian/xbmc-get-orig-source b/tools/Linux/packaging/debian/xbmc-get-orig-source
index a4bf580d5c..38a1f3ab3b 100755
--- a/tools/Linux/packaging/debian/xbmc-get-orig-source
+++ b/tools/Linux/packaging/debian/xbmc-get-orig-source
@@ -3,21 +3,21 @@
 # This script is used to download the upstream source for xbmc and
 # generate it into an orig source tarball for Debian.
 
-# Common variables used to ease maintenance of this script
-XBMC_TARBALL=""
-XBMC_TARBALL_CHECKSUM=""
-SVN_REVISION="29980"
-XBMC_VERSION="10.05~svn$SVN_REVISION+fhs~deb1"
-XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/fhs"
-
 USAGE="\n\
 This script is used to generate the orig tarball used in building\n\
-Debian packages for xbmc-$XBMC_VERSION.\n\
+Debian packages for xbmc. This script will create an orig tarball for\n\
+Debian/Ubuntu official archive by default.
 Usage: xbmc-get-orig-source [OPTION]\n\
 \n\
  -h, --help                 Display this help message.\n\
- --remove-upstream-tarball  Remove the upstream source tarball.\n"
+ --remove-upstream-tarball  Remove the upstream source tarball.\n\
+ --make-debian-snapshot     Make tarball for official Debian/Ubuntu archive\n\
+                            using latest SVN revision.\n\
+ --make-ppa                 Make tarball for XBMC's PPA\n\
+ --make-ppa-snapshot        Make tarball for XBMC's PPA using latest SVN\n\
+                            revision.\n"
 
+# Loop that parses options passed to script
 while [ "$#" -gt "0" ]
 do
     case "$1" in
@@ -25,6 +25,19 @@ do
             REMOVE_UPSTREAM_TARBALL=1
             shift
             ;;
+        --make-debian-snapshot)
+            LATEST_SVN=1
+            shift
+            ;;
+        --make-ppa)
+            PPA_ORIG_TARBALL=1
+            shift
+            ;;
+        --make-ppa-snapshot)
+            PPA_ORIG_TARBALL=1
+            LATEST_SVN=1
+            shift
+            ;;
         -h|--help|*)
             echo "${USAGE}"
             exit 1
@@ -32,25 +45,74 @@ do
     esac
 done
 
-# This will generate the orig.tar.gz
-make_current_tarball() {
-    # We do an export from svn trunk
+# Common variables used to ease maintenance of this script
+XBMC_TARBALL=""
+XBMC_TARBALL_CHECKSUM=""
+SVN_REVISION="32381"
+XBMC_VERSION="10.0~svn$SVN_REVISION~deb1"
+XBMC_SVN_URL="http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk"
+
+# export xbmc source
+get_sources() {
+    if [ -n "$LATEST_SVN" ]; then
+        SVN_REVISION="$(svn info $XBMC_SVN_URL | \
+                        grep "Last Changed Rev" | \
+                        sed -e 's/^[^0-9]\+//')"
+        XBMC_VERSION="10.0~svn$SVN_REVISION~deb1"
+    fi
     svn export -r$SVN_REVISION $XBMC_SVN_URL xbmc-$XBMC_VERSION
+}
 
+# This will prepare the sources to create a tarball from
+prepare_orig_tarball() {
     # Run bootstrap
     cd xbmc-$XBMC_VERSION
     ./bootstrap
     cd ..
 
-    # Remove non-free components
-    echo "Removing non-free components"
-    rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
-    rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/UnrarXLib
-    rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/libXBMS
+    if [ -z "$PPA_ORIG_TARBALL" ]; then
+        # Remove non-free components
+        echo "Removing non-free components"
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
+        rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/UnrarXLib
+        rm -rf xbmc-$XBMC_VERSION/xbmc/xbmc/lib/libXBMS
 
-    # Remove empty directories
-    echo "Removing empty directories"
-    find xbmc-$XBMC_VERSION -type d -empty -delete
+        # Remove components not needed for Linux when using external libs
+        echo "Removing components not needed for Linux when using external libs"
+        rm -rf xbmc-$XBMC_VERSION/lib/bzip2
+        rm -rf xbmc-$XBMC_VERSION/lib/enca
+        rm -rf xbmc-$XBMC_VERSION/lib/freetype
+        rm -rf xbmc-$XBMC_VERSION/lib/fribidi
+        rm -rf xbmc-$XBMC_VERSION/lib/libass
+        rm -rf xbmc-$XBMC_VERSION/lib/libcdio
+        rm -rf xbmc-$XBMC_VERSION/lib/libcrystalhd
+        rm -rf xbmc-$XBMC_VERSION/lib/libcurl-OSX
+        rm -rf xbmc-$XBMC_VERSION/lib/libiconv
+        rm -rf xbmc-$XBMC_VERSION/lib/liblame
+        rm -rf xbmc-$XBMC_VERSION/lib/libmicrohttpd
+        rm -rf xbmc-$XBMC_VERSION/lib/libmodplug
+        rm -rf xbmc-$XBMC_VERSION/lib/librtmp
+        rm -rf xbmc-$XBMC_VERSION/lib/libSDL-OSX
+        rm -rf xbmc-$XBMC_VERSION/lib/libssh_win32
+        rm -rf xbmc-$XBMC_VERSION/lib/libvpx
+        rm -rf xbmc-$XBMC_VERSION/lib/pcre
+        rm -rf xbmc-$XBMC_VERSION/libmicrohttpd_win32
+        rm -rf xbmc-$XBMC_VERSION/libmysql_win32
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/liba52
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libdts
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libfaad2
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libmad
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/dvdplayer/Codecs/libmpeg2
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/paplayer/FLACCodec/flac-1.2.1
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/paplayer/ogg
+        rm -rf xbmc-$XBMC_VERSION/xbmc/cores/paplayer/vorbisfile
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/boost
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/libenca
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/libmms
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/libPython/Python
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/libsamplerate
+        rm -rf xbmc-$XBMC_VERSION/xbmc/lib/zlib
+    fi
 
     # Remove temp files and other cruft from source tarball
     # The find command snippet here was taken from debhelper's dh_clean command
@@ -65,10 +127,18 @@ make_current_tarball() {
         \) -exec rm -f "{}" \; \) -o \
         \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
 
-    # Create the tarball
+    # Remove empty directories
+    echo "Removing empty directories"
+    find xbmc-$XBMC_VERSION -type d -empty -delete
+}
+
+# Function to create tarball
+create_tarball() {
     echo "Create orig tarball"
     tar -czf xbmc_$XBMC_VERSION.orig.tar.gz \
         xbmc-$XBMC_VERSION/
 }
 
-make_current_tarball
+get_sources
+prepare_orig_tarball
+create_tarball