Changeset 1060

Timestamp:

Sep 7, 2011, 11:51:20 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: CreateZIPs: Single directory in format qt-X.Y.Z-N in all ZIPs.

I.e. the prefix (develop, debuginfo) is removed from the directory name.
This allows to easily unpack everything to a single directory (as ti should
be).

File:

• packaging/CreateZIPs.sh (modified) (9 diffs)

packaging/CreateZIPs.sh

@@ -77 +77 @@
     local out_base_sym="$2"
 
+    [ -z "$out_base" -o -z "$out_base_sym" ] && \
+        die "create_zips: invalid arguments."
+
     run mkdir -p "$out_base_sym/"
 
@@ -89 +92 @@
 }
 
+create_zips()
+{
+    [ -z "$start_dir" -o -z "$out_dir" -o \
+      -z "$pkg_name" -o -z "$full_pkg_name" -o -z "$out_base" ] && \
+        die "create_zips: invalid arguments."
+
+    local out_base_sym="$out_dir/$full_pkg_name-debuginfo/$pkg_name-$ver_dots"
+
+    # .SYM files
+    split_out_sym "$out_base" "$out_base_sym"
+
+    local cwd=$(pwd)
+
+    run cd "$out_base/.."
+    run zip -SrX9 "$full_pkg_name-$ver_dots.zip" "$pkg_name-$ver_dots"
+    run mv "$full_pkg_name-$ver_dots.zip" "$start_dir/"
+
+    run cd "$out_base_sym/.."
+    run zip -SrX9 "$full_pkg_name-debuginfo-$ver_dots.zip" "$pkg_name-$ver_dots"
+    run mv "$full_pkg_name-debuginfo-$ver_dots.zip" "$start_dir/"
+
+    run cd "$cwd"
+}
+
 cmd_create()
 {
     local inst_base="$1"
-
-    [ -d $inst_base ] || die "'$inst_base' is not a directory."
+    local build_num="$2"
+
+    [ -d "$inst_base" ] || die "'$inst_base' is not a directory."
 
     local qconfig_pri="$inst_base/mkspecs/qconfig.pri"
@@ -112 +140 @@
     local ver_dots="$ver_major.$ver_minor.$ver_patch"
 
-    echo "Found Qt version $ver_dots."
+    echo "Found Qt version: $ver_dots"
+
+    [ -n "$build_num" ] && ver_dots="$ver_dots-$build_num"
+
+    echo "Full version ID:  $ver_dots"
 
     cmd_cleanup
@@ -119 +151 @@
     # commons
     #--------------------------------------------------------------------------
+
+    local pkg_name="qt"
 
     local designer_dlls="bin/QtDsg*.dll"
@@ -127 +161 @@
     #--------------------------------------------------------------------------
 
-    local out_base="$out_dir/qt-$ver_dots"
-    local out_base_sym="$out_dir/qt-debuginfo-$ver_dots"
+    local full_pkg_name="qt"
+    local out_base="$out_dir/$full_pkg_name/$pkg_name-$ver_dots"
 
     # Readmes
@@ -166 +200 @@
     > "$out_base/bin/qt.conf"
 
-    # .SYM files
-    split_out_sym "$out_base" "$out_base_sym"
-
-    # ZIPs
-    run cd "$out_base"
-    run zip -SrX9 "${out_base##*/}.zip" "."
-    run mv "${out_base##*/}.zip" "$start_dir/"
-    #
-    run cd "$out_base_sym"
-    run zip -SrX9 "${out_base_sym##*/}.zip" "."
-    run mv "${out_base_sym##*/}.zip" "$start_dir/"
-    #
-    run cd "$start_dir"
+    create_zips
 
     #--------------------------------------------------------------------------
@@ -184 +206 @@
     #--------------------------------------------------------------------------
 
-    local out_base="$out_dir/qt-develop-$ver_dots"
-    local out_base_sym="$out_dir/qt-develop-debuginfo-$ver_dots"
+    local full_pkg_name="qt-develop"
+    local out_base="$out_dir/$full_pkg_name/$pkg_name-$ver_dots"
 
     # Readmes
@@ -235 +257 @@
     cp_files_inst_out "translations/linguist_*"
 
-    # .SYM files
-    split_out_sym "$out_base" "$out_base_sym"
-
-    # ZIPs
-    run cd "$out_base"
-    run zip -SrX9 "${out_base##*/}.zip" "."
-    run mv "${out_base##*/}.zip" "$start_dir/"
-    #
-    run cd "$out_base_sym"
-    run zip -SrX9 "${out_base_sym##*/}.zip" "."
-    run mv "${out_base_sym##*/}.zip" "$start_dir/"
-    #
-    run cd "$start_dir"
+    create_zips
 
     cmd_cleanup
@@ -274 +284 @@
 "
 Usage:
-  $script_name -i <dir>   Create all ZIPs.
-  $script_name cleanup    Remove what this script creates (except ZIPs).
+  $script_name all [options]    Create ZIPs.
+  $script_name cleanup          Remove what this script creates (except ZIPs).
 
 Options:
-  -i <dir>  Qt installation tree location
+  <instdir>     (*) Qt installation tree location
+  <bldnum>          Build number [none]
 "
 }
-
-while getopts h?i: OPT; do
-    case $OPT in
-        i) OPT_install_dir=$OPTARG;;
-        h | ?) OPT_help=1
-    esac
-done
-shift `expr $OPTIND - 1`
 
 case "$1" in
     cleanup) cmd_cleanup;;
-    "")
-        if [ -n "$OPT_install_dir" ]; then
-            cmd_create $(echo "$OPT_install_dir" | tr '\\' '/')
+    all)
+        if [ -n "$2" ]; then
+            cmd_create $(echo "$2" | tr '\\' '/') "$3"
         else
             cmd_help
         fi;;
-    *)
-        if [ -n "$OPT_help" ]; then cmd_help
-        else die "Invalid command '$1'"
-        fi;;
+    -h|-?|--help|*) cmd_help;;
 esac