Changed versioning and tarball name to match unpack directory name

libisoburn/trunk/xorriso/make_xorriso_standalone.sh

@@ -12,21 +12,21 @@
 #   libisofs           libburn         libisoburn
 # obtained by following instructions on http://libburnia-project.org.
 #
-# It creates a standalone tree for building GNU xorriso
-# from the contents of a unified libburnia development tree.
+# It creates a new directory tree
+#   xorriso-standalone
+# for building GNU xorriso.
 #
 # The ./bootstrap script gets applied and a source tarball
 # is made.
 #
-# From that tree can be build a binary xorriso/xorriso
-# which at runtime depends only on libc and libpthread.
-# Execute in $lone_dir :
+# From that tree can be build a binary xorriso/xorriso which at runtime
+# does not depend on installed libburnia libraries.
+# Execute in xorriso-standalone :
 #
 #   ./configure && make
 #
 
-# By the following variable setting
-#   create_gnu_xorriso="yes"
+# By the variable setting  create_gnu_xorriso="yes"
 # the result will become a GNU xorriso tarball under GPLv3+.
 # Without this setting, the result is technically equivalent but
 # stays under GPLv2+. In that case the files xorriso/*_gnu_xorriso
@@ -41,10 +41,10 @@ current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
 xorriso_rev=0.4.9
-# For unstable uploads:
+# For unstable uploads and patch level 0 of stable releases:
 xorriso_pl=""
-# For stable releases:
-## xorriso_pl=".pl00"
+# For higher patch levels of stable releases:
+## xorriso_pl=".pl01"
 
 with_bootstrap_tarball=1
 
@@ -247,7 +247,7 @@ fi
 if test "$with_bootstrap_tarball" = 1
 then
 
-tarball_dir="$current_dir"/xorriso-"$xorriso_rev"
+tarball_dir="$current_dir"/xorriso-"$xorriso_rev""$xorriso_pl"
 mv "$lone_dir" "$tarball_dir"
 
 goto_dir "$tarball_dir"
@@ -270,6 +270,17 @@ rm -r ./autom4te.cache
  chmod a+rx,go-w,u+w ./configure
 )
 
+if test "$create_gnu_xorriso" = "yes"
+then
+  # ftp-upload@gnu.org dislikes my automake 1.9 and its chmod a+rwx
+  sed -e 's/by automake 1.9.6/by automake 1.11.1/' \
+      -e 's/-perm -777 -exec chmod a+rwx/-perm -755 -exec chmod u+rwx,go+rx/' \
+      < Makefile.in  > new_Makefile.in
+  
+  mv new_Makefile.in Makefile.in
+fi
+
+
 cd "$current_dir"
 tar czf ./xorriso-"$xorriso_rev""$xorriso_pl".tar.gz $(basename "$tarball_dir")
 

libisoburn/trunk/xorriso/xorriso.c

@@ -19148,9 +19148,11 @@ int Xorriso_option_use_readline(struct XorrisO *xorriso, char *mode, int flag)
 int Xorriso_option_version(struct XorrisO *xorriso, int flag)
 {
 #ifdef Xorriso_GNU_xorrisO
- sprintf(xorriso->result_line, "GNU xorriso %s\n", Xorriso_program_versioN);
+ sprintf(xorriso->result_line, "GNU xorriso %s%s\n",
+         Xorriso_program_versioN, Xorriso_program_patch_leveL);
 #else
- sprintf(xorriso->result_line, "xorriso %s\n", Xorriso_program_versioN);
+ sprintf(xorriso->result_line, "xorriso %s%s\n",
+         Xorriso_program_versioN, Xorriso_program_patch_leveL);
 #endif /* ! Xorriso_GNU_xorrisO */
  Xorriso_result(xorriso, 0);
  sprintf(xorriso->result_line,
@@ -19159,7 +19161,8 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag)
 "Copyright (C) 2010, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n");
  Xorriso_result(xorriso, 0);
  sprintf(xorriso->result_line,
-         "xorriso version   :  %s\n", Xorriso_program_versioN);
+         "xorriso version   :  %s%s\n",
+         Xorriso_program_versioN, Xorriso_program_patch_leveL);
  sprintf(xorriso->result_line+strlen(xorriso->result_line),
          "Version timestamp :  %s\n",Xorriso_timestamP);
  sprintf(xorriso->result_line+strlen(xorriso->result_line),
@@ -20607,6 +20610,12 @@ char *Xorriso__get_version_text(int flag)
 }
 
 
+char *Xorriso__get_patch_level_text(int flag)
+{
+ return(Xorriso_program_patch_leveL);
+}
+
+
 
 #endif /* ! Xorriso_without_subS */
 
@@ -20633,13 +20642,13 @@ char *Xorriso__get_version_text(int flag)
 static void yell_xorriso()
 {
  fprintf(stderr,
-     "%sxorriso %s : RockRidge filesystem manipulator, libburnia project.\n\n",
+   "%sxorriso %s%s : RockRidge filesystem manipulator, libburnia project.\n\n",
 #ifdef Xorriso_GNU_xorrisO
-     "GNU ",
+        "GNU ",
 #else
-     "",
+        "",
 #endif
-     Xorriso_main_program_versioN);
+        Xorriso_main_program_versioN, Xorriso_program_patch_leveL);
 }
 
 

libisoburn/trunk/xorriso/xorriso.h

@@ -17,18 +17,28 @@ struct XorrisO;
 
 
 #define Xorriso_program_versioN "0.4.9"
+#define Xorriso_program_patch_leveL ""
 
 
 /* --------------------- Fundamental Management ------------------- */
 
 
 /* Get the version text (e.g. "0.4.2") of the program code.
+   This may differ from Xorriso_program_versioN if xorriso is dynamically
+   linked to an application.
    @param flag     unused yet, submit 0
    @return         readonly character string
 */
 char *Xorriso__get_version_text(int flag);
 
 
+/* Get the patch level text (e.g. "" or ".pl01") of the program code.
+   @param flag     unused yet, submit 0
+   @return         readonly character string
+*/
+char *Xorriso__get_patch_level_text(int flag);
+
+
 /* Mandatory call:
    Create a new xorriso object and tell it the program name to be used
    with messages and for decision of special behavior.

libisoburn/trunk/xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.02.19.172125"
+#define Xorriso_timestamP "2010.02.22.195623"