From 48c73f22d7eb8a75f2efbacbcf1d7f9ec4c61e37 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Tue, 16 Jan 2007 15:07:09 +0000
Subject: [PATCH] Updated cdrskin tarball generator

---
 ..._0_2_6 => add_ts_changes_to_libburn_0_3_0} | 48 +++++++++++++------
 ..._0_2_7 => add_ts_changes_to_libburn_0_3_1} | 35 ++++++++------
 2 files changed, 54 insertions(+), 29 deletions(-)
 rename libburn/trunk/cdrskin/{add_ts_changes_to_libburn_0_2_6 => add_ts_changes_to_libburn_0_3_0} (82%)
 rename libburn/trunk/cdrskin/{add_ts_changes_to_libburn_0_2_7 => add_ts_changes_to_libburn_0_3_1} (91%)

diff --git a/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_6 b/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_0
similarity index 82%
rename from libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_6
rename to libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_0
index bf09dd8a..2e2b52d1 100755
--- a/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_6
+++ b/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_0
@@ -22,7 +22,7 @@ set -x
 #
 # libburn version used:  http://libburn.pykix.org
 # Downloaded by:
-#  $ svn co http://libburn-svn.pykix.org/trunk libburn_pykix
+#  $ svn co http://libburn-svn.pykix.org/libburn/trunk libburn_pykix
 # packed up in a tarball just to save it from inadverted changes by
 #  $ tar czf libburn_svn.tgz libburn_pykix
 original="./libburn_svn.tgz"
@@ -33,14 +33,13 @@ original="./libburn_svn.tgz"
 # The top level directory in that snapshot is named
 intermediate="./libburn_pykix"
 
-# My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin
+# My changes are in libburn-develop , mainly in ./cdrskin
 
-changes="./libburn-0.2.3.ts.develop"
-skin_release="0.2.6"
-patch_level=".pl01"
+changes="./libburn-develop"
+skin_release="0.3.0"
+patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 
-
 # The result directory and the name of the result tarballs
 target="./cdrskin-${skin_release}"
 cdrskin_tarball="./cdrskin-${skin_rev}.tar.gz"
@@ -54,6 +53,9 @@ compile_cmd="./cdrskin/compile_cdrskin.sh"
 compile_static_opts="-static"
 compile_result="cdrskin/cdrskin"
 
+man_to_html_cmd="./cdrskin/convert_man_to_html.sh"
+man_page_html="cdrskin/man_1_cdrskin.html"
+
 bintarget_dynamic="cdrskin_${skin_rev}-x86-suse9_0"
 bintarget_static="$bintarget_dynamic"-static
 
@@ -122,6 +124,8 @@ do
     rm "$cdrskin_target"/cdrskin_"$i"
   fi
 done
+
+# Remove eventual SVN stuff from cdrskin directory
 for i in .deps .dirstamp .libs
 do
   if test -e "$cdrskin_target"/"$i"
@@ -130,6 +134,23 @@ do
   fi
 done
 
+# Remove GIFs of cdrskin_eng.html
+rm "$cdrskin_target"/doener_*.gif
+
+# Remove automatically generated HTML man page
+rm "$cdrskin_target"/man_1_cdrskin.html
+
+# Remove all add_ts_changes_to_libburn besides this one
+for i in "$cdrskin_target"/add_ts_changes_to_libburn*
+do
+  if test $(basename "$0") = $(basename "$i")
+  then
+    dummy=dummy
+  else
+    rm $i
+  fi
+done
+
 # Remove unwanted SVN stuff (TODO: avoid downloading it)
 for i in "$target"/.svn "$target"/*/.svn
 do
@@ -144,12 +165,6 @@ do
   fi
 done
 
-## No more : Add own libburn-README in toplevel
-# cp -a "$changes"/README "$target"
-
-## No more : Add modified Makefile.am
-# cp -a "$changes"/Makefile.am "$target"
-
 
 # Make SVN state tarball for the libburn team
 tar czf "$cdrskin_tarball_svn" "$target"
@@ -179,18 +194,20 @@ done
 # Pack it up to the new libburn+cdrskin-tarball
 tar czf "$cdrskin_tarball" "$target"
 
-# Produce a static and a dynamic binary
+# Produce a static and a dynamic binary, and a HTML man page
 (
  cd "$compile_dir" || exit 1
  ./configure
  make
- $compile_cmd -do_strip
+ "$compile_cmd" -do_strip
  cp "$compile_result" "../$bintarget_dynamic"
  if test -n "$compile_static_opts"
  then
-   $compile_cmd $compile_static_opts -do_strip
+   "$compile_cmd" $compile_static_opts -do_strip
    cp "$compile_result" "../$bintarget_static"
  fi
+ "$man_to_html_cmd"
+ mv "$man_page_html" ..
 )
 
 # Remove the build area
@@ -203,4 +220,5 @@ rm -rf "$target"
 ls -l "$cdrskin_tarball"
 ls -l "$bintarget_dynamic"
 ls -l "$bintarget_static"
+ls -l $(basename "$man_page_html")
 
diff --git a/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_7 b/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_1
similarity index 91%
rename from libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_7
rename to libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_1
index 5f870b8e..de98403b 100755
--- a/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_2_7
+++ b/libburn/trunk/cdrskin/add_ts_changes_to_libburn_0_3_1
@@ -33,13 +33,15 @@ original="./libburn_svn.tgz"
 # The top level directory in that snapshot is named
 intermediate="./libburn_pykix"
 
-# My changes are in libburn-0.2.3.ts.develop , mainly in ./cdrskin
+# My changes are in libburn-develop , mainly in ./cdrskin
 
-changes="./libburn-0.2.3.ts.develop"
-skin_rev="0.2.7"
+changes="./libburn-develop"
+skin_release="0.3.1"
+patch_level=""
+skin_rev="$skin_release""$patch_level"
 
 # The result directory and the name of the result tarballs
-target="./cdrskin-${skin_rev}"
+target="./cdrskin-${skin_release}"
 cdrskin_tarball="./cdrskin-${skin_rev}.tar.gz"
 cdrskin_tarball_svn="./cdrskin-${skin_rev}.svn.tar.gz"
 
@@ -123,10 +125,7 @@ do
   fi
 done
 
-# Remove automatically generated HTML man page
-rm "$cdrskin_target"/man_1_cdrskin.html
-
-# Remove eventual SVN stuff from cdrskin driectory
+# Remove eventual SVN stuff from cdrskin directory
 for i in .deps .dirstamp .libs
 do
   if test -e "$cdrskin_target"/"$i"
@@ -138,6 +137,20 @@ done
 # Remove GIFs of cdrskin_eng.html
 rm "$cdrskin_target"/doener_*.gif
 
+# Remove automatically generated HTML man page
+rm "$cdrskin_target"/man_1_cdrskin.html
+
+# Remove all add_ts_changes_to_libburn besides this one
+for i in "$cdrskin_target"/add_ts_changes_to_libburn*
+do
+  if test $(basename "$0") = $(basename "$i")
+  then
+    dummy=dummy
+  else
+    rm $i
+  fi
+done
+
 # Remove unwanted SVN stuff (TODO: avoid downloading it)
 for i in "$target"/.svn "$target"/*/.svn
 do
@@ -152,12 +165,6 @@ do
   fi
 done
 
-## No more : Add own libburn-README in toplevel
-# cp -a "$changes"/README "$target"
-
-## No more : Add modified Makefile.am
-# cp -a "$changes"/Makefile.am "$target"
-
 
 # Make SVN state tarball for the libburn team
 tar czf "$cdrskin_tarball_svn" "$target"