Commit 1da61fb1184d7d5080de8055c14361550ab4024c
1 parent
64ca5ee6
Exists in
develop
Working in cross bundler.
Showing
2 changed files
with
22 additions
and
10 deletions
Show diff stats
win/bundle.common
... | ... | @@ -59,8 +59,6 @@ if [ -z ${PACKAGE_VERSION} ]; then |
59 | 59 | exit -1 |
60 | 60 | fi |
61 | 61 | |
62 | - | |
63 | - | |
64 | 62 | GTK_PREFIX=$(${PKG_CONFIG} --variable=prefix gtk+-3.0) |
65 | 63 | GTK_BINARY_VERSION=$(${PKG_CONFIG} --variable=gtk_binary_version gtk+-3.0) |
66 | 64 | GTK_LIBDIR=$(echo $(${PKG_CONFIG} --variable=libdir gtk+-3.0) | sed "s@^C:/@/c/@g") |
... | ... | @@ -398,4 +396,24 @@ make_zip() { |
398 | 396 | |
399 | 397 | } |
400 | 398 | |
399 | +install_runtime() { | |
400 | + | |
401 | + install_loaders | |
402 | + install_bin | |
403 | + install_locale | |
404 | + install_schemas | |
405 | + install_theme "Adwaita" | |
406 | + install_icons "Adwaita" | |
407 | + | |
408 | +} | |
409 | + | |
410 | +make_packages() { | |
411 | + | |
412 | + argument "zip" > /dev/null | |
413 | + if [ "$?" == "0" ]; then | |
414 | + make_zip | |
415 | + fi | |
416 | + | |
417 | +} | |
418 | + | |
401 | 419 | ... | ... |
win/bundle.cross
... | ... | @@ -120,14 +120,8 @@ unpack_rpm() { |
120 | 120 | } |
121 | 121 | |
122 | 122 | unpack_rpm |
123 | -install_loaders | |
124 | -install_bin | |
125 | -install_locale | |
126 | -install_schemas | |
127 | -install_theme "Adwaita" | |
128 | -install_icons "Adwaita" | |
129 | - | |
130 | -make_zip | |
123 | +install_runtime | |
124 | +make_packages | |
131 | 125 | |
132 | 126 | echo "Bundle build complete" |
133 | 127 | ... | ... |