Deploy script for Linux ready for GYP build.

This commit is contained in:
John Preston 2016-09-12 13:17:20 +03:00
parent f517494c91
commit 07e2eb4c57
3 changed files with 11 additions and 14 deletions

View File

@ -50,13 +50,13 @@ if [ "$BuildTarget" == "linux" ]; then
echo "Deploying version $AppVersionStrFull for Linux 64bit.." echo "Deploying version $AppVersionStrFull for Linux 64bit.."
UpdateFile="tlinuxupd$AppVersion" UpdateFile="tlinuxupd$AppVersion"
SetupFile="tsetup.$AppVersionStrFull.tar.xz" SetupFile="tsetup.$AppVersionStrFull.tar.xz"
ReleasePath="$HomePath/../Linux/Release" ReleasePath="$HomePath/../out/Release"
RemoteFolder="tlinux" RemoteFolder="tlinux"
elif [ "$BuildTarget" == "linux32" ]; then elif [ "$BuildTarget" == "linux32" ]; then
echo "Deploying version $AppVersionStrFull for Linux 32bit.." echo "Deploying version $AppVersionStrFull for Linux 32bit.."
UpdateFile="tlinux32upd$AppVersion" UpdateFile="tlinux32upd$AppVersion"
SetupFile="tsetup32.$AppVersionStrFull.tar.xz" SetupFile="tsetup32.$AppVersionStrFull.tar.xz"
ReleasePath="$HomePath/../Linux/Release" ReleasePath="$HomePath/../out/Release"
RemoteFolder="tlinux32" RemoteFolder="tlinux32"
elif [ "$BuildTarget" == "mac" ]; then elif [ "$BuildTarget" == "mac" ]; then
DeployMac="0" DeployMac="0"

View File

@ -134,7 +134,11 @@ function(add_precompiled_header _target _input)
set(_pch_compile_flags) set(_pch_compile_flags)
endif() endif()
separate_arguments(_pch_compile_flags) separate_arguments(_pch_compile_flags)
list(APPEND _pch_compile_flags -Winvalid-pch -include "${_pchfile}") if(_source MATCHES \\.\(cc|cxx|cpp\)$)
list(APPEND _pch_compile_flags -Winvalid-pch -include "${_pchfile}")
else()
list(APPEND _pch_compile_flags -Winvalid-pch "-I${_pch_binary_dir}")
endif()
get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS) get_source_file_property(_object_depends "${_source}" OBJECT_DEPENDS)
if(NOT _object_depends) if(NOT _object_depends)

View File

@ -200,6 +200,7 @@
'<(src_loc)/core/qthelp_url.cpp', '<(src_loc)/core/qthelp_url.cpp',
'<(src_loc)/core/qthelp_url.h', '<(src_loc)/core/qthelp_url.h',
'<(src_loc)/core/vector_of_moveable.h', '<(src_loc)/core/vector_of_moveable.h',
'<(src_loc)/core/version.h',
'<(src_loc)/data/data_abstract_structure.cpp', '<(src_loc)/data/data_abstract_structure.cpp',
'<(src_loc)/data/data_abstract_structure.h', '<(src_loc)/data/data_abstract_structure.h',
'<(src_loc)/data/data_drafts.cpp', '<(src_loc)/data/data_drafts.cpp',
@ -456,19 +457,11 @@
'<(src_loc)/window/top_bar_widget.cpp', '<(src_loc)/window/top_bar_widget.cpp',
'<(src_loc)/window/top_bar_widget.h', '<(src_loc)/window/top_bar_widget.h',
], ],
'configurations': {
'Release': {
'conditions': [
['"<(official_build_target)" != ""', {
'defines': [
'CUSTOM_API_ID',
],
}],
],
},
},
'conditions': [ 'conditions': [
[ '"<(official_build_target)" != ""', { [ '"<(official_build_target)" != ""', {
'defines': [
'CUSTOM_API_ID',
],
'dependencies': [ 'dependencies': [
'utils.gyp:Packer', 'utils.gyp:Packer',
], ],