From 0ca27968de50bc4b8c2a898eed3eab87714fa674 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 15 Jan 2007 18:26:41 +0000 Subject: [PATCH] Updated cdrskin tarball generator --- .../cdrskin/add_ts_changes_to_libburn_0_2_6 | 206 ------------------ ..._0_2_7 => add_ts_changes_to_libburn_0_3_0} | 31 +-- 2 files changed, 18 insertions(+), 219 deletions(-) delete mode 100755 libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_6 rename libburn/tags/ZeroThreeZero/cdrskin/{add_ts_changes_to_libburn_0_2_7 => add_ts_changes_to_libburn_0_3_0} (93%) diff --git a/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_6 b/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_6 deleted file mode 100755 index bf09dd8a..00000000 --- a/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_6 +++ /dev/null @@ -1,206 +0,0 @@ -#!/bin/sh - -set -x - -# This script documents how this cdrskin version was derived from -# a vanilla libburn version. It is not intended nor needed for any -# use of cdrskin but included here only to show the technical -# relationship between both projects - which are close friends -# and issue roughly the same software. -# -# Package maintainers are advised to cover rather libburn than -# cdrskin unless they put only emphasis on the cdrecord emulation -# provided by cdrskin. libburn contains cdrskin - cdrskin is an -# oscillating, friendly and coordinated fork of libburn. -# -# Script results are a source tarball and two binaries -# one dynamic and one static in respect to system libs. -# Both binaries are static in respect to libburn. -# -# The script is to be run in the directory above the toplevel -# directory of libburn resp. cdrskin development. -# -# libburn version used: http://libburn.pykix.org -# Downloaded by: -# $ svn co http://libburn-svn.pykix.org/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" -# Historic moments: -# original="./libburn_svn_A60815.tgz" -# original="./libburn_cdrskin_A60819.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 - -changes="./libburn-0.2.3.ts.develop" -skin_release="0.2.6" -patch_level=".pl01" -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" -cdrskin_tarball_svn="./cdrskin-${skin_rev}.svn.tar.gz" - -# (This once earned me an embarrassingly blooping source tarball) -# compile_dir="$changes" - -compile_dir="$target" -compile_cmd="./cdrskin/compile_cdrskin.sh" -compile_static_opts="-static" -compile_result="cdrskin/cdrskin" - -bintarget_dynamic="cdrskin_${skin_rev}-x86-suse9_0" -bintarget_static="$bintarget_dynamic"-static - -if test -d "$changes" -then - dummy=dummy -else - echo "$0 : FATAL : no directory $changes" >&2 - exit 1 -fi - -for i in "$target" "$intermediate" -do - if test -e "$i" - then - echo "$0 : FATAL : already existing $i" >&2 - exit 2 - fi -done - -if test -f "$original" -then - dummy=dummy -else - echo "$0 : FATAL : no file $original" >&2 - exit 3 -fi - - -# Unpack SVN snapshot. -tar xzf "$original" - - -# Rename the directory to the cdrskin name -mv "$intermediate" "$target" - - -# Copy the changes from the development tree -# -cdrskin_dir="$changes"/cdrskin -libburn_dir="$changes"/libburn -cdrskin_target="$target"/cdrskin -libburn_target="$target"/libburn - -# Create version timestamp -timestamp="$(date -u '+%Y.%m.%d.%H%M%S')" -echo "$timestamp" -echo '#define Cdrskin_timestamP "'"$timestamp"'"' >"$cdrskin_dir"/cdrskin_timestamp.h - -# Add the cdrskin files -if test -e "$cdrskin_target" -then - rm -rf "$cdrskin_target" -fi -cp -a "$cdrskin_dir" "$cdrskin_target" - -# Remove copied binaries -rm "$cdrskin_target"/*.o -rm "$cdrskin_target"/cdrfifo -rm "$cdrskin_target"/cdrskin -rm "$cdrskin_target"/cleanup -for i in std new make old -do - if test -e "$cdrskin_target"/cdrskin_"$i" - then - rm "$cdrskin_target"/cdrskin_"$i" - fi -done -for i in .deps .dirstamp .libs -do - if test -e "$cdrskin_target"/"$i" - then - rm -rf "$cdrskin_target"/"$i" - fi -done - -# Remove unwanted SVN stuff (TODO: avoid downloading it) -for i in "$target"/.svn "$target"/*/.svn -do - if test "$i" = "$target"'/*/.svn' - then - dummy=dummy - else - if test -e "$i" - then - rm -rf "$i" - fi - 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" - - -# Get over dependecy on autotools. Rely only on cc, make et. al. -# This is not the same as "make dist" but i can do it without -# having to evaluate the quality of said "make dist" -# -( cd "$target" ; ./bootstrap ) - -# Remove unwanted stuff after bootstrap -for i in "$target"/autom4te.cache -do - if echo "$i" | grep '\*' >/dev/null - then - dummy=dummy - else - if test -e "$i" - then - rm -rf "$i" - fi - fi -done - - -# Pack it up to the new libburn+cdrskin-tarball -tar czf "$cdrskin_tarball" "$target" - -# Produce a static and a dynamic binary -( - cd "$compile_dir" || exit 1 - ./configure - make - $compile_cmd -do_strip - cp "$compile_result" "../$bintarget_dynamic" - if test -n "$compile_static_opts" - then - $compile_cmd $compile_static_opts -do_strip - cp "$compile_result" "../$bintarget_static" - fi -) - -# Remove the build area -# Disable this for debugging the merge process -rm -rf "$target" - -# Show the result -./"$bintarget_dynamic" -version -./"$bintarget_static" -version -ls -l "$cdrskin_tarball" -ls -l "$bintarget_dynamic" -ls -l "$bintarget_static" - diff --git a/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_7 b/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_3_0 similarity index 93% rename from libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_7 rename to libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_3_0 index 5f870b8e..8c4eed91 100755 --- a/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_2_7 +++ b/libburn/tags/ZeroThreeZero/cdrskin/add_ts_changes_to_libburn_0_3_0 @@ -33,10 +33,10 @@ 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_rev="0.3.0" # The result directory and the name of the result tarballs target="./cdrskin-${skin_rev}" @@ -123,10 +123,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 +135,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 +163,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"