summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatti Paaso <matti.paaso@digia.com>2014-01-13 09:15:34 +0200
committerMatti Paaso <matti.paaso@digia.com>2014-01-13 11:03:03 +0200
commit3f0e7097bab3de06dc96079bfffd7fb8e19d7ed9 (patch)
tree6e522c2ec74e47aba5b0c10f15f7681732847668 /tools
parentf18a02659fa65322afc47b6fdd21eca821321b27 (diff)
Docs archive creation corrected.
Added doc-directory for docs. Change-Id: Ied0f812c019ee750806a0f0726c1c5424859f8d4 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/generate_package_linux.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/generate_package_linux.sh b/tools/generate_package_linux.sh
index 5a70d1e9..f9522ba6 100755
--- a/tools/generate_package_linux.sh
+++ b/tools/generate_package_linux.sh
@@ -36,7 +36,8 @@ CHARTS_EXAMPLES_TEMP_TAR_FULL=$CHARTS_TEMP_DIR_FULL/$CHARTS_EXAMPLES_TEMP_TAR
CHARTS_EXAMPLES_FINAL_TAR=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-examples-$CHARTS_VERSION.tar
CHARTS_EXAMPLES_FINAL_7Z=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-examples-$CHARTS_VERSION.7z
-CHARTS_DOCS_UNTAR_NAME=qt-charts-enterprise-docs-$CHARTS_VERSION
+# CHARTS_DOCS_UNTAR_NAME=qt-charts-enterprise-docs-$CHARTS_VERSION
+CHARTS_DOCS_UNTAR_NAME=doc
CHARTS_DOCS_UNTAR_DIR=$CHARTS_TEMP_DIR_FULL/$CHARTS_DOCS_UNTAR_NAME
CHARTS_DOCS_TEMP_TAR=qt-charts-enterprise-docs-temp-$CHARTS_VERSION.tar
CHARTS_DOCS_TEMP_TAR_FULL=$CHARTS_TEMP_DIR_FULL/$CHARTS_DOCS_TEMP_TAR
@@ -84,8 +85,7 @@ mkdir - $CHARTS_DOCS_UNTAR_DIR/qtcharts 2> /dev/null
cp $CHARTS_BUILD_DIR/doc/qch/qtcharts.qch $CHARTS_DOCS_UNTAR_DIR
cp $CHARTS_BUILD_DIR/doc/html/examples-manifest.xml $CHARTS_DOCS_UNTAR_DIR/qtcharts
cp $CHARTS_BUILD_DIR/doc/html/demos-manifest.xml $CHARTS_DOCS_UNTAR_DIR/qtcharts
-cd $CHARTS_DOCS_UNTAR_DIR
-7z a $CHARTS_DOCS_FINAL_7Z * > /dev/null
+7z a $CHARTS_DOCS_FINAL_7Z $CHARTS_DOCS_UNTAR_DIR > /dev/null
cd $CHARTS_CURRENT_DIR
echo Copying generated files to $CHARTS_PACKAGE_UNTAR_DIR