diff --git a/release.linux.sh b/release.linux.sh index fffc2450..6243016b 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -19,7 +19,7 @@ make clean rm -rf build/linux/release/ rm -rf install -QT_PATH="../Qt-sankore3.1" +QT_PATH="/usr/local/Trolltech/Qt-4.7.3" PLUGINS_PATH="$QT_PATH/plugins" QMAKE_PATH="$QT_PATH/bin/qmake" @@ -28,6 +28,7 @@ if [ ! -e "$QMAKE_PATH" ]; then exit 1 fi + if [ ! -e "$PLUGINS_PATH" ]; then echo "plugins path not found at $PLUGINS_PATH" exit 1 @@ -44,9 +45,9 @@ if [ ! -f build/linux/release/version ]; then else LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then - echo creating a tag with the version $VERSION - git tag -a "v$VERSION" -m "Generating setup for v$VERSION" - git push origin --tags + echo creating a tag with the version $VERSION +# git tag -a "v$VERSION" -m "Generating setup for v$VERSION" +# git push origin --tags fi fi @@ -66,16 +67,19 @@ mkdir $QT_LIBRARY_DEST_PATH QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib" copyQtLibrary(){ - if [ ! -e "$QT_LIBRARY_SOURCE_PATH/$1.so.4" ]; then + if [ ! -e "$QT_LIBRARY_SOURCE_PATH/$1.so.4.7.3" ]; then echo "library not found: $QT_LIBRARY_SOURCE_PATH" - exit 1; + exit 1 fi cp "$QT_LIBRARY_SOURCE_PATH/$1.so.4" "$QT_LIBRARY_DEST_PATH/" - cp "$QT_LIBRARY_SOURCE_PATH/$1.so.4.7.0" "$QT_LIBRARY_DEST_PATH/" + cp "$QT_LIBRARY_SOURCE_PATH/$1.so.4.7.3" "$QT_LIBRARY_DEST_PATH/" } + +cp "$QT_LIBRARY_SOURCE_PATH/libphonon.so.4" "$QT_LIBRARY_DEST_PATH/" +cp "$QT_LIBRARY_SOURCE_PATH/libphonon.so.4.4.0" "$QT_LIBRARY_DEST_PATH/" + copyQtLibrary libQtWebKit -copyQtLibrary libphonon copyQtLibrary libQtDBus copyQtLibrary libQtScript copyQtLibrary libQtSvg @@ -95,4 +99,4 @@ cd build/linux/release # "Removing .svn directories ..." find . -name .svn -exec rm -rf {} \; 2> /dev/null tar cvzf ../../../install/linux/Sankore\ 3.1.tar.gz Sankore_3.1.$VERSION -C . -echo "Build Finished"; alert +echo "Build Finished"