Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-project
Commits
7488e866
Commit
7488e866
authored
5 years ago
by
Jenkins
Browse files
Options
Downloads
Plain Diff
submodules: update nightly branch
parents
eba9b85e
0d9f4e8a
No related branches found
Tags
android/release_218
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
client-android
+1
-1
1 addition, 1 deletion
client-android
daemon
+1
-1
1 addition, 1 deletion
daemon
scripts/build-windows.py
+5
-5
5 additions, 5 deletions
scripts/build-windows.py
with
7 additions
and
7 deletions
client-android
@
9d327802
Subproject commit
51185754b7100495526eb4d972aff8bd82619242
Subproject commit
9d327802ab2def22641aa5cc8935c37710f2efe6
This diff is collapsed.
Click to expand it.
daemon
@
33823822
Subproject commit
fbeda916293f7b0d99fc16de5bc44e94b218cdd6
Subproject commit
33823822334c3170c02d33945a1fd065111be291
This diff is collapsed.
Click to expand it.
scripts/build-windows.py
+
5
−
5
View file @
7488e866
...
...
@@ -15,11 +15,11 @@ def execute_cmd(cmd, with_shell=False):
def
build_daemon
(
parsed_args
):
make_cmd
=
os
.
path
.
dirname
(
this_dir
)
+
'
\\
daemon
\\
msvc
\\
winmake.py
'
os
.
chdir
(
os
.
path
.
dirname
(
this_dir
)
+
'
\\
daemon
\\
msvc
'
)
execute_cmd
(
'
cmake -DCMAKE_CONFIGURATION_TYPES=
"
ReleaseLib_win32
"
-DCMAKE_VS_PLATFORM_NAME=
"
x64
"
-G
"
Visual Studio 16 2019
"
-A x64 -T $(DefaultPlatformToolset) ..
'
)
make_cmd
=
os
.
path
.
dirname
(
this_dir
)
+
'
\\
daemon
\\
compat
\\
msvc
\\
winmake.py
'
os
.
chdir
(
os
.
path
.
dirname
(
this_dir
)
+
'
\\
daemon
\\
compat
\\
msvc
'
)
status_code
=
execute_cmd
(
'
python
'
+
make_cmd
+
'
-iv -t
'
+
parsed_args
.
toolset
+
'
-s
'
+
parsed_args
.
sdk
+
'
-b daemon
'
)
os
.
chdir
(
os
.
path
.
dirname
(
this_dir
))
return
execute_cmd
(
'
python
'
+
make_cmd
+
'
-iv -t
'
+
parsed_args
.
toolset
+
'
-s
'
+
parsed_args
.
sdk
+
'
-b daemon
'
)
return
status_code
def
build_lrc
(
parsed_args
):
...
...
@@ -36,7 +36,7 @@ def build_client(parsed_args):
if
not
os
.
path
.
exists
(
'
./x64/Release/qt.conf
'
):
ret
&=
not
execute_cmd
(
'
powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1
'
,
True
)
'
powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1
'
+
'
"
Release
"
'
+
'"'
+
parsed_args
.
qtver
+
'"'
,
True
)
return
ret
def
parse_args
():
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment