projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b18a61
)
Try to fix for further cdist adventures.
author
Carl Hetherington
<cth@carlh.net>
Sat, 19 Feb 2022 20:16:17 +0000
(21:16 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 19 Feb 2022 20:16:17 +0000
(21:16 +0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 332d3b6d0bb26afb33f1ae4542a2d09478c202df..7fd6353432981f188258244f4f23bcc3f9a907df 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-454,7
+454,7
@@
def configure_options(target, options):
return opt
return opt
-def build(target, options):
+def build(target, options
, for_package
):
if target.platform == 'flatpak':
target.checkout_dependencies()
prefix = 'https://dcpomatic.com/deps'
if target.platform == 'flatpak':
target.checkout_dependencies()
prefix = 'https://dcpomatic.com/deps'
@@
-569,7
+569,7
@@
def build(target, options):
with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
json.dump(desc, outfile)
target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
with open('build/com.dcpomatic.DCP-o-matic.json', 'w') as outfile:
json.dump(desc, outfile)
target.command('%s --repo=build/platform/repo build/platform/flatpak build/com.dcpomatic.DCP-o-matic.json' % target.flatpak_builder())
- el
s
e:
+ el
if target.platform != 'linux' or target.detail == 'appimage' or not for_packag
e:
target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
target.command('./waf')
target.command('./waf install')
target.command('./waf configure --prefix=%s %s' % (target.directory, configure_options(target, options)))
target.command('./waf')
target.command('./waf install')
@@
-711,10
+711,6
@@
def make_appimage(target, nice_name, internal_name, version):
def package(target, version, options):
"""version: DCP-o-matic version string"""
def package(target, version, options):
"""version: DCP-o-matic version string"""
- if target.platform != 'linux' or target.detail == 'appimage':
- # In most cases we need to build ourselves before packaging, but on some Linux targets the packaging
- # tool wants to build DCP-o-matic so we don't bother here.
- build(target, options)
if target.platform == 'windows':
return package_windows(target)
elif target.platform == 'linux':
if target.platform == 'windows':
return package_windows(target)
elif target.platform == 'linux':