diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-16 17:32:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-16 17:32:23 +0200 |
| commit | fa0127bedda08ec3a35a9326d6131e24ad0f0682 (patch) | |
| tree | 599e1ba7ed5a5e60b2045f91b751e19d50008c69 /scripts | |
| parent | fcaa6b0d1b92e377afc3e23e74908c7e8df85627 (diff) | |
| parent | 5ded3e2f62c8d81669b8fc298648ca5cd81547f8 (diff) | |
| download | qt-creator-fa0127bedda08ec3a35a9326d6131e24ad0f0682.tar.gz | |
Merge remote-tracking branch 'origin/2.2'
Conflicts:
src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/cdb/cdbengine.cpp
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/createSrcAndDocPackage.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/createSrcAndDocPackage.sh b/scripts/createSrcAndDocPackage.sh index eb2b946e58..fc96e0846c 100755 --- a/scripts/createSrcAndDocPackage.sh +++ b/scripts/createSrcAndDocPackage.sh @@ -9,7 +9,7 @@ usage: Creates tar and zip source package from <refspec> and documentation-zip from current checkout. Files and directories are named after <version>. example: - $0 origin/2.0.0 2.0.0-rc1 + $0 origin/2.2 2.2.0 USAGE exit 1 fi @@ -21,10 +21,10 @@ echo "Creating tar archive..." git archive --format=tar --prefix=qt-creator-${VERSION}-src/ ${BRANCH} | gzip > qt-creator-${VERSION}-src.tar.gz || exit 1 echo "Creating zip archive..." git archive --format=zip --prefix=qt-creator-${VERSION}-src/ ${BRANCH} > qt-creator-${VERSION}-src.zip || exit 1 -echo "Creating documentation..." -rm -r doc/html -qmake -r && make docs_online || exit 1 -cd doc -cp -r html qt-creator-${VERSION} -zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION} -rm -r qt-creator-${VERSION} +#echo "Creating documentation..." +#rm -r doc/html +#qmake -r && make docs_online || exit 1 +#cd doc +#cp -r html qt-creator-${VERSION} +#zip -r ../qt-creator-${VERSION}-doc.zip qt-creator-${VERSION} +#rm -r qt-creator-${VERSION} |