Last active
April 27, 2019 16:15
-
-
Save z3ntu/3a28c859e29fe836fc25b270e9fb0e66 to your computer and use it in GitHub Desktop.
CI bringup for razer_test in patches
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 74c524a0ea3b29e17464cd7062eb0c6a28ac4a7d Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 16:49:10 +0200 | |
Subject: [PATCH 01/46] Appveyor try 1 | |
--- | |
.appveyor.yml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ | |
1 file changed, 48 insertions(+) | |
create mode 100644 .appveyor.yml | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
new file mode 100644 | |
index 0000000..16cefe1 | |
--- /dev/null | |
+++ b/.appveyor.yml | |
@@ -0,0 +1,48 @@ | |
+os: Visual Studio 2015 | |
+ | |
+environment: | |
+ matrix: | |
+ - arch: x86 | |
+ compiler: msvc2015 | |
+ qt: msvc2015 | |
+ - arch: x64 | |
+ compiler: msvc2015 | |
+ qt: msvc2015_64 | |
+ | |
+platform: | |
+ - x64 | |
+ | |
+install: | |
+ # Use the x86 python only when building for x86 for the cpython tests. | |
+ # For all other archs (including, say, arm), use the x64 python. | |
+ - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer_test\ninja.exe') | |
+ - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) | |
+ # Add Python and meson to the PATH | |
+ - cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
+ # Add Qt to the PATH | |
+ - cmd: "SET PATH=C:\\Qt\\5.11\\%qt%\\bin;%PATH%" | |
+ - cmd: echo Using Python at "%MESON_PYTHON_PATH%" | |
+ - cmd: pip install meson | |
+ - cmd: if %compiler%==msvc2010 ( call "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\vcvarsall.bat" %arch% ) | |
+ - cmd: if %compiler%==msvc2015 ( call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" %arch% ) | |
+ - cmd: "dir C:\\Qt\\5.11\\%qt%" | |
+ - cmd: qmake -query | |
+# - cmd: choco install pkgconfiglite | |
+# - cmd: "SET PKG_CONFIG_PATH=C:\\Qt\\5.9.2\\%qt%\\lib\\pkconfig" | |
+# - cmd: "dir C:\\Qt\\5.9.2\\%qt%\\lib" | |
+ | |
+build_script: | |
+ - cmd: echo Building on %arch% with %compiler% | |
+ - cmd: meson --backend=ninja builddir | |
+ - cmd: set INCLUDE | |
+ - cmd: set LIB | |
+# - cmd: set LIBPATH | |
+ - cmd: type builddir\build.ninja | |
+ - cmd: ninja -v -C builddir | |
+ | |
+test_script: | |
+ - cmd: ninja -C builddir test | |
+ | |
+#artifacts: | |
+# - path: builddir/s | |
+ | |
-- | |
2.21.0 | |
From 3d4df49b10935dcdccdee42b870d7e909bc323a5 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 16:57:58 +0200 | |
Subject: [PATCH 02/46] From https://mesonbuild.com/Continuous-Integration.html | |
--- | |
.appveyor.yml | 37 ++++++++++--------------------------- | |
1 file changed, 10 insertions(+), 27 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 16cefe1..4ce3a89 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -2,12 +2,12 @@ os: Visual Studio 2015 | |
environment: | |
matrix: | |
+ - arch: x86 | |
+ compiler: msvc2010 | |
- arch: x86 | |
compiler: msvc2015 | |
- qt: msvc2015 | |
- arch: x64 | |
compiler: msvc2015 | |
- qt: msvc2015_64 | |
platform: | |
- x64 | |
@@ -15,34 +15,17 @@ platform: | |
install: | |
# Use the x86 python only when building for x86 for the cpython tests. | |
# For all other archs (including, say, arm), use the x64 python. | |
- - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer_test\ninja.exe') | |
+ - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\meson\ninja.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) | |
- # Add Python and meson to the PATH | |
- - cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- # Add Qt to the PATH | |
- - cmd: "SET PATH=C:\\Qt\\5.11\\%qt%\\bin;%PATH%" | |
- - cmd: echo Using Python at "%MESON_PYTHON_PATH%" | |
- - cmd: pip install meson | |
- - cmd: if %compiler%==msvc2010 ( call "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\vcvarsall.bat" %arch% ) | |
- - cmd: if %compiler%==msvc2015 ( call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" %arch% ) | |
- - cmd: "dir C:\\Qt\\5.11\\%qt%" | |
- - cmd: qmake -query | |
-# - cmd: choco install pkgconfiglite | |
-# - cmd: "SET PKG_CONFIG_PATH=C:\\Qt\\5.9.2\\%qt%\\lib\\pkconfig" | |
-# - cmd: "dir C:\\Qt\\5.9.2\\%qt%\\lib" | |
+ - cmd: echo Using Python at %MESON_PYTHON_PATH% | |
+ - cmd: "%MESON_PYTHON_PATH%\\pip install meson" | |
+ - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
+ - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- - cmd: meson --backend=ninja builddir | |
- - cmd: set INCLUDE | |
- - cmd: set LIB | |
-# - cmd: set LIBPATH | |
- - cmd: type builddir\build.ninja | |
- - cmd: ninja -v -C builddir | |
+ - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja builddir | |
+ - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir | |
test_script: | |
- - cmd: ninja -C builddir test | |
- | |
-#artifacts: | |
-# - path: builddir/s | |
- | |
+ - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test | |
-- | |
2.21.0 | |
From 42b46659f2ea775ad3946e2756bec0937bbfb8ec Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:01:33 +0200 | |
Subject: [PATCH 03/46] Fuck powershell | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 4ce3a89..502ef1a 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -15,7 +15,7 @@ platform: | |
install: | |
# Use the x86 python only when building for x86 for the cpython tests. | |
# For all other archs (including, say, arm), use the x64 python. | |
- - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\meson\ninja.exe') | |
+ - ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- cmd: "%MESON_PYTHON_PATH%\\pip install meson" | |
-- | |
2.21.0 | |
From 446c3166d38bef3a6b6e133d3161ad24535e9935 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:06:19 +0200 | |
Subject: [PATCH 04/46] Try 4 | |
--- | |
.appveyor.yml | 4 ++-- | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 502ef1a..427fa21 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -16,9 +16,9 @@ install: | |
# Use the x86 python only when building for x86 for the cpython tests. | |
# For all other archs (including, say, arm), use the x64 python. | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python34) else (set MESON_PYTHON_PATH=C:\python34-x64) | |
+ - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- - cmd: "%MESON_PYTHON_PATH%\\pip install meson" | |
+ - cmd: "%MESON_PYTHON_PATH%\\Scripts\\pip install meson" | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
-- | |
2.21.0 | |
From 4375dc0879afc67805e717aec462a5c7aabbf124 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:17:40 +0200 | |
Subject: [PATCH 05/46] Try 5 | |
--- | |
.appveyor.yml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 427fa21..b319813 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -21,6 +21,7 @@ install: | |
- cmd: "%MESON_PYTHON_PATH%\\Scripts\\pip install meson" | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
+ - cmd: dir "%MESON_PYTHON_PATH%\\Scripts" | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From 248ea18f150e99ab9fe7836ad1c1c6a3fa3033c6 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:21:54 +0200 | |
Subject: [PATCH 06/46] Try 6 | |
--- | |
.appveyor.yml | 3 +-- | |
1 file changed, 1 insertion(+), 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index b319813..3aabd49 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -21,11 +21,10 @@ install: | |
- cmd: "%MESON_PYTHON_PATH%\\Scripts\\pip install meson" | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- - cmd: dir "%MESON_PYTHON_PATH%\\Scripts" | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && python meson.py --backend=ninja builddir | |
+ - cmd: PATH=%cd%;%MESON_PYTHON_PATH%\\Scripts;%PATH%; && meson --backend=ninja builddir | |
- cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir | |
test_script: | |
-- | |
2.21.0 | |
From f81581afe6a5fb6ed631d41cbcd8d203f957a201 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:33:44 +0200 | |
Subject: [PATCH 07/46] Try 7 | |
--- | |
.appveyor.yml | 9 +++++---- | |
1 file changed, 5 insertions(+), 4 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 3aabd49..60d5b9b 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -17,15 +17,16 @@ install: | |
# For all other archs (including, say, arm), use the x64 python. | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
+ - cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- - cmd: "%MESON_PYTHON_PATH%\\Scripts\\pip install meson" | |
+ - cmd: pip install meson | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- - cmd: PATH=%cd%;%MESON_PYTHON_PATH%\\Scripts;%PATH%; && meson --backend=ninja builddir | |
- - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir | |
+ - cmd: meson --backend=ninja builddir | |
+ - cmd: ninja -C builddir | |
test_script: | |
- - cmd: PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%; && ninja -C builddir test | |
+ - cmd: ninja -C builddir test | |
-- | |
2.21.0 | |
From 98237ae28e2978cf808ffc5eccc754cea63620ca Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:43:01 +0200 | |
Subject: [PATCH 08/46] Try 8 | |
--- | |
.appveyor.yml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 60d5b9b..d917736 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -16,6 +16,7 @@ install: | |
# Use the x86 python only when building for x86 for the cpython tests. | |
# For all other archs (including, say, arm), use the x64 python. | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
+ - ps: (new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\razer-test\pkg-config.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
- cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
-- | |
2.21.0 | |
From 4faa886ce433938a852aa9e5b801411f9cf1e89a Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 17:52:48 +0200 | |
Subject: [PATCH 09/46] Try 9 | |
--- | |
.appveyor.yml | 5 +++++ | |
1 file changed, 5 insertions(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index d917736..e554f97 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -23,6 +23,11 @@ install: | |
- cmd: pip install meson | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
+ # Build hidapi dependency | |
+ - cmd: git clone https://github.com/signal11/hidapi.git 'C:\projects\hidapi' | |
+ - cmd: msbuild 'C:\projects\hidapi\windows\hidapi.sln' | |
+ - cmd: dir 'C:\projects\hidapi\windows\' | |
+ - cmd: dir 'C:\projects\hidapi\ | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From 46f897d74d62284710a4250f46124addc866ea8d Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 18:33:04 +0200 | |
Subject: [PATCH 10/46] Try 10 | |
--- | |
.appveyor.yml | 8 ++++---- | |
1 file changed, 4 insertions(+), 4 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index e554f97..12b852f 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -24,10 +24,10 @@ install: | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# Build hidapi dependency | |
- - cmd: git clone https://github.com/signal11/hidapi.git 'C:\projects\hidapi' | |
- - cmd: msbuild 'C:\projects\hidapi\windows\hidapi.sln' | |
- - cmd: dir 'C:\projects\hidapi\windows\' | |
- - cmd: dir 'C:\projects\hidapi\ | |
+ - cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
+ - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
+ - cmd: dir "C:\projects\hidapi\windows" | |
+ - cmd: dir "C:\projects\hidapi" | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From d9f997728300ea22ae93baee55ab08ded6b133af Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 18:50:09 +0200 | |
Subject: [PATCH 11/46] Try 11 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 12b852f..b0ea905 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,7 +25,7 @@ install: | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
+ - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" /p:Configuration=Debug /p:Platform="Any CPU" | |
- cmd: dir "C:\projects\hidapi\windows" | |
- cmd: dir "C:\projects\hidapi" | |
-- | |
2.21.0 | |
From ab35143e5829baddf03d6fbde1ac5f31dacc0866 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 19:24:26 +0200 | |
Subject: [PATCH 12/46] Try 12 | |
--- | |
.appveyor.yml | 2 ++ | |
1 file changed, 2 insertions(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index b0ea905..e44d09f 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,6 +25,8 @@ install: | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
+ - cmd: git -C "C:\projects\hidapi" fetch origin pull/324/head | |
+ - cmd: git -C "C:\projects\hidapi" cherry-pick -n b00982f83864ddb6a21c5d28c2134dda6f359d47 | |
- cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" /p:Configuration=Debug /p:Platform="Any CPU" | |
- cmd: dir "C:\projects\hidapi\windows" | |
- cmd: dir "C:\projects\hidapi" | |
-- | |
2.21.0 | |
From f765c833362e2142c65ccb08868b87b0dc0d67fb Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 19:47:48 +0200 | |
Subject: [PATCH 13/46] Try 13 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index e44d09f..000a27f 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -27,7 +27,7 @@ install: | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- cmd: git -C "C:\projects\hidapi" fetch origin pull/324/head | |
- cmd: git -C "C:\projects\hidapi" cherry-pick -n b00982f83864ddb6a21c5d28c2134dda6f359d47 | |
- - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" /p:Configuration=Debug /p:Platform="Any CPU" | |
+ - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
- cmd: dir "C:\projects\hidapi\windows" | |
- cmd: dir "C:\projects\hidapi" | |
-- | |
2.21.0 | |
From 4f7a503e1faa58bb14a94e73bc41c386a247587a Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 23:37:35 +0200 | |
Subject: [PATCH 14/46] Try 14 | |
--- | |
.appveyor.yml | 4 ++-- | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 000a27f..bb90ffd 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,8 +25,8 @@ install: | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- - cmd: git -C "C:\projects\hidapi" fetch origin pull/324/head | |
- - cmd: git -C "C:\projects\hidapi" cherry-pick -n b00982f83864ddb6a21c5d28c2134dda6f359d47 | |
+ - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git | |
+ - cmd: git -C "C:\projects\hidapi" checkout bea3578d33e6989fa86bb67f3b5669aad89173d8 | |
- cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
- cmd: dir "C:\projects\hidapi\windows" | |
- cmd: dir "C:\projects\hidapi" | |
-- | |
2.21.0 | |
From 718ec9d04b5d20e49ec6a8be160dd658d7937f1d Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 23:41:35 +0200 | |
Subject: [PATCH 15/46] Try 15 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index bb90ffd..905b2ae 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,7 +25,7 @@ install: | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git | |
+ - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git vs2015 | |
- cmd: git -C "C:\projects\hidapi" checkout bea3578d33e6989fa86bb67f3b5669aad89173d8 | |
- cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
- cmd: dir "C:\projects\hidapi\windows" | |
-- | |
2.21.0 | |
From 49b04b61b14d7b58693ef9ec8f1be3cedc339afa Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 23:56:32 +0200 | |
Subject: [PATCH 16/46] Try 16 | |
--- | |
.appveyor.yml | 17 ++++++++++------- | |
1 file changed, 10 insertions(+), 7 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 905b2ae..37dbddd 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -2,12 +2,14 @@ os: Visual Studio 2015 | |
environment: | |
matrix: | |
+# - arch: x86 | |
+# compiler: msvc2010 | |
+# - arch: x86 | |
+# compiler: msvc2015 | |
+# - arch: x64 | |
+# compiler: msvc2015 | |
- arch: x86 | |
- compiler: msvc2010 | |
- - arch: x86 | |
- compiler: msvc2015 | |
- - arch: x64 | |
- compiler: msvc2015 | |
+ compiler: msvc2017 | |
platform: | |
- x64 | |
@@ -21,8 +23,9 @@ install: | |
- cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- cmd: pip install meson | |
- - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
+# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
+# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
+ - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git vs2015 | |
-- | |
2.21.0 | |
From 168c9b3f03b0c0b0d7b44efd6fd1ef1f9fc8aa14 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 23:59:30 +0200 | |
Subject: [PATCH 17/46] Try 17 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 37dbddd..c640ddc 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -1,4 +1,4 @@ | |
-os: Visual Studio 2015 | |
+os: Visual Studio 2017 | |
environment: | |
matrix: | |
-- | |
2.21.0 | |
From 4f84e739735135ef8d583be34f80c8b16d46ce4f Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 00:02:52 +0200 | |
Subject: [PATCH 18/46] Try 18 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index c640ddc..1945f8b 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,7 +25,7 @@ install: | |
- cmd: pip install meson | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat" | |
+ - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git vs2015 | |
-- | |
2.21.0 | |
From e1062fe8bccd09e92e6fcdefbf05b2d071c3d940 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 00:04:08 +0200 | |
Subject: [PATCH 19/46] Try 19 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 1945f8b..a52149e 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -25,7 +25,7 @@ install: | |
- cmd: pip install meson | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
+# - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git vs2015 | |
-- | |
2.21.0 | |
From ac5252b11a6252855cc6c2d59ceaf03181b570b6 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 00:41:55 +0200 | |
Subject: [PATCH 20/46] Try 20 | |
--- | |
.appveyor.yml | 10 +++++----- | |
1 file changed, 5 insertions(+), 5 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index a52149e..8369160 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -28,11 +28,11 @@ install: | |
# - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
# Build hidapi dependency | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git vs2015 | |
- - cmd: git -C "C:\projects\hidapi" checkout bea3578d33e6989fa86bb67f3b5669aad89173d8 | |
- - cmd: msbuild "C:\projects\hidapi\windows\hidapi.sln" | |
- - cmd: dir "C:\projects\hidapi\windows" | |
- - cmd: dir "C:\projects\hidapi" | |
+ - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git meson | |
+ - cmd: git -C "C:\projects\hidapi" checkout 112c24579f699b12f999e8c2917908934fda0358 | |
+ - cmd: meson --backend=ninja "C:\projects\hidapi" builddir-hidapi | |
+ - cmd: ninja -C builddir-hidapi | |
+ - cmd: dir builddir-hidapi | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From 6f76778de53b55d5aa4807e47c2d1d4dd3326976 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 00:43:14 +0200 | |
Subject: [PATCH 21/46] Try 21 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 8369160..b5ef050 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -30,7 +30,7 @@ install: | |
- cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git meson | |
- cmd: git -C "C:\projects\hidapi" checkout 112c24579f699b12f999e8c2917908934fda0358 | |
- - cmd: meson --backend=ninja "C:\projects\hidapi" builddir-hidapi | |
+ - cmd: meson --backend=ninja "C:\projects\hidapi\windows" builddir-hidapi | |
- cmd: ninja -C builddir-hidapi | |
- cmd: dir builddir-hidapi | |
-- | |
2.21.0 | |
From 342a31b41f84b8f710b8fe34eaf710bbbebd6172 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:07:42 +0200 | |
Subject: [PATCH 22/46] Try 22 | |
--- | |
meson.build | 2 +- | |
subprojects/hidapi.wrap | 4 ++++ | |
2 files changed, 5 insertions(+), 1 deletion(-) | |
create mode 100644 subprojects/hidapi.wrap | |
diff --git a/meson.build b/meson.build | |
index c43d547..e79bf07 100644 | |
--- a/meson.build | |
+++ b/meson.build | |
@@ -25,7 +25,7 @@ src = [ | |
if host_machine.system() == 'linux' | |
hidapi = dependency('hidapi-hidraw') | |
else | |
- hidapi = dependency('hidapi') | |
+ hidapi = dependency('hidapi', fallback : ['hidapi', 'hidapi']) | |
endif | |
# Boost headers are required by src/dbus/enumDBus.h | |
diff --git a/subprojects/hidapi.wrap b/subprojects/hidapi.wrap | |
new file mode 100644 | |
index 0000000..2dc4598 | |
--- /dev/null | |
+++ b/subprojects/hidapi.wrap | |
@@ -0,0 +1,4 @@ | |
+[wrap-git] | |
+directory=hidapi/windows | |
+url=https://github.com/z3ntu/hidapi.git | |
+revision=meson | |
-- | |
2.21.0 | |
From 9ae6eb883fc471ae7fe89509b537ea84864060c8 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:10:24 +0200 | |
Subject: [PATCH 23/46] Try 23 | |
--- | |
subprojects/hidapi.wrap | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/subprojects/hidapi.wrap b/subprojects/hidapi.wrap | |
index 2dc4598..91e67db 100644 | |
--- a/subprojects/hidapi.wrap | |
+++ b/subprojects/hidapi.wrap | |
@@ -1,4 +1,4 @@ | |
[wrap-git] | |
-directory=hidapi/windows | |
+directory=hidapi | |
url=https://github.com/z3ntu/hidapi.git | |
revision=meson | |
-- | |
2.21.0 | |
From 92a7494dd1b6e40277c74bf439da058a0d15535e Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:19:58 +0200 | |
Subject: [PATCH 24/46] Try 24 | |
--- | |
.appveyor.yml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index b5ef050..4308650 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -20,6 +20,7 @@ install: | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- ps: (new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\razer-test\pkg-config.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
+ - cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 | |
- cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- cmd: pip install meson | |
-- | |
2.21.0 | |
From 5e59d00037c9261703db5abd3253a373980428ba Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:26:32 +0200 | |
Subject: [PATCH 25/46] Try 25 | |
--- | |
.appveyor.yml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 4308650..ebd562a 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -21,6 +21,7 @@ install: | |
- ps: (new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\razer-test\pkg-config.exe') | |
- cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
- cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 | |
+ - cmd: set PATH=C:\Qt\5.11\msvc2017_64\bin;%PATH% | |
- cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- cmd: echo Using Python at %MESON_PYTHON_PATH% | |
- cmd: pip install meson | |
-- | |
2.21.0 | |
From cfcc1b2508e294638d4071fb5bd52a5dec3599f7 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:29:52 +0200 | |
Subject: [PATCH 26/46] Try 26 | |
--- | |
.appveyor.yml | 7 ------- | |
1 file changed, 7 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index ebd562a..2531829 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -28,13 +28,6 @@ install: | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
- # Build hidapi dependency | |
- - cmd: git clone https://github.com/signal11/hidapi.git "C:\projects\hidapi" | |
- - cmd: git -C "C:\projects\hidapi" fetch https://github.com/z3ntu/hidapi.git meson | |
- - cmd: git -C "C:\projects\hidapi" checkout 112c24579f699b12f999e8c2917908934fda0358 | |
- - cmd: meson --backend=ninja "C:\projects\hidapi\windows" builddir-hidapi | |
- - cmd: ninja -C builddir-hidapi | |
- - cmd: dir builddir-hidapi | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From aa9fbc0b49124c6cc365e685f9237f772ddb7d4d Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:34:06 +0200 | |
Subject: [PATCH 27/46] Try 27 (UGH) | |
--- | |
meson.build | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/meson.build b/meson.build | |
index e79bf07..d09fac0 100644 | |
--- a/meson.build | |
+++ b/meson.build | |
@@ -1,6 +1,6 @@ | |
project('razer_test', 'cpp', | |
version : '0.0.1', | |
- default_options : ['cpp_std=c++11']) | |
+ default_options : ['cpp_std=c++14']) | |
conf_data = configuration_data() | |
conf_data.set('version', meson.project_version()) | |
-- | |
2.21.0 | |
From 39ec3c6c4388e96266b2edebd8aeb7699e7b116c Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:40:00 +0200 | |
Subject: [PATCH 28/46] Try 28 | |
--- | |
.gitignore | 2 +- | |
src/device/razerdevice.cpp | 1 - | |
src/razer_test.cpp | 1 - | |
3 files changed, 1 insertion(+), 3 deletions(-) | |
diff --git a/.gitignore b/.gitignore | |
index 567609b..e2be6ae 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -1 +1 @@ | |
-build/ | |
+builddir/ | |
diff --git a/src/device/razerdevice.cpp b/src/device/razerdevice.cpp | |
index 320e208..9c9eba6 100644 | |
--- a/src/device/razerdevice.cpp | |
+++ b/src/device/razerdevice.cpp | |
@@ -18,7 +18,6 @@ | |
#include <stdio.h> | |
#include <string.h> | |
-#include <unistd.h> | |
#include "razerdevice.h" | |
diff --git a/src/razer_test.cpp b/src/razer_test.cpp | |
index 09be51e..ef9ee9c 100644 | |
--- a/src/razer_test.cpp | |
+++ b/src/razer_test.cpp | |
@@ -1,7 +1,6 @@ | |
#include <stdio.h> | |
#include <stdlib.h> | |
#include <string.h> | |
-#include <unistd.h> | |
#include <hidapi.h> | |
-- | |
2.21.0 | |
From 11a5bea9b6e4eb2d032a8ced9261f11bc6a5ff90 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:44:04 +0200 | |
Subject: [PATCH 29/46] Try 29 | |
--- | |
src/device/razerdevice.cpp | 4 +++- | |
1 file changed, 3 insertions(+), 1 deletion(-) | |
diff --git a/src/device/razerdevice.cpp b/src/device/razerdevice.cpp | |
index 9c9eba6..2a77466 100644 | |
--- a/src/device/razerdevice.cpp | |
+++ b/src/device/razerdevice.cpp | |
@@ -19,6 +19,8 @@ | |
#include <stdio.h> | |
#include <string.h> | |
+#include <QThread> | |
+ | |
#include "razerdevice.h" | |
RazerDevice::RazerDevice(QString dev_path, ushort vendor_id, ushort product_id, QString name, QString type, QString pclass, QVector<RazerLedId> ledIds, QVector<RazerDeviceQuirks> quirks) | |
@@ -81,7 +83,7 @@ int RazerDevice::sendReport(razer_report request_report, razer_report *response_ | |
} | |
// Wait a bit | |
- usleep(800); | |
+ QThread::usleep(800); | |
// Read a Feature Report from the device | |
res_buf[0] = 0x00; // report number | |
-- | |
2.21.0 | |
From 4d260d9de1e1e55cb9d08ae1651ebca9db2f8763 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:49:57 +0200 | |
Subject: [PATCH 30/46] Try 30 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 2531829..cc1d4b5 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -32,7 +32,7 @@ install: | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- cmd: meson --backend=ninja builddir | |
- - cmd: ninja -C builddir | |
+ - cmd: ninja -C builddir -v | |
test_script: | |
- cmd: ninja -C builddir test | |
-- | |
2.21.0 | |
From 8b25246ec0dc586f18fabf953f273f837cf7ed86 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 01:57:53 +0200 | |
Subject: [PATCH 32/46] Try 32 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index cc1d4b5..e76a75d 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -27,7 +27,7 @@ install: | |
- cmd: pip install meson | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
-# - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
+ - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From 856b0664f117dab2dcc4a3c65207212fc052e71b Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:01:23 +0200 | |
Subject: [PATCH 33/46] Try 33 | |
--- | |
.appveyor.yml | 4 ++++ | |
1 file changed, 4 insertions(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index e76a75d..176a425 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -36,3 +36,7 @@ build_script: | |
test_script: | |
- cmd: ninja -C builddir test | |
+ | |
+artifacts: | |
+ - path: builddir/razer_test_demo.exe | |
+ - path: subprojects/hidapi/hidapi.dll | |
-- | |
2.21.0 | |
From a3059355e5254a3c123d94d2c0c9e5ca199eb59f Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:03:03 +0200 | |
Subject: [PATCH 34/46] Try 34 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 176a425..7f27744 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -39,4 +39,4 @@ test_script: | |
artifacts: | |
- path: builddir/razer_test_demo.exe | |
- - path: subprojects/hidapi/hidapi.dll | |
+ - path: builddir/subprojects/hidapi/hidapi.dll | |
-- | |
2.21.0 | |
From 8b34f466590536f65f4c82d74b7d9bc4211dc04c Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:07:59 +0200 | |
Subject: [PATCH 35/46] Try 35 | |
--- | |
.appveyor.yml | 2 ++ | |
1 file changed, 2 insertions(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 7f27744..1c93cd4 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -40,3 +40,5 @@ test_script: | |
artifacts: | |
- path: builddir/razer_test_demo.exe | |
- path: builddir/subprojects/hidapi/hidapi.dll | |
+ - path: C:/Qt/5.11/msvc2017_64/lib/Qt5Cored.dll | |
+ - path: C:/Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll | |
-- | |
2.21.0 | |
From 094d008ee7c5a53c7c87d6624c8891fffb3c2df0 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:10:57 +0200 | |
Subject: [PATCH 36/46] Try 36 | |
--- | |
.appveyor.yml | 4 ++-- | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 1c93cd4..bd2f821 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -40,5 +40,5 @@ test_script: | |
artifacts: | |
- path: builddir/razer_test_demo.exe | |
- path: builddir/subprojects/hidapi/hidapi.dll | |
- - path: C:/Qt/5.11/msvc2017_64/lib/Qt5Cored.dll | |
- - path: C:/Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll | |
+ - path: ../../Qt/5.11/msvc2017_64/lib/Qt5Cored.dll | |
+ - path: ../../Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll | |
-- | |
2.21.0 | |
From 6dc168c96c0be35d815f0c147f474c12043bcedc Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:15:30 +0200 | |
Subject: [PATCH 37/46] Try 37 | |
--- | |
.appveyor.yml | 7 ++++--- | |
1 file changed, 4 insertions(+), 3 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index bd2f821..82a4c52 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -8,7 +8,7 @@ environment: | |
# compiler: msvc2015 | |
# - arch: x64 | |
# compiler: msvc2015 | |
- - arch: x86 | |
+ - arch: x64 | |
compiler: msvc2017 | |
platform: | |
@@ -33,6 +33,8 @@ build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- cmd: meson --backend=ninja builddir | |
- cmd: ninja -C builddir -v | |
+ - cmd: mkdir builddir/bindeps/ | |
+ - cmd: cp C:/Qt/5.11/msvc2017_64/lib/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll builddir/bindeps/ | |
test_script: | |
- cmd: ninja -C builddir test | |
@@ -40,5 +42,4 @@ test_script: | |
artifacts: | |
- path: builddir/razer_test_demo.exe | |
- path: builddir/subprojects/hidapi/hidapi.dll | |
- - path: ../../Qt/5.11/msvc2017_64/lib/Qt5Cored.dll | |
- - path: ../../Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll | |
+ - path: builddir/bindeps/*.dll | |
-- | |
2.21.0 | |
From 683970c3b0b719694d96c64e24d18b47fc88becc Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:17:29 +0200 | |
Subject: [PATCH 38/46] Try 38 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 82a4c52..6f90b7f 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -33,7 +33,7 @@ build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- cmd: meson --backend=ninja builddir | |
- cmd: ninja -C builddir -v | |
- - cmd: mkdir builddir/bindeps/ | |
+ - cmd: mkdir builddir\bindeps | |
- cmd: cp C:/Qt/5.11/msvc2017_64/lib/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll builddir/bindeps/ | |
test_script: | |
-- | |
2.21.0 | |
From 21a91bddc3506a0b02cd20c0d825687d42834888 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:19:08 +0200 | |
Subject: [PATCH 39/46] Try 39 | |
--- | |
.appveyor.yml | 1 + | |
1 file changed, 1 insertion(+) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 6f90b7f..9e0a23d 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -28,6 +28,7 @@ install: | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
+ - cmd: dir C:\Qt\5.11\msvc2017_64\lib | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From f24803042483297fad7be72097de3680c8f68880 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:20:50 +0200 | |
Subject: [PATCH 40/46] Try 40 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 9e0a23d..43840af 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -28,7 +28,7 @@ install: | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
- - cmd: dir C:\Qt\5.11\msvc2017_64\lib | |
+ - cmd: dir C:\Qt\5.11\msvc2017_64\bin | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
-- | |
2.21.0 | |
From 0d389a6852359153555353c94cb8cdf687e2e8ee Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:21:56 +0200 | |
Subject: [PATCH 41/46] Try 41 | |
--- | |
.appveyor.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 43840af..d45c32e 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -35,7 +35,7 @@ build_script: | |
- cmd: meson --backend=ninja builddir | |
- cmd: ninja -C builddir -v | |
- cmd: mkdir builddir\bindeps | |
- - cmd: cp C:/Qt/5.11/msvc2017_64/lib/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/lib/Qt5DBusd.dll builddir/bindeps/ | |
+ - cmd: cp C:/Qt/5.11/msvc2017_64/bin/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/bin/Qt5DBusd.dll builddir/bindeps/ | |
test_script: | |
- cmd: ninja -C builddir test | |
-- | |
2.21.0 | |
From 4bd48c1306eb64dfbb869c53a5ac6a2c02e58f13 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 02:30:36 +0200 | |
Subject: [PATCH 42/46] Try 42 | |
--- | |
.appveyor.yml | 11 +++++++---- | |
1 file changed, 7 insertions(+), 4 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index d45c32e..dcf5f0c 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -28,7 +28,6 @@ install: | |
# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
- - cmd: dir C:\Qt\5.11\msvc2017_64\bin | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
@@ -40,7 +39,11 @@ build_script: | |
test_script: | |
- cmd: ninja -C builddir test | |
+after_build: | |
+ - cmd: 7z a razer_test.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll C:/Qt/5.11/msvc2017_64/bin/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/bin/Qt5DBusd.dll | |
+ | |
artifacts: | |
- - path: builddir/razer_test_demo.exe | |
- - path: builddir/subprojects/hidapi/hidapi.dll | |
- - path: builddir/bindeps/*.dll | |
+ - path: razer_test.zip | |
+# - path: builddir/razer_test_demo.exe | |
+# - path: builddir/subprojects/hidapi/hidapi.dll | |
+# - path: builddir/bindeps/*.dll | |
-- | |
2.21.0 | |
From 0f3a1c716c3332eda938770457e682bcb845a2ee Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 13:47:00 +0200 | |
Subject: [PATCH 43/46] Try 43 | |
--- | |
.appveyor.yml | 23 +++++++++++------------ | |
1 file changed, 11 insertions(+), 12 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index dcf5f0c..02117e8 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -15,32 +15,31 @@ platform: | |
- x64 | |
install: | |
- # Use the x86 python only when building for x86 for the cpython tests. | |
- # For all other archs (including, say, arm), use the x64 python. | |
+ # Download ninja & pkg-config | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- ps: (new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\razer-test\pkg-config.exe') | |
- - cmd: if %arch%==x86 (set MESON_PYTHON_PATH=C:\python37) else (set MESON_PYTHON_PATH=C:\python37-x64) | |
+ - cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python37) else (set PYTHON_ROOT=C:\python37-x64) | |
- cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 | |
- - cmd: set PATH=C:\Qt\5.11\msvc2017_64\bin;%PATH% | |
- - cmd: "SET PATH=%cd%;%MESON_PYTHON_PATH%;%MESON_PYTHON_PATH%\\Scripts;%PATH%" | |
- - cmd: echo Using Python at %MESON_PYTHON_PATH% | |
+ - cmd: set QT_ROOT=C:\Qt\5.11\msvc2017_64 | |
+ - cmd: echo Using Python at %PYTHON_ROOT% | |
+ - cmd: echo Using Boost at %BOOST_ROOT% | |
+ - cmd: echo Using Qt at %QT_ROOT% | |
+ - cmd: set PATH=%cd%;%QT_ROOT%\bin;%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH% | |
- cmd: pip install meson | |
-# - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
-# - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" | |
+ - cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
+ - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
+ - cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %arch% ) | |
build_script: | |
- cmd: echo Building on %arch% with %compiler% | |
- cmd: meson --backend=ninja builddir | |
- cmd: ninja -C builddir -v | |
- - cmd: mkdir builddir\bindeps | |
- - cmd: cp C:/Qt/5.11/msvc2017_64/bin/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/bin/Qt5DBusd.dll builddir/bindeps/ | |
test_script: | |
- cmd: ninja -C builddir test | |
after_build: | |
- - cmd: 7z a razer_test.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll C:/Qt/5.11/msvc2017_64/bin/Qt5Cored.dll C:/Qt/5.11/msvc2017_64/bin/Qt5DBusd.dll | |
+ - cmd: 7z a razer_test.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll %QT_ROOT%\bin\Qt5Cored.dll %QT_ROOT%\bin\Qt5DBusd.dll | |
artifacts: | |
- path: razer_test.zip | |
-- | |
2.21.0 | |
From 56a06b7d4688bba318b710de4dea6939e27a4adb Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 13:56:52 +0200 | |
Subject: [PATCH 44/46] Try 44 | |
--- | |
.appveyor.yml | 23 ++++++++++++----------- | |
1 file changed, 12 insertions(+), 11 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 02117e8..6ad7ad2 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -2,12 +2,10 @@ os: Visual Studio 2017 | |
environment: | |
matrix: | |
-# - arch: x86 | |
-# compiler: msvc2010 | |
-# - arch: x86 | |
-# compiler: msvc2015 | |
-# - arch: x64 | |
-# compiler: msvc2015 | |
+ - arch: x86 | |
+ compiler: msvc2015 | |
+ - arch: x64 | |
+ compiler: msvc2015 | |
- arch: x64 | |
compiler: msvc2017 | |
@@ -18,14 +16,19 @@ install: | |
# Download ninja & pkg-config | |
- ps: (new-object net.webclient).DownloadFile('https://www.dropbox.com/s/cyghxjrvgplu7sy/ninja.exe?dl=1', 'C:\projects\razer-test\ninja.exe') | |
- ps: (new-object net.webclient).DownloadFile('http://nirbheek.in/files/binaries/pkg-config/win32/pkg-config.exe', 'C:\projects\razer-test\pkg-config.exe') | |
+ # Set paths to dependencies (based on architecture) | |
- cmd: if %arch%==x86 (set PYTHON_ROOT=C:\python37) else (set PYTHON_ROOT=C:\python37-x64) | |
+ - cmd: if %arch%==x86 (set QT_ROOT=C:\Qt\5.11\%compiler%) else (set QT_ROOT=C:\Qt\5.11\%compiler%_64) | |
- cmd: set BOOST_ROOT=C:\Libraries\boost_1_67_0 | |
- - cmd: set QT_ROOT=C:\Qt\5.11\msvc2017_64 | |
+ # Print out dependency paths | |
- cmd: echo Using Python at %PYTHON_ROOT% | |
- - cmd: echo Using Boost at %BOOST_ROOT% | |
- cmd: echo Using Qt at %QT_ROOT% | |
+ - cmd: echo Using Boost at %BOOST_ROOT% | |
+ # Add neccessary paths to PATH variable | |
- cmd: set PATH=%cd%;%QT_ROOT%\bin;%PYTHON_ROOT%;%PYTHON_ROOT%\Scripts;%PATH% | |
+ # Install meson | |
- cmd: pip install meson | |
+ # Set up the build environment | |
- cmd: if %compiler%==msvc2010 ( call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) | |
- cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %arch% ) | |
@@ -39,10 +42,8 @@ test_script: | |
- cmd: ninja -C builddir test | |
after_build: | |
+ # Zip build binaries and dependencies | |
- cmd: 7z a razer_test.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll %QT_ROOT%\bin\Qt5Cored.dll %QT_ROOT%\bin\Qt5DBusd.dll | |
artifacts: | |
- path: razer_test.zip | |
-# - path: builddir/razer_test_demo.exe | |
-# - path: builddir/subprojects/hidapi/hidapi.dll | |
-# - path: builddir/bindeps/*.dll | |
-- | |
2.21.0 | |
From edc468426250ae466baabb66b830357c3a1b73a0 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 14:02:57 +0200 | |
Subject: [PATCH 45/46] Try 45 | |
--- | |
.appveyor.yml | 2 -- | |
1 file changed, 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 6ad7ad2..8b190aa 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -4,8 +4,6 @@ environment: | |
matrix: | |
- arch: x86 | |
compiler: msvc2015 | |
- - arch: x64 | |
- compiler: msvc2015 | |
- arch: x64 | |
compiler: msvc2017 | |
-- | |
2.21.0 | |
From 3cab1f6e2d619cc09e7fe9f87012004d81c2bbfa Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Tue, 21 Aug 2018 14:06:16 +0200 | |
Subject: [PATCH 46/46] Try 46 | |
--- | |
.appveyor.yml | 4 ++-- | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
diff --git a/.appveyor.yml b/.appveyor.yml | |
index 8b190aa..6c8edab 100644 | |
--- a/.appveyor.yml | |
+++ b/.appveyor.yml | |
@@ -41,7 +41,7 @@ test_script: | |
after_build: | |
# Zip build binaries and dependencies | |
- - cmd: 7z a razer_test.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll %QT_ROOT%\bin\Qt5Cored.dll %QT_ROOT%\bin\Qt5DBusd.dll | |
+ - cmd: 7z a razer_test_%compiler%_%arch%.zip %APPVEYOR_BUILD_FOLDER%\builddir\razer_test_demo.exe %APPVEYOR_BUILD_FOLDER%\builddir\subprojects\hidapi\hidapi.dll %QT_ROOT%\bin\Qt5Cored.dll %QT_ROOT%\bin\Qt5DBusd.dll | |
artifacts: | |
- - path: razer_test.zip | |
+ - path: razer_test*.zip | |
-- | |
2.21.0 | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 370838aaab47aa707568122d7cf2e92b88fcb8bd Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 12:49:01 +0200 | |
Subject: [PATCH 01/11] Initial travis file | |
--- | |
.travis.yml | 24 ++++++++++++++++++++++++ | |
1 file changed, 24 insertions(+) | |
create mode 100644 .travis.yml | |
diff --git a/.travis.yml b/.travis.yml | |
new file mode 100644 | |
index 0000000..269aefb | |
--- /dev/null | |
+++ b/.travis.yml | |
@@ -0,0 +1,24 @@ | |
+language: cpp | |
+ | |
+os: | |
+ - linux | |
+ - osx | |
+ | |
+compiler: | |
+ - gcc | |
+ - clang | |
+ | |
+addons: | |
+ apt: | |
+ packages: | |
+ - meson | |
+ - qt5-default | |
+ | |
+before_install: | |
+# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install meson qt5-base; fi | |
+ | |
+ | |
+script: | |
+ - meson build | |
+ - ninja -C build | |
-- | |
2.21.0 | |
From 7ef30f14aefe1070ef38e9d921e377dc7ae74228 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:16:22 +0200 | |
Subject: [PATCH 02/11] Take 2 | |
--- | |
.travis.yml | 18 +++++++++--------- | |
1 file changed, 9 insertions(+), 9 deletions(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 269aefb..1b30b44 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -8,17 +8,17 @@ compiler: | |
- gcc | |
- clang | |
-addons: | |
- apt: | |
- packages: | |
- - meson | |
- - qt5-default | |
+services: | |
+ - docker | |
before_install: | |
-# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install meson qt5-base; fi | |
+# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install meson qt; fi | |
script: | |
- - meson build | |
- - ninja -C build | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM ubuntu:latest > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then meson builddir && ninja -C builddir test; fi | |
-- | |
2.21.0 | |
From 692d4d1e2a74c6cd67235e7a266ee3d58a92cf46 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:21:13 +0200 | |
Subject: [PATCH 03/11] Take 3 | |
--- | |
.travis.yml | 11 ++++++----- | |
1 file changed, 6 insertions(+), 5 deletions(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 1b30b44..08372d9 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -13,12 +13,13 @@ services: | |
before_install: | |
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install meson qt; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install meson qt hidapi; fi | |
script: | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM ubuntu:latest > Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default' | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then meson builddir && ninja -C builddir test; fi | |
-- | |
2.21.0 | |
From fdb78c713c7041452b476e06c8842640572c45a3 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:27:53 +0200 | |
Subject: [PATCH 04/11] Take 4 | |
--- | |
.travis.yml | 3 ++- | |
1 file changed, 2 insertions(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 08372d9..0afdd21 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -19,7 +19,8 @@ before_install: | |
script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default' | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then meson builddir && ninja -C builddir test; fi | |
-- | |
2.21.0 | |
From 52c6994da475896f41c59ee5b4b3af76d6d8e34c Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:36:25 +0200 | |
Subject: [PATCH 05/11] Take 5 | |
--- | |
.travis.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 0afdd21..9696033 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -19,7 +19,7 @@ before_install: | |
script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From 7c03b34ace9433d26482ad1b566e0273a1fd1e37 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:41:47 +0200 | |
Subject: [PATCH 06/11] Take 6 | |
--- | |
.travis.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 9696033..db13442 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -19,7 +19,7 @@ before_install: | |
script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From cf72d6ff81b6b1571e004f25d0a5855841ec8ad6 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:45:55 +0200 | |
Subject: [PATCH 07/11] Take 7 | |
--- | |
.travis.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index db13442..aad09ec 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -19,7 +19,7 @@ before_install: | |
script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From f2930da7dfaed1130e25457d8938ed49f63a2a52 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 13:58:28 +0200 | |
Subject: [PATCH 08/11] Take 8 | |
--- | |
.travis.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index aad09ec..3b891fa 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -19,7 +19,7 @@ before_install: | |
script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From c006278343847baa8632a126c2ac81d3a3466096 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 14:56:05 +0200 | |
Subject: [PATCH 09/11] Musl Take 1 | |
--- | |
.travis.yml | 18 ++++++++++++++++-- | |
1 file changed, 16 insertions(+), 2 deletions(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 3b891fa..b41472a 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -8,6 +8,17 @@ compiler: | |
- gcc | |
- clang | |
+env: | |
+ - LIBC=glibc | |
+ - LIBC=musl | |
+ | |
+matrix: | |
+ exclude: | |
+ - os: osx | |
+ compiler: gcc | |
+ - os: osx | |
+ env: LIBC=musl | |
+ | |
services: | |
- docker | |
@@ -17,9 +28,12 @@ before_install: | |
script: | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "glibc" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'FROM alpine:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "glibc" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN apk install meson qt5-qtbase-dev g++ clang pkgconf hidapi-dev@testing boost-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From ef2db55fc0074352a31f07f4aa9164fe1a83c36d Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 14:59:34 +0200 | |
Subject: [PATCH 10/11] Musl Take 2 | |
--- | |
.travis.yml | 2 +- | |
1 file changed, 1 insertion(+), 1 deletion(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index b41472a..2aa1abe 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -33,7 +33,7 @@ script: | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "glibc" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN apk install meson qt5-qtbase-dev g++ clang pkgconf hidapi-dev@testing boost-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN apk add meson qt5-qtbase-dev g++ clang pkgconf hidapi-dev@testing boost-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
From 645fe3faf851b5625eed490291b9d8db97dd5986 Mon Sep 17 00:00:00 2001 | |
From: Luca Weiss <[email protected]> | |
Date: Mon, 20 Aug 2018 15:16:55 +0200 | |
Subject: [PATCH 11/11] Musl Take 3 | |
--- | |
.travis.yml | 21 +++++++++++++-------- | |
1 file changed, 13 insertions(+), 8 deletions(-) | |
diff --git a/.travis.yml b/.travis.yml | |
index 2aa1abe..6019e1e 100644 | |
--- a/.travis.yml | |
+++ b/.travis.yml | |
@@ -9,15 +9,20 @@ compiler: | |
- clang | |
env: | |
- - LIBC=glibc | |
- - LIBC=musl | |
+ - DISTRO=ubuntu | |
+ - DISTRO=alpine | |
+ - DISTRO=macos | |
matrix: | |
exclude: | |
- os: osx | |
compiler: gcc | |
- os: osx | |
- env: LIBC=musl | |
+ env: DISTRO=ubuntu | |
+ - os: osx | |
+ env: DISTRO=alpine | |
+ - os: linux | |
+ env: DISTRO=macos | |
services: | |
- docker | |
@@ -28,12 +33,12 @@ before_install: | |
script: | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "glibc" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'FROM alpine:latest' > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DISTRO" == "ubuntu" ]]; then echo 'FROM ubuntu:latest' > Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DISTRO" == "alpine" ]]; then echo 'FROM alpine:latest' > Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo 'ADD . /root' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "glibc" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories' >> Dockerfile; fi | |
- - if [[ "$TRAVIS_OS_NAME" == "linux" && "$LIBC" == "musl" ]]; then echo 'RUN apk add meson qt5-qtbase-dev g++ clang pkgconf hidapi-dev@testing boost-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DISTRO" == "ubuntu" ]]; then echo 'RUN apt-get update && apt-get install -y meson qt5-default g++ clang pkg-config libhidapi-dev libboost-dev' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DISTRO" == "alpine" ]]; then echo 'RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories' >> Dockerfile; fi | |
+ - if [[ "$TRAVIS_OS_NAME" == "linux" && "$DISTRO" == "alpine" ]]; then echo 'RUN apk add meson qt5-qtbase-dev g++ clang pkgconf hidapi-dev@testing boost-dev' >> Dockerfile; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t myimage .; fi | |
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run myimage /bin/sh -c "cd /root && TRAVIS=true CC=$CC CXX=$CXX meson builddir && ninja -C builddir test"; fi | |
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH"; fi | |
-- | |
2.21.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment