From a2f53f15a32648002b4e665f4212e2db72ea1aca Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 12 Jan 2016 14:33:10 +0200 Subject: [PATCH] Remove obsolete tool scripts and fix sync.profile to make coin pass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4b0e5854a07c9f8413e9c9bca36c31ea77faa4fd Reviewed-by: Tomi Korpipää --- sync.profile | 4 +- tools/generate_package_linux.sh | 65 --------------------------------- tools/generate_package_win.cmd | 64 -------------------------------- 3 files changed, 2 insertions(+), 131 deletions(-) delete mode 100755 tools/generate_package_linux.sh delete mode 100644 tools/generate_package_win.cmd diff --git a/sync.profile b/sync.profile index b45c727c..4e9e40fe 100644 --- a/sync.profile +++ b/sync.profile @@ -10,6 +10,6 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/5.6", - "qtdeclarative" => "refs/heads/5.6", + "qtbase" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", ); diff --git a/tools/generate_package_linux.sh b/tools/generate_package_linux.sh deleted file mode 100755 index 134a59c3..00000000 --- a/tools/generate_package_linux.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -DATAVIS_TEMP_DIR=temp_dir -DATAVIS_TEMP_DIR_FULL=../$DATAVIS_TEMP_DIR - -if [ "$1" = "" ] -then - echo Usage: $0 version [branch or SHA] - echo Branch defaults to master. - echo Creates the package in parent dir. - echo A temporary dir $DATAVIS_TEMP_DIR_FULL is utilized for intermediate steps. -fi - -if [ "$2" = "" ] -then - DATAVIS_BRANCH=origin/master -else - DATAVIS_BRANCH=$2 -fi - -DATAVIS_VERSION=$1 -DATAVIS_CURRENT_DIR=$PWD -DATAVIS_BUILD_DIR=$DATAVIS_TEMP_DIR_FULL/tempbuild -DATAVIS_PACKAGE_UNTAR_NAME=qt-data-visualization-enterprise-src-$DATAVIS_VERSION -DATAVIS_PACKAGE_UNTAR_DIR=$DATAVIS_TEMP_DIR_FULL/$DATAVIS_PACKAGE_UNTAR_NAME -DATAVIS_TEMP_TAR=qtdatavisualization_temp_$DATAVIS_VERSION.tar -DATAVIS_TEMP_TAR_FULL=$DATAVIS_TEMP_DIR_FULL/$DATAVIS_TEMP_TAR -DATAVIS_FINAL_TAR=$DATAVIS_CURRENT_DIR/../qt-data-visualization-enterprise-src-$DATAVIS_VERSION.tar - -echo Exporting $DATAVIS_BRANCH to $DATAVIS_TEMP_TAR_FULL... -rm -r -f $DATAVIS_TEMP_DIR_FULL 2> /dev/null -mkdir -p $DATAVIS_TEMP_DIR_FULL 2> /dev/null -git fetch -git archive --format tar --output $DATAVIS_TEMP_TAR_FULL $DATAVIS_BRANCH - -echo Unpacking $DATAVIS_TEMP_TAR_FULL to $DATAVIS_PACKAGE_UNTAR_DIR and $DATAVIS_BUILD_DIR... -mkdir -p $DATAVIS_PACKAGE_UNTAR_DIR 2> /dev/null -mkdir -p $DATAVIS_BUILD_DIR 2> /dev/null -tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_PACKAGE_UNTAR_DIR > /dev/null -tar -xvf $DATAVIS_TEMP_TAR_FULL -C $DATAVIS_BUILD_DIR > /dev/null -#Workaround for git archive bug -rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tools -rm -r -f $DATAVIS_PACKAGE_UNTAR_DIR/tests -rm -r -f $DATAVIS_BUILD_DIR/tools -rm -r -f $DATAVIS_BUILD_DIR/tests - -echo Generating includes, mkspecs, and docs in $DATAVIS_BUILD_DIR... -cd $DATAVIS_BUILD_DIR -mkdir -p .git 2> /dev/null -qmake > /dev/null 2> /dev/null -make docs > /dev/null 2> /dev/null -cd $DATAVIS_CURRENT_DIR - -echo Copying generated files to $DATAVIS_PACKAGE_UNTAR_DIR -cp -r $DATAVIS_BUILD_DIR/doc $DATAVIS_PACKAGE_UNTAR_DIR/doc -cp -r $DATAVIS_BUILD_DIR/include $DATAVIS_PACKAGE_UNTAR_DIR/include - -echo Repackaging $DATAVIS_PACKAGE_UNTAR_DIR to $DATAVIS_FINAL_TAR -rm $DATAVIS_FINAL_TAR 2> /dev/null -cd $DATAVIS_TEMP_DIR_FULL -tar -cvf $DATAVIS_FINAL_TAR $DATAVIS_PACKAGE_UNTAR_NAME >/dev/null -gzip $DATAVIS_FINAL_TAR >/dev/null -cd $DATAVIS_CURRENT_DIR - -exit 0 diff --git a/tools/generate_package_win.cmd b/tools/generate_package_win.cmd deleted file mode 100644 index f3647c49..00000000 --- a/tools/generate_package_win.cmd +++ /dev/null @@ -1,64 +0,0 @@ -@echo off - -SETLOCAL - -set DATAVIS_TEMP_DIR=temp_dir -set DATAVIS_TEMP_DIR_FULL=..\%DATAVIS_TEMP_DIR% - -if "%1"=="" ( - echo Usage: generate_package_win version [branch or SHA] - echo Branch defaults to master. - echo Creates the package in parent dir. - echo A temporary dir %DATAVIS_TEMP_DIR_FULL% is utilized for intermediate steps. - goto :end -) - -if "%2"=="" ( - set DATAVIS_BRANCH=origin/master -) else ( - set DATAVIS_BRANCH=%2 -) - -set DATAVIS_VERSION=%1 -set DATAVIS_PACKAGE_NAME=qt-data-visualization-enterprise-src-%DATAVIS_VERSION% -set DATAVIS_BUILD_DIR=%DATAVIS_TEMP_DIR_FULL%\tempbuild -set DATAVIS_PACKAGE_UNZIP_DIR=%DATAVIS_TEMP_DIR_FULL%\%DATAVIS_PACKAGE_NAME% -set DATAVIS_TEMP_ZIP=qtdatavisualization_temp_%DATAVIS_VERSION%.zip -set DATAVIS_TEMP_ZIP_FULL=%DATAVIS_TEMP_DIR_FULL%\%DATAVIS_TEMP_ZIP% -set DATAVIS_XCOPY_CMD=xcopy /s /i /q -set DATAVIS_FINAL_ZIP=..\%DATAVIS_PACKAGE_NAME%.zip - -echo Exporting %DATAVIS_BRANCH% to %DATAVIS_TEMP_ZIP_FULL%... -rmdir /q /s %DATAVIS_TEMP_DIR_FULL% 2> NUL -md %DATAVIS_TEMP_DIR_FULL% 2> NUL -call git fetch -call git archive --format zip --output ../%DATAVIS_TEMP_DIR%/%DATAVIS_TEMP_ZIP% %DATAVIS_BRANCH% - -echo Unzipping %DATAVIS_TEMP_ZIP_FULL% to %DATAVIS_PACKAGE_UNZIP_DIR% and %DATAVIS_BUILD_DIR%... -md %DATAVIS_PACKAGE_UNZIP_DIR% 2> NUL -md %DATAVIS_BUILD_DIR% 2> NUL -call 7z x -y -o%DATAVIS_PACKAGE_UNZIP_DIR% %DATAVIS_TEMP_ZIP_FULL% > NUL -call 7z x -y -o%DATAVIS_BUILD_DIR% %DATAVIS_TEMP_ZIP_FULL% > NUL -::Workaround for git archive bug -rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tests 2> NUL -rmdir /q /s %DATAVIS_PACKAGE_UNZIP_DIR%\tools 2> NUL -rmdir /q /s %DATAVIS_BUILD_DIR%\tests 2> NUL -rmdir /q /s %DATAVIS_BUILD_DIR%\tools 2> NUL - -echo Generating includes, mkspecs, and docs in %DATAVIS_BUILD_DIR%... -pushd %DATAVIS_BUILD_DIR% -::Fake git build to get syncqt to run -md .git 2> NUL -qmake > NUL 2> NUL -nmake docs > NUL 2> NUL -popd - -echo Copying generated files to %DATAVIS_PACKAGE_UNZIP_DIR% -%DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\doc %DATAVIS_PACKAGE_UNZIP_DIR%\doc -%DATAVIS_XCOPY_CMD% %DATAVIS_BUILD_DIR%\include %DATAVIS_PACKAGE_UNZIP_DIR%\include - -echo Repackaging %DATAVIS_PACKAGE_UNZIP_DIR% to %DATAVIS_FINAL_ZIP% -del /q %DATAVIS_FINAL_ZIP% 2> NUL -call 7z a -r -y -tzip %DATAVIS_FINAL_ZIP% %DATAVIS_PACKAGE_UNZIP_DIR% >NUL - -:end