bin/lo-generate-source-tarball | 53 +++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 25 deletions(-)
New commits: commit ef70fb9c2028aba7458453565a9f4b7ec0cc0ef8 Author: Andras Timar <[email protected]> Date: Tue Nov 12 10:23:04 2013 +0100 generate source tarballs for Debian/Singularity Change-Id: Ic037654465d9286ecfa054319ebe49ddd87b5284 diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index f020545..2d6d77d 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -137,7 +137,7 @@ pushd "${CORE_DIR}" > /dev/null echo "archiving core..." -git archive --format=tar --prefix="${base_name?}/" -o "${OUT_DIR}/${base_name}.tar" ${LABEL?} +git archive --format=tar -o "${OUT_DIR}/${base_name}.tar" ${LABEL?} concatenate_list= @@ -146,34 +146,40 @@ for module in dictionaries helpcontent2 translations ; do echo "Warning: module $module is not present" 1>&2 else echo "archiving ${module?}..." - git archive --format=tar --prefix="${base_name?}/${module?}" -o "${OUT_DIR}/${base_name}-${module?}.tar" ${LABEL?} - concatenate_list="${concatenate_list?} ${OUT_DIR}/${base_name}-${module?}.tar" + cd ${module?} + git archive --format=tar --prefix="${module?}/" -o "${OUT_DIR}/${base_name}-${module?}.tar" ${LABEL?} + cd .. fi done -if [ -n "${concatenate_list?}" ] ; then - tar --concatenate --file="${OUT_DIR}/${base_name}.tar" ${concatenate_list?} - rm ${concatenate_list?} -fi - if ${GEN_BZ2?} ; then echo "bzip2 compression..." - bzip2 -fkz "${OUT_DIR}/${base_name}.tar" + for i in ${OUT_DIR}/${base_name}*tar; do + bzip2 -fkz "$i" + done if ${GEN_MD5?} ; then echo "md5sum..." - md5sum "${OUT_DIR}/${base_name}.tar.bz2" > "${OUT_DIR}/${base_name}.tar.bz2.md5" + for i in ${OUT_DIR}/${base_name}*tar.bz2; do + md5sum "$i" > "$i.md5" + done fi fi if ${GEN_XZ?} ; then echo "xz compression..." - xz -fz "${OUT_DIR}/${base_name}.tar" + for i in ${OUT_DIR}/${base_name}*tar; do + xz -fz "$i" + done if ${GEN_MD5?} ; then echo "md5sum..." - md5sum "${OUT_DIR}/${base_name}.tar.xz" > "${OUT_DIR}/${base_name}.tar.xz.md5" + for i in ${OUT_DIR}/${base_name}*tar.xz; do + md5sum "$i" > "$i.md5" + done fi else - rm "${OUT_DIR}/${base_name}.tar" + for i in ${OUT_DIR}/${base_name}*tar; do + rm "$i" + done fi echo "Done." commit 5d56b81a79a1cf91c0b7cb12f92f4a7c08aee7be Author: Andras Timar <[email protected]> Date: Tue Nov 12 09:00:19 2013 +0100 --core-dir is not implemented Change-Id: Id12c36b6fc28f89e9e9d1aaedad5dc4f1a216313 diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index 6d905e6..f020545 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -16,7 +16,7 @@ usage() { cat <<EOF Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=<output location> ] - [ --core-dir=<core-repo-location ] [--version=<package_version] label + [--version=<package_version] label --xz generate a package compressed with xz (default) --bz2 generate a package compressed with bz2. Note if you specify @@ -24,9 +24,6 @@ Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=<output location> ] --xz is implied. --md5 generate a md5 signature for the generated package(s) --output-dir where to put the generated packages - --core-dir location of the core repo to extract sources from. - By default this is one directory up from the position - of this script. --version version string used to generate the name of the package the source package name is libreoffice-<version>.tar.[bz2|xz] commit a21cb5bf8dbddde0c6a6955260f934c70278632e Author: Andras Timar <[email protected]> Date: Tue Nov 12 08:59:08 2013 +0100 xz instead of zx Change-Id: Ifcf95b2e2bc3eb6df8ec3a558ebac25154c1493a diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index 78a9a1b..6d905e6 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -173,7 +173,7 @@ if ${GEN_XZ?} ; then xz -fz "${OUT_DIR}/${base_name}.tar" if ${GEN_MD5?} ; then echo "md5sum..." - md5sum "${OUT_DIR}/${base_name}.tar.xz" > "${OUT_DIR}/${base_name}.tar.zx.md5" + md5sum "${OUT_DIR}/${base_name}.tar.xz" > "${OUT_DIR}/${base_name}.tar.xz.md5" fi else rm "${OUT_DIR}/${base_name}.tar" commit 571d6ad17b84c7ca222ff8470d5c9237ce863c9b Author: Andras Timar <[email protected]> Date: Tue Nov 12 08:58:39 2013 +0100 set correct git archive prefix Change-Id: Ieb58119c8c33277ef8cf1e8bc8afeff5c7c547f4 diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index 1807e81..78a9a1b 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -140,7 +140,7 @@ pushd "${CORE_DIR}" > /dev/null echo "archiving core..." -git archive --format=tar --prefix="${base_name?}" -o "${OUT_DIR}/${base_name}.tar" ${LABEL?} +git archive --format=tar --prefix="${base_name?}/" -o "${OUT_DIR}/${base_name}.tar" ${LABEL?} concatenate_list= commit b436d04cbecac5eb2991161c310ea9d6a4d79a4f Author: Andras Timar <[email protected]> Date: Tue Nov 12 08:54:07 2013 +0100 it is helpcontent2, not helcontent2 Change-Id: Ia12efd8f69f32db29a84d4d9c94c179e1b3716a3 diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index 9f9e686..1807e81 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -144,7 +144,7 @@ git archive --format=tar --prefix="${base_name?}" -o "${OUT_DIR}/${base_name}.ta concatenate_list= -for module in dictionaries helcontent2 translations ; do +for module in dictionaries helpcontent2 translations ; do if [ ! -e ${module?}/.git ] ; then echo "Warning: module $module is not present" 1>&2 else commit c22f6e06f609144c64fbf36a9b93cc394adddd0a Author: Andras Timar <[email protected]> Date: Tue Nov 12 08:52:13 2013 +0100 .git can be a directory, too, in submodules Change-Id: I19367f168be1f2fa79d7e52915ab0269345b728c diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index 31d6f8e..9f9e686 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -145,7 +145,7 @@ git archive --format=tar --prefix="${base_name?}" -o "${OUT_DIR}/${base_name}.ta concatenate_list= for module in dictionaries helcontent2 translations ; do - if [ ! -f ${module?}/.git ] ; then + if [ ! -e ${module?}/.git ] ; then echo "Warning: module $module is not present" 1>&2 else echo "archiving ${module?}..." commit ad3850e4c27dfc250e2f2e798b3775c0436e6e43 Author: Andras Timar <[email protected]> Date: Mon Nov 11 14:01:12 2013 +0100 typo fixes Change-Id: I735005f2e311abf7b64cce6b67002fe6e0d60281 diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball index cbaace5..31d6f8e 100755 --- a/bin/lo-generate-source-tarball +++ b/bin/lo-generate-source-tarball @@ -20,15 +20,15 @@ Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=<output location> ] --xz generate a package compressed with xz (default) --bz2 generate a package compressed with bz2. Note if you specify - both --cz and --bz2, both are created. if you specify neither - --xz is impliied. - --md5 generate a md5 signature for the generated pacakge(s) + both --cz and --bz2, both are created. If you specify neither + --xz is implied. + --md5 generate a md5 signature for the generated package(s) --output-dir where to put the generated packages --core-dir location of the core repo to extract sources from. - by default this is one directory up from the position + By default this is one directory up from the position of this script. - --version version string used to generate the name of the pacakge - the source pacakge name is libreoffice-<version>.tar.[bz2|xz] + --version version string used to generate the name of the package + the source package name is libreoffice-<version>.tar.[bz2|xz] EOF } @@ -99,7 +99,7 @@ done # we need a label if [ -z "${LABEL}" ] ; then - echo "Missing argument. we need a git label as source" 1>&2 + echo "Missing argument. We need a git label as source" 1>&2 exit 1 fi _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
