Commit Graph

72 Commits

Author SHA1 Message Date
ymshenyu
c3296dc6e0 NSIS: kill process before uninstall/install
Revert "we need more escape character"

This reverts commit e11727eae66d6d506da8b6d1e5ae85fdd50f9932.

update deployment.cmake
we need more escape character
Revert "fix typo?"

This reverts commit 30a548cb6f8b3815be1b5c865aef4c94ff3904c1.
fix typo?
This should work?
This should work
fix typo
kill process before uninstall/install
2020-04-30 18:20:52 +08:00
ymshenyu
83ade3638a
add windows missing system library for nsis 2020-04-27 23:25:36 +08:00
ymshenyu
1261f265af fix msvc runtime for windows portable package - 2 2020-04-26 19:12:11 +08:00
ymshenyu
77b75c60eb fix msvc runtime for windows portable package - 1 2020-04-26 19:02:13 +08:00
ymshenyu
6edbad35d5 fix msvc runtime for windows portable package 2020-04-26 18:48:52 +08:00
ymshenyu
2380b3f935
Merge branch 'version-v2' into dev 2020-04-23 22:17:29 +08:00
ymshenyu
9665f61162
snap: fix build 2020-04-22 21:09:13 +08:00
ymshenyu
0fc29067c2 update cmakelists 2020-04-22 20:20:07 +08:00
Qv2ray-dev
603f769095
It's in macOS now 2020-04-20 20:50:53 +08:00
ymshenyu
569552089e
Update backend.cmake 2020-04-20 20:39:15 +08:00
ymshenyu
696f2ed6d9 update qnodeeditor.cmake 2020-04-19 12:08:14 +08:00
ymshenyu
2c80f5b86d
cmake: refactor (#525)
* refactor cmake
2020-04-19 11:46:54 +08:00
ymshenyu
d8f059e2d6 update backend.cmake 2020-04-18 23:36:39 +08:00
ymshenyu
e75eee2622 add missing api backend library 2020-04-18 23:26:24 +08:00
Qv2ray-dev
153f5db99d
Fix DMG background issue. (#517)
* damn it apple

Co-authored-by: ymshenyu <ymshenyu@gmail.com>
2020-04-17 17:31:37 +08:00
Qv2ray-dev
b16140c879 add: update DMG background settings 2 2020-04-13 10:46:35 +08:00
Qv2ray-dev
af6ef87023 add: update DMG background settings 2020-04-13 10:03:51 +08:00
ymshenyu
6a947ff0e4 using pre-built ds_store 2020-04-01 20:26:55 +08:00
ymshenyu
5088347b9a Make dmg cool again 2020-04-01 17:30:50 +08:00
Qv2ray-dev
319b980a22
macOS dmg support (#488)
Co-authored-by: ymshenyu <373318510@qq.com>
2020-04-01 14:40:19 +08:00
DuckSoft
f0acfee76d
[windows] installer pipeline (#486)
* boom

* MSI: add MSI action workflow

* Windows Installer

* fix cpack

* fixup windeployqt

* remove useless actions

* fix windeployqt

* add missing id to actions

* Update main.cpp

* fix get package name

* update artifact name

* nsis: add shortcut and clean up workflows

* Windows: Completing Windows package content

* clean up backslash

* CI clean up

* Revert "clean up backslash"

This reverts commit 0b3c4b7371.

* update deployment.cmake

Co-authored-by: ymshenyu <373318510@qq.com>
Co-authored-by: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com>
2020-04-01 12:46:15 +08:00
ymshenyu
4cbc4091e7 update CMakeLists.txt 2020-03-27 19:42:20 +08:00
ymshenyu
420bbed9ee add zxing-cpp.cmake 2020-03-27 19:42:20 +08:00
ymshenyu
1a8af3c00c debian: using ninja with cmake
update qnodeeditor.cmake
2020-03-24 22:41:24 +08:00
ymshenyu
6f6e697923 update qnodeeditor.cmake 2020-03-24 21:43:29 +08:00
Qv2ray-dev
d92979bafc fix: some upgrades to the QNodeEditor 2020-03-17 19:58:23 +08:00
Guobang Bi
cd61b4d6de
Revert "update CMakeLists.txt"
This reverts commit ba6df9c122.
2020-03-10 11:39:30 +08:00
Qv2ray-dev
bca3953ce1 Merge branch 'dev-embed-translations' into dev
* dev-embed-translations:
  translation: auto load all available translations
  update
  add embed translations support
2020-03-09 15:41:40 +08:00
Qv2ray-dev
e49fda30b8 translation: auto load all available translations 2020-03-09 14:46:56 +08:00
Guobang Bi
c0735cf704
update FindOpenSSL.cmake 2020-03-09 12:26:49 +08:00
Guobang Bi
b00c8ce3c6
ignore mingw path 2020-03-09 12:21:07 +08:00
Guobang Bi
ba6df9c122
update CMakeLists.txt 2020-03-09 12:08:16 +08:00
Qv2ray-dev
fde9cbf027 cmake: CI: auto deployment - macOS use macdeployqt 2020-03-08 18:03:56 +08:00
Qv2ray-dev
a349bb21c6 cmake: CI: auto deployment 2020-03-08 17:49:05 +08:00
Qv2ray-dev
81667e480e cmake: fixing Windows build 2020-03-08 15:35:13 +08:00
Guobang Bi
4db0a5e0db
fix typo 2020-03-08 14:54:44 +08:00
Guobang Bi
9c9cdd731a
Revert "linking protobuf statically"
This reverts commit c29aeb438b.
2020-03-08 14:47:38 +08:00
Guobang Bi
3211dae631
add definitions __STDC_LIMIT_MACROS 2020-03-08 14:41:59 +08:00
Guobang Bi
c29aeb438b
linking protobuf statically 2020-03-08 14:35:08 +08:00
Guobang Bi
5679ce56d2
update qzxing.cmake 2020-03-08 14:33:41 +08:00
Guobang Bi
972a1550ba
Revert "update"
This reverts commit 40879fe7a6.
2020-03-08 14:27:06 +08:00
Guobang Bi
40879fe7a6
update 2020-03-08 14:08:54 +08:00
Qv2ray-dev
38469bb116 Merge branch 'dev-cmake' of https://github.com/Qv2ray/Qv2ray into dev-cmake 2020-03-08 09:04:13 +08:00
Qv2ray-dev
67133cab69 cmake: fixing GitHub Action - 12 2020-03-07 23:45:07 +08:00
Guobang Bi
ce9a4ec35c
Revert "update qnodeeditor.cmake"
This reverts commit f9376146f0.
2020-03-07 20:47:34 +08:00
Guobang Bi
f9376146f0
update qnodeeditor.cmake 2020-03-07 20:42:21 +08:00
Qv2ray-dev
021cacd496 cmake: enable cmake packaing on macOS - 1 2020-03-07 20:37:35 +08:00
Guobang Bi
ffaca12306
update qnodeeditor.cmake 2020-03-07 19:35:04 +08:00
Guobang Bi
35f9a8ee57
add ts files correctly 2020-03-07 18:15:56 +08:00
Qv2ray-dev
5666fb0ca5 cmake: prevent installing httplib headers 2020-03-07 17:23:57 +08:00