From 0fd4f315ad23ae53cb2dfd9419c4fabf1cbedf9d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 15 Feb 2008 21:19:24 +0000 Subject: [PATCH] Version leap to 0.1.1 --- libisoburn/trunk/README | 19 ++++--- libisoburn/trunk/configure.ac | 22 ++++---- libisoburn/trunk/libisoburn/libisoburn.h | 35 +++++++++--- libisoburn/trunk/xorriso/README | 17 +++--- libisoburn/trunk/xorriso/compile_xorriso.sh | 13 +++-- libisoburn/trunk/xorriso/configure_ac.txt | 14 +---- .../trunk/xorriso/make_xorriso_standalone.sh | 27 ++++++---- libisoburn/trunk/xorriso/xorriso_eng.html | 53 +++++++++---------- libisoburn/trunk/xorriso/xorriso_private.h | 2 +- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.h | 4 +- 11 files changed, 116 insertions(+), 92 deletions(-) diff --git a/libisoburn/trunk/README b/libisoburn/trunk/README index a83c6948..f08ffb65 100644 --- a/libisoburn/trunk/README +++ b/libisoburn/trunk/README @@ -25,17 +25,17 @@ By using this software you agree to the disclaimer at the end of this text: Compilation, First Glimpse, Installation -Dynamic library and compile time header requirements for libisoburn-0.1.0 : +Dynamic library and compile time header requirements for libisoburn-0.1.1 : - libburn.so.4 , version libburn-0.4.2 or higher - libisofs.so.6 , version libisofs-0.6.2 or higher libisoburn and xorriso will not start with libraries which are older than their headers seen at compile time. So compile in the oldest possible installation setup unless you have reason to enforce a newer bug fix level. -Obtain libisoburn-0.1.0.tar.gz, take it to a directory of your choice and do: +Obtain libisoburn-0.1.1.tar.gz, take it to a directory of your choice and do: - tar xzf libisoburn-0.1.0.tar.gz - cd libisoburn-0.1.0 + tar xzf libisoburn-0.1.1.tar.gz + cd libisoburn-0.1.1 Within that directory execute: @@ -53,12 +53,17 @@ as well as /usr/lib/libburn/libburn.h + xorriso + libisoburn includes a command line and dialog application named xorriso, which offers a substantial part of libisoburn features to shell scripts and -users. -After installation its documentation is available via - man xorriso +users. Its file xorriso/README describes a standlone tarball as first +preference for xorriso installation. +The installation described here produces a dynamically linked xorriso binary +as described in chapter "libisoburn" at the end of that text. +After installation documentation is available via + man xorriso Drives and Disk File Objects diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index 971dfea2..9f4e0af8 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libisoburn], [0.0.1], [http://libburnia-project.org]) +AC_INIT([libisoburn], [0.1.1], [http://libburnia-project.org]) AC_PREREQ([2.50]) dnl AC_CONFIG_HEADER([config.h]) @@ -14,7 +14,7 @@ dnl LT_CURREN, LT_AGE, LT_REVISION where SONAME becomes LT_CURRENT - LT_AGE dnl dnl These three are only copies to provide libtool with unused LT_RELEASE ISOBURN_MAJOR_VERSION=0 -ISOBURN_MINOR_VERSION=0 +ISOBURN_MINOR_VERSION=1 ISOBURN_MICRO_VERSION=1 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION @@ -24,13 +24,18 @@ AC_SUBST(ISOBURN_MICRO_VERSION) dnl AC_SUBST(ISOBURN_VERSION) dnl Libtool versioning -dnl Generate libisoburn.so.1.0.0 +dnl Generate libisoburn.so.1.x.y dnl SONAME will become LT_CURRENT - LT_AGE +dnl +dnl ts A80215 +dnl This is the developmen t version after stable release libisoburn.so.1.1.0 +dnl LT_CURRENT++, LT_AGE++ has not happened yet. dnl +dnl SONAME = 2 - 1 = 1 . Library name = libburn.so.1.1.1 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION -LT_CURRENT=1 -LT_AGE=0 -LT_REVISION=0 +LT_CURRENT=2 +LT_AGE=1 +LT_REVISION=1 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` AC_SUBST(LT_RELEASE) @@ -83,15 +88,12 @@ AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , REA AC_SUBST(READLINE_DEF) -dnl >>> How to check for proper library versions ? -dnl >>> would need libburn-0.4.2 or higher .so.4 -dnl >>> would need libisofs-0.6.1 or higher .so.6 AC_CHECK_HEADER(libburn/libburn.h) AC_CHECK_HEADER(libisofs/libisofs.h) dnl Check for proper library versions LIBBURN_REQUIRED=0.4.2 -LIBISOFS_REQUIRED=0.6.1 +LIBISOFS_REQUIRED=0.6.2 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED) PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED) diff --git a/libisoburn/trunk/libisoburn/libisoburn.h b/libisoburn/trunk/libisoburn/libisoburn.h index 341a2abb..10ba2a15 100644 --- a/libisoburn/trunk/libisoburn/libisoburn.h +++ b/libisoburn/trunk/libisoburn/libisoburn.h @@ -62,12 +62,12 @@ libburn demands rw-permissions to drive device file resp. file object. If the input drive provides a suitable ISO RockRidge image, then its tree may be loaded into memory and can then be manipulated by libisofs API calls. The loading is done by isoburn_read_image() under control of -struct isoburn_read_opts which the application obtains from libisoburn. -It may be manipulated by the family of isoburn_ropt_set_*() functions. +struct isoburn_read_opts which the application obtains from libisoburn +and manipulates by the family of isoburn_ropt_set_*() functions. Writing of result images is controlled by libisofs related parameters -in a struct isoburn_imgen_opts which the application obtains from libisoburn. -It may be manipulated by the family of isoburn_igopt_set_*() functions. +in a struct isoburn_imgen_opts which the application obtains from libisoburn +and manipulates by the family of isoburn_igopt_set_*() functions. All multi-session aspects are handled by libisoburn according to these settings. The application does not have to analyze media state and write @@ -164,12 +164,19 @@ int isoburn_is_compatible(int major, int minor, int micro, int flag); Pare numbers indicate a version with frozen API. I.e. you can rely on the same set of features to be present in all published releases with that major.minor.micro combination. + Features of a pare release will stay available and ABI + compatible as long as the SONAME of libisoburn stays "1". + Currently there are no plans to ever change the SONAME. + Odd numbers indicate that API upgrades are in progress. I.e. new features might be already present or they might - be still missing. + be still missing. Newly introduced features may be changed + incompatibly or even be revoked before release of a pare + version. So micro revisions {1,3,5,7,9} should never be used for dynamic linking unless the proper library match can be guaranteed by external circumstances. + @return 1 success, <=0 might in future become an error indication */ void isoburn_version(int *major, int *minor, int *micro); @@ -224,13 +231,13 @@ int isoburn_libburn_req(int *major, int *minor, int *micro); @since 0.1.0 */ #define isoburn_header_version_major 0 -#define isoburn_header_version_minor 0 +#define isoburn_header_version_minor 1 #define isoburn_header_version_micro 1 /** Note: Above version numbers are also recorded in configure.ac because libtool wants them as parameters at build time. - For the library compatibility check ISOBURN_*_VERSION in configure.ac - are not decisive. Only the three numbers above do matter. + For the library compatibility check, ISOBURN_*_VERSION in configure.ac + are not decisive. Only the three numbers here do matter. */ /** Usage discussion: @@ -273,8 +280,20 @@ at the cost of excluding some older libraries. These two advises are mutually exclusive. +----------------------------------------------------- + For an implementation of the Thomas Schmitt approach, see libisoburn/burn_wrap.c : isoburn_initialize() +This connects libisoburn as "application" with libisofs +as "library". + +The compatible part of Vreixo Formoso's approach is implemented +in configure.ac LIBBURN_REQUIRED, LIBISOFS_REQUIRED. +In isoburn_initialize() it would rather test by + iso_lib_is_compatible(isoburn_libisofs_req_major,... +than by + iso_lib_is_compatible(iso_lib_header_version_major,... +and would leave out the ugly compile time traps. */ diff --git a/libisoburn/trunk/xorriso/README b/libisoburn/trunk/xorriso/README index 0f844691..fd4636ee 100644 --- a/libisoburn/trunk/xorriso/README +++ b/libisoburn/trunk/xorriso/README @@ -4,7 +4,7 @@ xorriso. By Thomas Schmitt Integrated sub project of libburnia-project.org but also published via: http://scdbackup.sourceforge.net/xorriso_eng.html -http://scdbackup.sourceforge.net/xorriso-0.1.0.tar.gz +http://scdbackup.sourceforge.net/xorriso-0.1.1.tar.gz Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2. ------------------------------------------------------------------------------ @@ -27,17 +27,18 @@ By using this software you agree to the disclaimer at the end of this text: Compilation, First Glimpse, Installation -The most simple way to get xorriso is the xorriso standalone tarball. +The most simple way to get xorriso from source code is the xorriso standalone +tarball. Prerequisites: The tarball contains anything that is needed except libc and libpthread. -libreadline and the libreadline-dev headers will make dialog mode -more convenient, but are not mandatory. +libreadline and the readline-dev headers will make dialog mode more convenient, +but are not mandatory. -Obtain xorriso-0.1.0.tar.gz, take it to a directory of your choice and do: +Obtain xorriso-0.1.1.tar.gz, take it to a directory of your choice and do: - tar xzf xorriso-0.1.0.tar.gz - cd xorriso-0.1.0 + tar xzf xorriso-0.1.1.tar.gz + cd xorriso-0.1.1 Within that directory execute: @@ -159,7 +160,7 @@ and a matching dynamically linked xorriso binary. This binary is leaner but depends on properly installed libraries of suitable revision. -Dynamic library and compile time header requirements for libisoburn-0.1.0 : +Dynamic library and compile time header requirements for libisoburn-0.1.1 : - libburn.so.4 , version libburn-0.4.2 or higher - libisofs.so.6 , version libisofs-0.6.2 or higher libisoburn and xorriso will not start with libraries which are older than their diff --git a/libisoburn/trunk/xorriso/compile_xorriso.sh b/libisoburn/trunk/xorriso/compile_xorriso.sh index d38b567f..85732da9 100755 --- a/libisoburn/trunk/xorriso/compile_xorriso.sh +++ b/libisoburn/trunk/xorriso/compile_xorriso.sh @@ -1,9 +1,14 @@ #!/bin/sh -# compile_xorriso.sh -# Copyright 2005 - 2007 Thomas Schmitt, scdbackup@gmx.net, GPL -# to be executed in a common parent of the directories given with -# $isofs $isoburn $burn +# compile_xorriso.sh +# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL +# +# Not intended for general use in production installations ! +# Rather use: ./bootstrap ; ./configure ; make +# +# This is a development tool which expects a special setup of directories. +# It is to be executed in a common parent of the directories given with +# $isofs $isoburn $burn $xorr isofs=./nglibisofs-develop/libisofs burn=./libburn-develop/libburn diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt index 2ec52f8f..422bb34e 100644 --- a/libisoburn/trunk/xorriso/configure_ac.txt +++ b/libisoburn/trunk/xorriso/configure_ac.txt @@ -1,4 +1,4 @@ -AC_INIT([xorriso], [0.1.0], [http://libburnia-project.org]) +AC_INIT([xorriso], [0.1.1], [http://libburnia-project.org]) AC_PREREQ([2.50]) dnl AC_CONFIG_HEADER([config.h]) @@ -21,18 +21,8 @@ AC_SUBST(LIBISOFS_MAJOR_VERSION) AC_SUBST(LIBISOFS_MINOR_VERSION) AC_SUBST(LIBISOFS_MICRO_VERSION) -dnl The API version codes are now defined in libisoburn/libisoburn.h +dnl The API version codes are defined in libisoburn/libisoburn.h dnl #define isoburn_header_version_* -dnl configure.ac only rules the libtool revision numbering about -dnl LT_CURREN, LT_AGE, LT_REVISION where SONAME becomes LT_CURRENT - LT_AGE -dnl -dnl These three are only copies to provide libtool with unused LT_RELEASE -dnl ISOBURN_MAJOR_VERSION=0 -dnl ISOBURN_MINOR_VERSION=0 -dnl ISOBURN_MICRO_VERSION=1 -dnl AC_SUBST(ISOBURN_MAJOR_VERSION) -dnl AC_SUBST(ISOBURN_MINOR_VERSION) -dnl AC_SUBST(ISOBURN_MICRO_VERSION) AC_PREFIX_DEFAULT([/usr/local]) diff --git a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh b/libisoburn/trunk/xorriso/make_xorriso_standalone.sh index b95fdc53..9532e3ec 100755 --- a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh +++ b/libisoburn/trunk/xorriso/make_xorriso_standalone.sh @@ -1,15 +1,20 @@ #!/bin/sh -# +# make_xorriso_standalone.sh # Copyright 2008 Thomas Schmitt, scdbackup@gmx.net, GPL # +# Not intended for general use in production installations ! +# +# This is a development tool which expects a special setup of directories. +# It is to be executed in a common parent of the directories +# nglibisofs-develop libburn-develop libisoburn-develop +# # Creates a standalone tree for building xorriso # from the contents of a unified libburnia development tree. +# # The ./bootstrap script gets applied and a source tarball # is made. # -# To be executed in the parent of the *-develop directories. -# # From that tree can be build a binary xorriso/xorriso # which at runtime depends only on libc and libpthread. # Execute in $lone_dir : @@ -20,7 +25,8 @@ current_dir=$(pwd) lone_dir="$current_dir"/"xorriso-standalone" -xorriso_rev=0.0.1 +xorriso_rev=0.1.1 +# For unstable uploads: xorriso_pl="" # For stable releases: # xorriso_pl=".pl00" @@ -32,7 +38,7 @@ create_dir() { then dummy=dummy else - echo "Failed to create : $r1o" >&2 + echo "Failed to create : $1" >&2 exit 1 fi } @@ -73,6 +79,9 @@ create_dir "$lone_dir" copy_files \ AUTHORS \ CONTRIBUTORS \ + COPYRIGHT \ + COPYING \ + INSTALL \ acinclude.m4 \ aclocal.m4 \ bootstrap \ @@ -98,7 +107,7 @@ copy_files xorriso/xorriso_pc_in.txt "$lone_dir"/xorriso.pc.in copy_files xorriso/README "$lone_dir"/README -echo "See end of xorriso/changelog.txt" >"$lone_dir"/TODO +# echo "See end of xorriso/changelog.txt" >"$lone_dir"/TODO # libisoburn @@ -127,14 +136,12 @@ copy_files \ "$lone_dir"/test/compare_file.c -# >>> create compile_xorriso.sh for standalone - - # nglibisofs create_dir "$lone_dir"/libisofs goto_dir "$current_dir"/nglibisofs-develop copy_files libisofs/*.[ch] "$lone_dir"/libisofs +copy_files COPYRIGHT "$lone_dir"/libisofs # To get a common version.h cat version.h.in >> "$lone_dir"/version.h.in @@ -176,8 +183,8 @@ fi create_dir "$lone_dir"/libburn goto_dir "$current_dir"/libburn-develop copy_files libburn/*.[ch] "$lone_dir"/libburn +copy_files COPYRIGHT "$lone_dir"/libburn -copy_files COPYING "$lone_dir"/COPYING # To get a common version.h cat version.h.in >> "$lone_dir"/version.h.in diff --git a/libisoburn/trunk/xorriso/xorriso_eng.html b/libisoburn/trunk/xorriso/xorriso_eng.html index 30df1a67..919624b7 100644 --- a/libisoburn/trunk/xorriso/xorriso_eng.html +++ b/libisoburn/trunk/xorriso/xorriso_eng.html @@ -62,9 +62,9 @@ GPL software included:
reads and writes data from and to CD and DVD.
(founded by Derek Foreman and Ben Jansens, furthered by team of libburnia-project.org)
-
libisofs-0.6.1
+
libisofs-0.6.2
operates ISO 9660 images.
-
(By Vreixo Formoso from team of libburnia-project.org)
+
(By Vreixo Formoso and Mario Danic from team of libburnia-project.org)
libisoburn-0.1.0
coordinates libburn and libisofs, emulates multi-session where needed.
(By Vreixo Formoso and Thomas Schmitt @@ -119,6 +119,9 @@ Reads its instructions from command line arguments, dialog, and batch files.
  • Provides navigation commands for interactive ISO image manipulation.
    • +
  • +Adjustable thresholds for abort, exit value, and problem reporting. +

    • @@ -264,8 +267,8 @@ Testers wanted who are willing to risk some double layer DVD media.

    Download as source code (see README):
    -
    xorriso-0.1.0.tar.gz -( KB). +
    xorriso-0.1.0.pl00.tar.gz +(900 KB).
    +

    --->

    diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h index 44cea47b..caecb46a 100644 --- a/libisoburn/trunk/xorriso/xorriso_private.h +++ b/libisoburn/trunk/xorriso/xorriso_private.h @@ -18,7 +18,7 @@ #ifndef Xorriso_private_includeD #define Xorriso_private_includeD yes -#define Xorriso_program_versioN "0.0.1" +#define Xorriso_program_versioN "0.1.1" /** The source code release timestamp */ #include "xorriso_timestamp.h" diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d7567536..0b3982a6 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.02.14.182351" +#define Xorriso_timestamP "2008.02.15.211836" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.h b/libisoburn/trunk/xorriso/xorrisoburn.h index 413a26a3..5fb0707b 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.h +++ b/libisoburn/trunk/xorriso/xorrisoburn.h @@ -20,8 +20,8 @@ struct FindjoB; /* The minimum version of libisoburn to be used with this version of xorriso */ #define xorriso_libisoburn_req_major 0 -#define xorriso_libisoburn_req_minor 0 -#define xorriso_libisoburn_req_micro 1 +#define xorriso_libisoburn_req_minor 1 +#define xorriso_libisoburn_req_micro 0 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);