SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Qmake copy package files instead of OS scripts

Browse Source 
Described in commit 97e203fd89e7cb54c7ce96ce779b2e8cb6ac1374

The python functions are no longer needed since the python script
doesn't handle file copy any more.
This commit is contained in:
Vasily
2019-07-24 10:54:55 +02:00
committed by username223
parent 46c8a62565
commit b5d69c589c
4 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
advancedSettings.pro
+5 -1
View File
@@ -45,7 +45,7 @@ include($$include_dir/sources.pri)
include($$include_dir/resources.pri)
# Copy extra files
COPIES += resCopy readmeCopy licenseCopy packageFilesCopy
COPIES += resCopy readmeCopy licenseCopy packageFilesCopy openvrApiCopy
COPY_DEST_DIR = $$OUT_PWD/$$DESTDIR
resCopy.files = src/res/*
@@ -61,3 +61,7 @@ licenseCopy.path = $$COPY_DEST_DIR
packageFilesCopy.files = src/package_files/*
packageFilesCopy.path = $$COPY_DEST_DIR
win32:openvrApiCopy.files = third-party/openvr/bin/win64/openvr_api.dll
unix:openvrApiCopy.files = third-party/openvr/lib/linux64/libopenvr_api.so
openvrApiCopy.path = $$COPY_DEST_DIR
build_scripts/linux/build_linux.sh
-1
View File
@@ -13,4 +13,3 @@ qmake -spec $QMAKE_SPEC $PROJECT_DIR $QMAKE_EXTRAS
$MAKE_COMMAND
$CLANG_TIDY
cp $PROJECT_DIR/third-party/openvr/lib/linux64/libopenvr_api.so $BUILD_DIR/bin/linux/AdvancedSettings/
build_scripts/win/build.py
-5
View File
@@ -117,11 +117,6 @@ def deploy():
say("windeployqt added to file.")
say("Copying necessary files:")
#openvr dll
copy_file(get_project_dir() + "\\third-party\\openvr\\bin\\win64\\openvr_api.dll", get_deploy_dir() + "\\openvr_api.dll")
say("Creating batch file:")
create_batch_file()
say("Batch file created.")
build_scripts/win/common.py
-37
View File
@@ -5,8 +5,6 @@ import os
import sys
import argparse
import subprocess
import shutil
import distutils.dir_util
import string
def get_version_string():
@@ -210,39 +208,4 @@ def get_original_dir():
def get_deploy_dir():
return DEPLOY_DIR
def copy_file(src, dest):
"""Copies a file and outputs status to console."""
say(f"Copying {src} to {dest}")
shutil.copy(src, dest)
say(f"{src} to {dest} copied.")
def copy_folder(src, dest):
"""Copies a folder and outputs status to console."""
say(f"Copying {src} to {dest}")
distutils.dir_util.copy_tree(src, dest)
say(f"{src} to {dest} copied.")