projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dae29c4
)
Fix build/package for modification to cdist.
author
Carl Hetherington
<cth@carlh.net>
Sat, 19 Feb 2022 12:48:27 +0000
(13:48 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 19 Feb 2022 12:48:27 +0000
(13:48 +0100)
cscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 4cbec58cfad41bba434830331f321682745eac0d..332d3b6d0bb26afb33f1ae4542a2d09478c202df 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-569,8
+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())
- elif target.platform != "linux" or target.detail == 'appimage':
- # Build here if the packaging step won't do it
+ else:
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')
@@
-712,6
+711,10
@@
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':