Commit Graph
309 Commits
Author SHA1 Message Date
Vasily 3e05bb07f9 Change Win build script batch file from test.bat to current_build.bat 2019-01-05 20:43:41 +01:00
Vasily 4787933a52 Add exit condition checking to build, deploy, package cmd files
Without the line checking the exit code, the script will not fail on a
failure from a subsystem.
2019-01-05 20:31:34 +01:00
Vasily 1df8e88e3d Change RM to DEL in build, package, deploy cmd files
RM is the Linux command, DEL is the Windows equivalent.
2019-01-05 19:53:34 +01:00
username223 6c26507945 Merge branch 'master' into update-win-builds 2019-01-04 20:56:39 +01:00
ykeara 553dbe4e12 Merge pull request #16 from ykeara/master
Default Audio Profile
2019-01-04 13:49:22 -06:00
ykeara 20914b4e71 fixed phantom double line 2019-01-04 13:38:20 -06:00
ykeara 4bb1ba7402 Merge branch 'master' of https://github.com/ykeara/OpenVR-AdvancedSettings 2019-01-04 13:35:21 -06:00
ykeara 15855c4564 fixed minor code formatting errors 2019-01-04 13:34:52 -06:00
Vasily d2ef036b8e Add build_scripts\win\test.bat to gitignore
Also reverse slashes to make git recognize the path.
2019-01-04 18:30:31 +01:00
Vasily 81d8c516a8 Add developer docs file
This allows devs on the project to write useful information that might
not fit anywhere else, or might be applicable to multiple things.
2019-01-04 17:07:52 +01:00
Vasily b5eb548b40 Update python scripts with docs 2019-01-04 17:07:52 +01:00
Vasily 3c32cabebf Rename variables in docs 2019-01-04 17:07:52 +01:00
Vasily 9a59f554ed Update .gitignore and appveyor 2019-01-04 17:07:52 +01:00
Vasily 33dba6202b Update PYTHON env var to PYTHON_LOC 2019-01-04 17:07:52 +01:00
Vasily 93bbcc618a Correct 7zip directory, no python definition expansion 2019-01-04 17:07:52 +01:00
Vasily fa17b481b8 Specify python version in build_window.cmd 2019-01-04 17:07:52 +01:00
Vasily d4b09c76ad Update python scripts, build_windows.cmd 2019-01-04 17:07:52 +01:00
Vasily bfb11a9dc8 Add package python script, replace .cmd with py variants from PS 2019-01-04 17:08:34 +01:00
Vasily 1f1d321398 Update deployment script
Still needs file copying and batch file output.
2019-01-04 17:07:52 +01:00
Vasily 979f542348 Rename build.py to win_build.py
It's also going to fit the deploy and package scripts.
2019-01-04 17:07:52 +01:00
Vasily b806667717 Use python build script 2019-01-04 17:07:52 +01:00
Vasily 045a7d8e7c Update appveyor file and turn off /WX for clang-msvc
win32-clang-msvc has an error when compiling with /WX. The moc_predefs.h
file is not being built correctly, while without /WX it works. The
change should be reverted to enabling /WX for all msvc compilers when
the clang-msvc issue is fixed.

Update path to clang-format in appveyor file

Retry CI on Python script

Python script failed on CI due to run-clang-format.py: error: [Error 5]
Access is denied. Research says attempting again might solve the
problem.
2019-01-04 17:07:55 +01:00
Vasily 644c887f71 Update version strings, update NSIS file, move around extra files
The additional files packaged with the installer have been moved to
their own dir to separate them from the C++ source.

All licenses are now also included in the installer, as per the terms.

The version string in overlaycontroller.h has been updated to 2.8.0.
2019-01-04 17:06:02 +01:00
Vasily 14ab02f155 Remove function calls to say all vars are found 2019-01-04 16:14:47 +01:00
Vasily e7cb2d8c1a Add python build.py script
Does not work as well as the PS script, because of having to create
subprocesses and routing stdout and stderr seems to be problematic.
2019-01-04 16:13:23 +01:00
ykeara 894ac6e24d Merge branch 'master' into master 2019-01-03 15:44:05 -06:00
ykeara b883d2cffd default audio profile and view added
Update logging dependency from 9.84 to 9.89

This is the newest version that doesn't lead to compile errors. It has
also reduced the amount of "-Wexpansion-to-defined" errors on clang-msvc
by about 80 (from ~400 to 320).

Update easylogging license file

Originally came as LICENCE.txt (notice C instead of S in LICENSE),
renamed to better fit into the git history.

Move logging defines to QMAKE instead of logging.h

Defines done outside of easylogging++.h does not work according to
official documentation
(https://github.com/zuhd-org/easyloggingpp/blob/master/README.md#configuration-macros)

"NOTE: All the macros can be defined in one of the following ways:

1. Define macros using -D option of compiler, for example in case of
g++ you will do g++ source.cpp ... -DELPP_SYSLOG -DELPP_THREAD_SAFE
... (recommended way)

2. Define macros inside "easylogging++.h" (defining macros in other
files won't work)"

Linking to this issue:
https://github.com/zuhd-org/easyloggingpp/issues/590#issuecomment-346753951

We are using the developer recommended way of defining them by command
line.

What is assumed to be the intention of enabling debug logs before
including easylogging++ never actually did anything, hence this define
is dropped. Newer versions of easylogging++ uses the macro
ELPP_DISABLE_DEBUG_LOGS to _disable_ debug logs. Leaving that macro
undefined satisfies the original intent.

Move easylogging++ include into necessary files

logging.h previously had logic to enable debug logging even on release
builds. This logic was moved to the QMAKE file, hence the logging.h file
is no longer necessary.

Update easylogging++ to 9.96.7, turn on /WX for clang-msvc

Updating from easylogging++ 9.89 to 9.96.7 turns it from a header only
library to one requiring a source file. It has been added to sources
near the other third party includes in the QMAKE to signify that it
isn't a first party file.

Updating easylogging++ also means that clang-msvc can compile without
any warnings, hence turning on warnings as errors for that compiler as
well, to avoid any regressions.

updated to current

fixed formatting

fixed ptt add bug/compilerwarnings/c++14 target

cleaned up .pro file

fixed casting back to c++ style

added default profile and ptt profile view

fixed c++ casts

fixed logic error on getDevice functions
2019-01-03 15:37:20 -06:00
Vasily b0bce08c2d Convert win formatting script to use LLVM_LOC instead of
CLANG_FORMAT_LOC

The path to the bin dir for LLVM can be used for both clang-cl.exe and
clang-format.exe. Changing this will reduce the amount of environment
variables in play, leading to better long term quality.
2018-12-29 01:17:51 +01:00
Vasily 7449b1f1a9 Disable packaging and building installer by default
The average dev doesn't need to test out the zipping and installer
building utility. Having them package on every build is a waste of time.
2018-12-29 00:58:26 +01:00
username223 50a7486fc9 Merge pull request #13 from OpenVR-Advanced-Settings/update-dep-log
Update easylogging++ from 9.84 to 9.96.7, turn on warnings as errors for clang-msvc
2018-12-28 22:23:40 +01:00
username223 931c417331 Merge branch 'master' into update-dep-log 2018-12-28 22:17:32 +01:00
ykeara 75b7b5df0b merging for org 2018-12-28 14:31:30 -06:00
username223 cfde8ada63 Merge pull request #12 from OpenVR-Advanced-Settings/formatting
Implement clang-format and format entire src directory
2018-12-28 20:54:03 +01:00
ykeara 27247e5ecd default profile + display ptt/audio profile 2018-12-28 13:45:21 -06:00
Robin Appelman 3f0fbeb1b0 mark linux formatting scripts as executable 2018-12-28 20:42:33 +01:00
ykeara c9e939a935 Merge pull request #6 from OpenVR-Advanced-Settings/master
catching up with org
2018-12-28 13:32:30 -06:00
ykeara 541c82cbbf display selected profile + default profile added 2018-12-28 13:30:19 -06:00
Vasily 07ca5340dd Update easylogging++ to 9.96.7, turn on /WX for clang-msvc
Updating from easylogging++ 9.89 to 9.96.7 turns it from a header only
library to one requiring a source file. It has been added to sources
near the other third party includes in the QMAKE to signify that it
isn't a first party file.

Updating easylogging++ also means that clang-msvc can compile without
any warnings, hence turning on warnings as errors for that compiler as
well, to avoid any regressions.
2018-12-28 20:18:47 +01:00
Vasily a49d889ee8 Move easylogging++ include into necessary files
logging.h previously had logic to enable debug logging even on release
builds. This logic was moved to the QMAKE file, hence the logging.h file
is no longer necessary.
2018-12-28 20:07:00 +01:00
Vasily ad07220baf Move logging defines to QMAKE instead of logging.h
Defines done outside of easylogging++.h does not work according to
official documentation
(https://github.com/zuhd-org/easyloggingpp/blob/master/README.md#configuration-macros)

"NOTE: All the macros can be defined in one of the following ways:

1. Define macros using -D option of compiler, for example in case of
g++ you will do g++ source.cpp ... -DELPP_SYSLOG -DELPP_THREAD_SAFE
... (recommended way)

2. Define macros inside "easylogging++.h" (defining macros in other
files won't work)"

Linking to this issue:
https://github.com/zuhd-org/easyloggingpp/issues/590#issuecomment-346753951

We are using the developer recommended way of defining them by command
line.

What is assumed to be the intention of enabling debug logs before
including easylogging++ never actually did anything, hence this define
is dropped. Newer versions of easylogging++ uses the macro
ELPP_DISABLE_DEBUG_LOGS to _disable_ debug logs. Leaving that macro
undefined satisfies the original intent.
2018-12-28 19:49:49 +01:00
Vasily 9519d96e93 Update easylogging license file
Originally came as LICENCE.txt (notice C instead of S in LICENSE),
renamed to better fit into the git history.
2018-12-28 19:04:59 +01:00
Vasily 7cea4f23d1 Update logging dependency from 9.84 to 9.89
This is the newest version that doesn't lead to compile errors. It has
also reduced the amount of "-Wexpansion-to-defined" errors on clang-msvc
by about 80 (from ~400 to 320).
2018-12-28 18:59:58 +01:00
Vasily 9d9d3c8c7d Fix link errors in readmes 2018-12-28 15:57:32 +01:00
Vasily 4e05e66154 Update readme and building_for_windows
Adds links to programs needed in the windows file and links to
CONTRIBUTING.md for both Windows and Linux.
2018-12-28 15:53:49 +01:00
Vasily 3a6c8f5b11 Add documentation for use of clang-format
A CONTRIBUTING file is considered special by Github, being automatically
linked to whenever an attempted pull request is made. Writing the
formatting changes along with how to submit bug reports might seem
fractured, but the special status of the CONTRIBUTING file means that
users are likely to find it. Additionally, links will be added to the
Readme and building_on_windows files.
2018-12-28 15:53:49 +01:00
Vasily 1e3d3b3aed Add additional error handling to verification scripts 2018-12-28 15:53:41 +01:00
Vasily e0de89092e Add Travis CI badge to readme
Individual badges moved to own lines for readability.
2018-12-28 03:35:07 +01:00
Vasily 51057c1d79 Format every single file using .clang-format 2018-12-28 03:06:42 +01:00
Vasily 89c02642fc Fix switch in .clang-format that sorted includes.
This leads to a ton of compile errors. Better just leave it off.
2018-12-28 03:03:16 +01:00
Vasily 86a0dae70b Add verification scripts for clang-format
The scripts are very light on error handling and verification, mostly
intended just to debug if a CI server fails on formatting reasons.
2018-12-28 03:01:45 +01:00