mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-05 06:33:57 +02:00
Slightly simplified creation of universal variables in prepare.py.
This commit is contained in:
parent
c26982be3e
commit
de1bd6ef28
1 changed files with 6 additions and 5 deletions
|
@ -202,10 +202,11 @@ def removeDir(folder):
|
||||||
return 'if exist ' + folder + ' rmdir /Q /S ' + folder + '\nif exist ' + folder + ' exit /b 1'
|
return 'if exist ' + folder + ' rmdir /Q /S ' + folder + '\nif exist ' + folder + ' exit /b 1'
|
||||||
return 'rm -rf ' + folder
|
return 'rm -rf ' + folder
|
||||||
|
|
||||||
def setVar(key, value):
|
def setVar(key, multilineValue):
|
||||||
|
singlelineValue = ' '.join(multilineValue.replace('\n', '').split());
|
||||||
if win:
|
if win:
|
||||||
return 'SET ' + key + '="' + value + '"';
|
return 'SET ' + key + '="' + singlelineValue + '"';
|
||||||
return key + '="' + value + '"';
|
return key + '="' + singlelineValue + '"';
|
||||||
|
|
||||||
def filterByPlatform(commands):
|
def filterByPlatform(commands):
|
||||||
commands = commands.split('\n')
|
commands = commands.split('\n')
|
||||||
|
@ -931,7 +932,7 @@ mac:
|
||||||
stage('libjxl', """
|
stage('libjxl', """
|
||||||
git clone -b v0.8.2 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
|
git clone -b v0.8.2 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
|
||||||
cd libjxl
|
cd libjxl
|
||||||
""" + setVar("cmake_defines", ' '.join("""
|
""" + setVar("cmake_defines", """
|
||||||
-DBUILD_SHARED_LIBS=OFF
|
-DBUILD_SHARED_LIBS=OFF
|
||||||
-DBUILD_TESTING=OFF
|
-DBUILD_TESTING=OFF
|
||||||
-DJPEGXL_ENABLE_FUZZERS=OFF
|
-DJPEGXL_ENABLE_FUZZERS=OFF
|
||||||
|
@ -952,7 +953,7 @@ stage('libjxl', """
|
||||||
-DJPEGXL_ENABLE_COVERAGE=OFF
|
-DJPEGXL_ENABLE_COVERAGE=OFF
|
||||||
-DJPEGXL_ENABLE_PROFILER=OFF
|
-DJPEGXL_ENABLE_PROFILER=OFF
|
||||||
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
|
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
|
||||||
""".replace('\n', '').split())) + """
|
""") + """
|
||||||
win:
|
win:
|
||||||
cmake . ^
|
cmake . ^
|
||||||
-A %WIN32X64% ^
|
-A %WIN32X64% ^
|
||||||
|
|
Loading…
Add table
Reference in a new issue