summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatti Paaso <matti.paaso@digia.com>2014-01-08 11:22:55 +0200
committerMatti Paaso <matti.paaso@digia.com>2014-01-08 13:58:32 +0200
commitf18a02659fa65322afc47b6fdd21eca821321b27 (patch)
tree9499a17c3033076c2280b12a2b5266b7a9ee0724 /tools
parente045f46957d963e2e6d637dd3d0ed1a5222bc293 (diff)
generate_package_linux.sh modified.
Doc archive changed into 7z, so it can used in all environments. Examples archive , also 7z created. src archives tar.gz, zip and 7z created. Archive names harmonized to match all other submodules. Change-Id: I4bbf9aa99bd584100863d3fe466903dbc6134747 Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/generate_package_linux.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/tools/generate_package_linux.sh b/tools/generate_package_linux.sh
index b82baa84..5a70d1e9 100755
--- a/tools/generate_package_linux.sh
+++ b/tools/generate_package_linux.sh
@@ -25,20 +25,24 @@ CHARTS_PACKAGE_UNTAR_NAME=qt-charts-enterprise-src-$CHARTS_VERSION
CHARTS_PACKAGE_UNTAR_DIR=$CHARTS_TEMP_DIR_FULL/$CHARTS_PACKAGE_UNTAR_NAME
CHARTS_TEMP_TAR=qt-charts-enterprise-src-temp-$CHARTS_VERSION.tar
CHARTS_TEMP_TAR_FULL=$CHARTS_TEMP_DIR_FULL/$CHARTS_TEMP_TAR
-CHARTS_FINAL_TAR=$CHARTS_CURRENT_DIR/../qt-charts-enterprise-src-$CHARTS_VERSION.tar
-CHARTS_FINAL_ZIP=$CHARTS_CURRENT_DIR/../qt-charts-enterprise-src-$CHARTS_VERSION.zip
+CHARTS_FINAL_TAR=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-src-$CHARTS_VERSION.tar
+CHARTS_FINAL_ZIP=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-src-$CHARTS_VERSION.zip
+CHARTS_FINAL_7Z=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-src-$CHARTS_VERSION.7z
CHARTS_EXAMPLES_UNTAR_NAME=qt-charts-enterprise-examples-$CHARTS_VERSION
CHARTS_EXAMPLES_UNTAR_DIR=$CHARTS_TEMP_DIR_FULL/$CHARTS_EXAMPLES_UNTAR_NAME
CHARTS_EXAMPLES_TEMP_TAR=qt-charts-enterprise-examples-temp-$CHARTS_VERSION.tar
CHARTS_EXAMPLES_TEMP_TAR_FULL=$CHARTS_TEMP_DIR_FULL/$CHARTS_EXAMPLES_TEMP_TAR
-CHARTS_EXAMPLES_FINAL_TAR=$CHARTS_CURRENT_DIR/../qt-charts-enterprise-examples-$CHARTS_VERSION.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_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
-CHARTS_DOCS_FINAL_TAR=$CHARTS_CURRENT_DIR/../qt-charts-enterprise-docs-$CHARTS_VERSION.tar
+CHARTS_DOCS_FINAL_TAR=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-doc-$CHARTS_VERSION.tar
+CHARTS_DOCS_FINAL_ZIP=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-doc-$CHARTS_VERSION.zip
+CHARTS_DOCS_FINAL_7Z=$CHARTS_CURRENT_DIR/../qtcharts-enterprise-doc-$CHARTS_VERSION.7z
echo Exporting $CHARTS_BRANCH to $CHARTS_TEMP_TAR_FULL...
rm -r -f $CHARTS_TEMP_DIR_FULL 2> /dev/null
@@ -64,6 +68,7 @@ cp -r $CHARTS_BUILD_DIR/demos $CHARTS_EXAMPLES_UNTAR_DIR
cd $CHARTS_EXAMPLES_UNTAR_DIR
tar -cvf $CHARTS_EXAMPLES_FINAL_TAR * >/dev/null
gzip $CHARTS_EXAMPLES_FINAL_TAR >/dev/null
+7z a $CHARTS_EXAMPLES_FINAL_7Z * >/dev/null
cd $CHARTS_CURRENT_DIR
echo Generating includes, mkspecs, and docs in $CHARTS_BUILD_DIR...
@@ -80,8 +85,7 @@ 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
-tar -cvf $CHARTS_DOCS_FINAL_TAR * >/dev/null
-gzip $CHARTS_DOCS_FINAL_TAR >/dev/null
+7z a $CHARTS_DOCS_FINAL_7Z * > /dev/null
cd $CHARTS_CURRENT_DIR
echo Copying generated files to $CHARTS_PACKAGE_UNTAR_DIR
@@ -95,6 +99,7 @@ tar -cvf $CHARTS_FINAL_TAR $CHARTS_PACKAGE_UNTAR_NAME >/dev/null
gzip $CHARTS_FINAL_TAR >/dev/null
echo Zip $CHARTS_PACKAGE_UNTAR_NAME
zip -r -l $CHARTS_FINAL_ZIP $CHARTS_PACKAGE_UNTAR_NAME >/dev/null
+7z a $CHARTS_FINAL_7Z $CHARTS_PACKAGE_UNTAR_NAME >/dev/null
cd $CHARTS_CURRENT_DIR
exit 0