Skip to content

Commit

Permalink
Updates from UxVCtrl V373
Browse files Browse the repository at this point in the history
  • Loading branch information
lebarsfa committed Dec 6, 2020
1 parent fe65eec commit 46cd8d0
Show file tree
Hide file tree
Showing 19 changed files with 1,426 additions and 510 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,7 @@ $RECYCLE.BIN/

TODO/
!*ReadMe.txt
Upgrade*
Test_devices_Debug.bat
Test_devices_Release.bat
UpgradeOSUtils.bat
UpgradeHardware.bat
rawmdm.txt
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: "Windows MinGW 8.1.0 x64"
os: windows
compiler: gcc
install:
before_install:
- choco install -y make
script:
- cmake -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=Release . && cmake --build . --parallel
Expand All @@ -40,7 +40,6 @@ jobs:
before_install:
# Allowed to fail...
- sudo apt-get -q update || true
install:
# - wget http://www.ensta-bretagne.fr/lebars/Share/qt-sdk-linux-x86_64-opensource-2010.05.1.bin
# - chmod +x qt-sdk-linux-x86_64-opensource-2010.05.1.bin
# # Unattended mode has a bug, see https://bugreports.qt.io/browse/QTCREATORBUG-472...?
Expand All @@ -51,7 +50,7 @@ jobs:
- name: "Windows Qt 2010.05 MinGW 4.4.0 x86"
os: windows
compiler: gcc
install:
before_install:
# Take 2 min...
- choco uninstall -y mingw
- wget http://www.ensta-bretagne.fr/lebars/Share/qt-sdk-win-opensource-2010.05.exe --no-check-certificate -nv
Expand All @@ -66,7 +65,7 @@ jobs:
- name: "Windows Qt 5.12.6 MinGW 7.3.0 x86"
os: windows
compiler: gcc
install:
before_install:
# Take 2 min...
- choco uninstall -y mingw
- wget http://download.qt.io/archive/qt/5.12/5.12.6/qt-opensource-windows-x86-5.12.6.exe --no-check-certificate -nv
Expand All @@ -81,4 +80,4 @@ jobs:
- cmd //c netsh advfirewall set allprofiles state off
- cmd //c "del /f /q %SystemDrive%\qt-opensource-windows-x86-5.12.6.exe"
script:
- cmd //c "set PATH=C:\Qt\Qt5.12.6\5.12.6\mingw73_32\bin;C:/Qt/Qt5.12.6/Tools/mingw730_32\bin;%PATH% & qmake & mingw32-make"
- cmd //c "set PATH=C:\Qt\Qt5.12.6\5.12.6\mingw73_32\bin;C:\Qt\Qt5.12.6\Tools\mingw730_32\bin;%PATH% & qmake & mingw32-make"
Loading

0 comments on commit 46cd8d0

Please sign in to comment.