Commit Graph
672 Commits
Author SHA1 Message Date
Vasily b60113fb8e Replace GCC version regex with simpler solution 2019-04-22 09:56:50 +02:00
Vasily 9cfaf68a92 Update GCC compiler to not use hardcoded g++-7
Newer versions of Ubuntu ship with >g++-7, so there will be less of a
need as time goes on to perform this hack.
2019-04-22 09:56:50 +02:00
Vasily d139c34a67 Give clang/gcc explicit path to third-party libs
Qt Creator on Linux does not recognize the previous solution. Adding the
$$PWD makes the IDE work.
2019-04-22 09:56:50 +02:00
Vasily bdf66a658b Make Linux look in current folder for OpenVR lib 2019-04-22 09:56:50 +02:00
Vasily 381fe3aee3 Add Ctrl+C/Ctrl+V keybinds to X11 version 2019-04-22 09:56:50 +02:00
Vasily 1536059a4b Replace X11 enter key
Tester @Goofybud on Debian reported that the enter button did not work.
There are apparently 4 different enter buttons in X11:
    XK_Linefeed
    XK_Return
    XK_KP_Enter
    XK_ISO_Enter

I am attempting XK_Return because it seems like the most obvious next
attempt.
2019-04-22 09:56:50 +02:00
Vasily 30ef80d19c Update X11 package on Travis, clarify qt build specs
macx is also unix, apparently meaning it's necessary to distinguish
between the two.
2019-04-22 09:56:50 +02:00
Vasily 86ec4975fc Add Linux impl of some keyboard inputs 2019-04-22 09:56:50 +02:00
Vasily 860eca1956 Add compiling on Ubuntu for X11 funcs 2019-04-22 09:56:50 +02:00
Vasily 7a3737e0de Initial X11 groundwork 2019-04-22 09:56:50 +02:00
Kung-vr 1c9cee9c99 Merge pull request #176 from OpenVR-Advanced-Settings/alpha-kung
Settings Tab Option: Old-Style Motion
2019-04-21 18:57:48 +09:00
Kung-vr 129a9a0cc1 Add Settings tab docs for Old-Style Motion option 2019-04-21 18:06:35 +09:00
Kung-vr 0494accfd6 Update SettingsPage.png screenshot 2019-04-21 17:59:18 +09:00
Kung-vr 591ea90383 Add some settings logging 2019-04-21 17:58:25 +09:00
Kung-vr 48f0743bf9 Add Old-Style Motion Setting 2019-04-21 17:57:39 +09:00
Kung-vr 9fd3ab0dee Merge pull request #173 from OpenVR-Advanced-Settings/version-string-file
Convert version string to be read from single file
2019-04-21 16:26:00 +09:00
Vasily 78d715ed4c Update documentation for version strings 2019-04-20 09:52:18 +02:00
Vasily b4e7b4cc8d Change version hash suffix to be first 8 characters
Github shows the first 8 instead of the last 8, this will make
comparison easier.
2019-04-20 09:12:56 +02:00
Vasily 7bf53cf081 Add more documentation on version strings 2019-04-20 08:57:36 +02:00
Vasily 13b3ba7a56 Update docs on version numbers for new system 2019-04-19 22:30:04 +02:00
Vasily 0e8e26d553 Change version name to 3.1.0-dev
The previous -new appendix was just to make sure the old name wasn't
being used instead.
2019-04-19 22:30:04 +02:00
Vasily 4450b9b38a Add version number to Windows exe file description
The "real" version number doesn't accept non-integers. This should make
debugging easier.
2019-04-19 22:30:04 +02:00
Vasily bb1d3e16fb Convert executable icon to new method
Manually creating an RC file was the Qt 4 way. The Qt 5 way is just
giving it an icon.

When an RC_FILE isn't manually created Qt will attempt to create one. If
there are non-integers in the version number the compilation will crash.

AdvancedSettings_resource.rc is a build artifact on Windows.
2019-04-19 22:30:04 +02:00
Vasily 164158330e Convert C++ version string to be define instead of include
This allows Qmake to use the version number as well as not requiring all
other uses of the version string to strip double quotes from it. This
also reduces the fragility of the version string as it was required to
be a valid C++ char*, even in contexts where that wouldn't matter.
2019-04-19 22:30:04 +02:00
Vasily 9bebfe3067 Add build directory to .gitignore
The Linux build process creates this directory and uses it. It should
not be committed.
2019-04-19 22:29:21 +02:00
Vasily 5c4e8a3486 Make version append script respect release builds
Users do not care about commit numbers and it only serves to confuse
them. Release builds should not contain build metadata since there
should only be one definitive version.
2019-04-19 22:29:21 +02:00
Vasily c36dd70f60 Change build metadata separator from - to +
SemVer 2.0.0 requires a plus for build metadata.

https://semver.org/
`Build metadata MAY be denoted by appending a plus sign and a series of
dot separated identifiers immediately following the patch or pre-release
version. Identifiers MUST comprise only ASCII alphanumerics and hyphen
[0-9A-Za-z-]. Identifiers MUST NOT be empty. Build metadata SHOULD be
ignored when determining version precedence. Thus two versions that
differ only in the build metadata, have the same precedence. Examples:
1.0.0-alpha+001, 1.0.0+20130313144700, 1.0.0-beta+exp.sha.5114f85.`
2019-04-19 22:29:21 +02:00
Vasily 5eea5d7e93 Make AppVeyor only use last 8 digits of hash 2019-04-19 22:29:21 +02:00
Vasily 0ec39f7714 Add double quotes around new version string 2019-04-19 22:29:21 +02:00
Vasily 3d13c68303 Move AppVeyor version string script to build section
It does not work in the init section for some reason, with python giving

python .\\build_scripts\\append_to_version_file.py
%APPVEYOR_REPO_COMMIT%
python: can't open file '.\\build_scripts\\append_to_version_file.py':
[Errno 2] No such file or directory
2019-04-19 22:29:21 +02:00
Vasily 72a319bc1e Make Python replace version file responsible for file writes
While the initial idea of having cmd/PS/bash actually write the changes
to file, the integration with the AppVeyor YAML just made it really
frustrating.
2019-04-19 22:29:21 +02:00
Vasily 4e781fa74a Make append version file more cross platform 2019-04-19 22:29:21 +02:00
Vasily af98c357fc Add version number to start of build script 2019-04-19 22:29:20 +02:00
Vasily 9303d93f27 Make appveyor able to inject git commit into version 2019-04-19 22:29:20 +02:00
Vasily a74f0cad49 Make NSIS and Win build scripts remove " character
It is not strictly necessary in the Python version because it's being
appended to a batch command, but in order to have things make sense if
the mechanism of dispatching commands changes the program will strip
double quotes.
2019-04-19 22:29:20 +02:00
Vasily 6cf009e915 Convert C++ code to read version string from file
This is definitely not a pretty thing. Double quotes are required around
the string which means they'll need to be removed in the NSIS and Python
scripts.
2019-04-19 22:29:20 +02:00
Vasily cd1522b9e2 Make windows build scripts read file for version number 2019-04-19 22:28:46 +02:00
Vasily e91c22d20a Change NSIS to look in file for version string 2019-04-19 22:28:06 +02:00
Vasily 82e2d1c863 Update version string to append "-dev" 2019-04-19 18:20:20 +02:00
ykeara 3da6f3d81c Release 3.1.0 (#167)
* updated version string

* format

* reverted clang-tidy change

* revert the revert
2019-04-19 09:14:02 -05:00
Vasily 387ae30899 Fix indentation with clang-format 8
AppVeyor automatically updated to LLVM 8 while everything else was on 7.
It is not possible to downgrade to LLVM 7 on AppVeyor, so we'll update
everything else to LLVM 8.
2019-04-19 15:29:18 +02:00
Vasily 14e2a1a3d8 Add version output to Travis 2019-04-19 15:29:18 +02:00
Vasily 89ad18ef4c Add version output to AppVeyor 2019-04-19 15:29:18 +02:00
Vasily 2cee659c2d Update windows build docs for Qt 5.12
5.12.2 is the latest version and so the most likely version for people
to download.
2019-04-17 20:51:34 +02:00
Vasily 28700575ec Replace single quotes with double quotes
Variable was not being expanded otherwise.
2019-04-17 20:51:34 +02:00
Vasily e83363052a Add QT_SELECT to TL;DR: versions 2019-04-17 20:51:34 +02:00
Vasily ed9e4008af Make Linux build scripts directory agnostic
Using the script location as an anchor, the scripts can now be called
from anywhere and work.
2019-04-17 20:51:34 +02:00
Vasily 6895a44ddb Refactor build_linux.sh into configure.sh
This moves all the error handling and setup into configure.sh, for a
cleaner script.
2019-04-17 20:51:34 +02:00
Vasily 5fad6ca4d1 Add table of contents and reduce indentation of headers
The #### headers do not look very distinct in Github markup, reducing
the header indentation will make them stand out more.
2019-04-17 20:51:34 +02:00
Vasily 1cbfd7173b Update documentation for packages required on Linux 2019-04-17 20:51:34 +02:00