[ci] Adapt scripts to new naming scheme

.appveyor.yml

@@ -44,7 +44,7 @@ clone_folder: c:\dev\vlc-qt
 
 install:
   - cd c:\dev
-  - md install\debug
+  - md install
   - md dependencies
   - cd dependencies
   - ps: $vlcdl = 'http://download.videolan.org/vlc/' + $env:vlc_version + '/' + $env:name + '/vlc-' + $env:vlc_version + '-' + $env:name + '.7z'
@@ -67,22 +67,20 @@ build_script:
   - if not %platform%==mingw (nmake install) else (mingw32-make install)
   - cd ..
   - cd build-debug
-  - cmake .. -G %makefiles% -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="c:/dev/install-debug" -DCI=ON -DNO_GIT=%nogitinfo% -DLIBVLC_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlc.lib" -DLIBVLCCORE_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlccore.lib" -DLIBVLC_INCLUDE_DIR="c:/dev/dependencies/vlc-%name%/sdk/include"
+  - cmake .. -G %makefiles% -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="c:/dev/install" -DCI=ON -DNO_GIT=%nogitinfo% -DLIBVLC_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlc.lib" -DLIBVLCCORE_LIBRARY="c:/dev/dependencies/vlc-%name%/sdk/lib/libvlccore.lib" -DLIBVLC_INCLUDE_DIR="c:/dev/dependencies/vlc-%name%/sdk/include"
   - if not %platform%==mingw (nmake) else (mingw32-make)
+  - if not %platform%==mingw (nmake install) else (mingw32-make install)
   - if %platform%==mingw set PATH=%ORIGPATH%
 
 after_build:
-  - cd c:\dev\vlc-qt
-  - copy build-release\src\core\*vlc-qt-core.dll ..\install\debug
-  - copy build-release\src\qml\*vlc-qt-qml.dll ..\install\debug
-  - copy build-release\src\widgets\*vlc-qt-widgets.dll ..\install\debug
   - cd c:\dev\install
   - if %APPVEYOR_REPO_TAG%==true (buildname=%vlcqt_version%) else (set buildname=%vlcqt_version%_build%APPVEYOR_BUILD_NUMBER%_%APPVEYOR_REPO_COMMIT:~0,7%)
-  - 7z a ..\vlc-qt\VLC-Qt_%buildname%_%name%_%suffix%.7z *
+  - 7z a ..\vlc-qt\VLC-Qt_%buildname%_%name%_%suffix%.7z bin lib include
+  - 7z a ..\vlc-qt\VLC-Qt_Test_%buildname%_%name%_%suffix%.7z test > NUL
   - cd c:\dev\vlc-qt
 
 test_script:
-  - cd c:\dev\install\bin
+  - cd c:\dev\install\test
   - start /wait VLC-Qt.exe test
   - cd c:\dev\vlc-qt
 

.travis.yml

@@ -16,7 +16,11 @@ after_success:
 
 addons:
   apt:
-    packages:
+   sources:
+    - ubuntu-toolchain-r-test
+   packages:
+    - gcc-4.8
+    - g++-4.8
     - libqt4-dev
     - libvlc-dev
     - libvlccore-dev

CMakeLists.txt

@@ -47,11 +47,6 @@ INCLUDE(CustomTargets)
 INCLUDE(CompilerConfig)
 INCLUDE(Dependencies)
 
-# Detect CI
-IF(CI)
-    MESSAGE("Automatic CI build")
-ENDIF()
-
 OPTION(STATIC "Build statically" OFF)
 MESSAGE("VLC-Qt: Build statically: ${STATIC}")
 

config/CompilerConfig.cmake

@@ -38,7 +38,7 @@ IF(CMAKE_BUILD_TYPE MATCHES Debug)
 ENDIF()
 
 # C++11 support
-IF (NOT MSVC AND NOT (DEFINED CI AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
+IF (NOT MSVC)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 ENDIF()
 

tools/ci/linux/install.sh

@@ -18,6 +18,8 @@ wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_54/qt.54
 7z x 5.4.1-0qt5_essentials.7z > /dev/null
 7z x 5.4.1-0icu_53_1_ubuntu_11_10_64.7z > /dev/null
 
+export CC="gcc-4.8"
+export CXX="g++-4.8"
 export PATH=$PWD/cmake-3.2.2-Linux-x86_64/bin/:$PWD/5.4/gcc_64/bin/:$PATH
 
 popd

tools/ci/linux/script.sh

@@ -3,14 +3,14 @@ set -ev
 
 # Configure and build with Qt5
 pushd build-qt5
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install-qt5/ -DCI=ON -DQT_VERSION=5 -DBUILD_TESTS=ON -DLIBVLC_VERSION=0x020000
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install-qt5/ -DQT_VERSION=5 -DBUILD_TESTS=ON -DLIBVLC_VERSION=0x020000
 make
 make install
 popd
 
 # Configure and build with Qt4
 pushd build-qt4
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install-qt4/ -DCI=ON -DQT_VERSION=4 -DBUILD_TESTS=ON -DLIBVLC_VERSION=0x020000
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install-qt4/ -DQT_VERSION=4 -DBUILD_TESTS=ON -DLIBVLC_VERSION=0x020000
 make
 make install
 popd

tools/ci/osx/after_success.sh

@@ -3,5 +3,8 @@ set -ev
 
 # Deploy builds
 pushd install
-curl --ftp-create-dirs -m 250 --retry 3 -T VLC-Qt.dmg -u $FTP_USER:$FTP_PASSWORD ftp://ftp.tano.si/vlc-qt/ci/osx/VLC-Qt_${VLCQT_VERSION}_build${TRAVIS_BUILD_NUMBER}_${TRAVIS_COMMIT:0:7}.dmg
+7z a VLC-Qt.7z lib > /dev/null
+
+curl --ftp-create-dirs -m 250 --retry 3 -T VLC-Qt.7z -u $FTP_USER:$FTP_PASSWORD ftp://ftp.tano.si/vlc-qt/ci/osx/VLC-Qt_${VLCQT_VERSION}_build${TRAVIS_BUILD_NUMBER}_${TRAVIS_COMMIT:0:7}.7z
+curl --ftp-create-dirs -m 250 --retry 3 -T bin/VLC-Qt.dmg -u $FTP_USER:$FTP_PASSWORD ftp://ftp.tano.si/vlc-qt/ci/osx/VLC-Qt_Test_${VLCQT_VERSION}_build${TRAVIS_BUILD_NUMBER}_${TRAVIS_COMMIT:0:7}.dmg
 popd

tools/ci/osx/before_install.sh

@@ -4,9 +4,7 @@ set -ev
 # Prepare build environment
 mkdir dependencies
 mkdir install
-mkdir install-debug
-mkdir build-release
-mkdir build-debug
+mkdir build
 
 export VLCQT_VERSION=`cat VERSION`
 

tools/ci/osx/script.sh

@@ -2,36 +2,17 @@
 set -ev
 
 # Configure and build release
-pushd build-release
-cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install/ -DCI=ON -DBUILD_TESTS=ON \
+pushd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install/ -DBUILD_TESTS=ON \
 	-DLIBVLC_INCLUDE_DIR=../dependencies/VLC.app/Contents/MacOS/include \
 	-DLIBVLC_LIBRARY=../dependencies/VLC.app/Contents/MacOS/lib/libvlc.dylib \
 	-DLIBVLCCORE_LIBRARY=../dependencies/VLC.app/Contents/MacOS/lib/libvlccore.dylib
 make
 make install
-popd
-
-# Configure and build debug
-pushd build-debug
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install-debug/ -DCI=ON \
-	-DLIBVLC_INCLUDE_DIR=../dependencies/VLC.app/Contents/MacOS/include \
-	-DLIBVLC_LIBRARY=../dependencies/VLC.app/Contents/MacOS/lib/libvlc.dylib \
-	-DLIBVLCCORE_LIBRARY=../dependencies/VLC.app/Contents/MacOS/lib/libvlccore.dylib
-make
-make install
-popd
-
-cp install-debug/lib/vlc-qt-core.framework/Versions/${VLCQT_VERSION}/vlc-qt-core install-debug/lib/vlc-qt-core.framework/Versions/${VLCQT_VERSION}/vlc-qt-core_debug
-cp install-debug/lib/vlc-qt-qml.framework/Versions/${VLCQT_VERSION}/vlc-qt-qml install-debug/lib/vlc-qt-qml.framework/Versions/${VLCQT_VERSION}/vlc-qt-qml_debug
-cp install-debug/lib/vlc-qt-widgets.framework/Versions/${VLCQT_VERSION}/vlc-qt-widgets install-debug/lib/vlc-qt-widgets.framework/Versions/${VLCQT_VERSION}/vlc-qt-widgets_debug
-
-
-# Prepare for deployment
-pushd build-release
 make dmg
 popd
 
 # Test execution
-pushd install
-VLC-Qt.app/Contents/MacOS/VLC-Qt test
-popd
+#pushd install/bin
+#VLC-Qt.app/Contents/MacOS/VLC-Qt test
+#popd