Commit 8ca026235e4426929c09e1e39ab5a96cbcd26528
1 parent
2dd9b8bc
Exists in
develop
Adding options to bundler, adding --build option to cross bundler.
Showing
2 changed files
with
42 additions
and
12 deletions
Show diff stats
win/bundle.common
| @@ -334,3 +334,25 @@ install_loaders() { | @@ -334,3 +334,25 @@ install_loaders() { | ||
| 334 | 334 | ||
| 335 | } | 335 | } |
| 336 | 336 | ||
| 337 | +argument() { | ||
| 338 | + | ||
| 339 | + local cmdline | ||
| 340 | + for cmdline in ${BASH_ARGV[*]} | ||
| 341 | + do | ||
| 342 | + if [ "$(echo ${cmdline} | sed "s@^--@@g" | sed "s@^-@@g" | cut -d= -f1)" == "${1}" ]; then | ||
| 343 | + local value | ||
| 344 | + value="$(echo ${cmdline} | cut -d= -f2)" | ||
| 345 | + if [ -z "${value}" ]; then | ||
| 346 | + echo "1" | ||
| 347 | + else | ||
| 348 | + echo "${value}" | ||
| 349 | + fi | ||
| 350 | + return 0 | ||
| 351 | + fi | ||
| 352 | + done | ||
| 353 | + echo "" | ||
| 354 | + return 2 | ||
| 355 | +} | ||
| 356 | + | ||
| 357 | + | ||
| 358 | + |
win/bundle.cross
| @@ -34,21 +34,29 @@ MINGW_PACKAGE_PREFIX="mingw64" | @@ -34,21 +34,29 @@ MINGW_PACKAGE_PREFIX="mingw64" | ||
| 34 | 34 | ||
| 35 | prepare | 35 | prepare |
| 36 | 36 | ||
| 37 | -# Build | ||
| 38 | -make -C "${srcdir}" all | ||
| 39 | -if [ "$?" != "0" ]; then | ||
| 40 | - echo "Build failed" | ||
| 41 | - exit -1 | ||
| 42 | -fi | 37 | +# List of pre-built packages |
| 38 | +packages="lib3270 libv3270" | ||
| 39 | + | ||
| 40 | +argument "build" | ||
| 41 | +if [ "$?" == "0" ]; then | ||
| 43 | 42 | ||
| 44 | -make -C "${srcdir}" "DESTDIR=${buildroot}" install | ||
| 45 | -if [ "$?" != "0" ]; then | ||
| 46 | - echo "Install failed" | ||
| 47 | - exit -1 | 43 | + # Build |
| 44 | + make -C "${srcdir}" all | ||
| 45 | + if [ "$?" != "0" ]; then | ||
| 46 | + echo "Build failed" | ||
| 47 | + exit -1 | ||
| 48 | + fi | ||
| 49 | + | ||
| 50 | + make -C "${srcdir}" "DESTDIR=${buildroot}" install | ||
| 51 | + if [ "$?" != "0" ]; then | ||
| 52 | + echo "Install failed" | ||
| 53 | + exit -1 | ||
| 54 | + fi | ||
| 55 | +else | ||
| 56 | + packages="${packages} pw3270" | ||
| 48 | fi | 57 | fi |
| 49 | 58 | ||
| 50 | -# Install pre-build packages | ||
| 51 | -packages="lib3270 libv3270" | 59 | +echo "Packages: ${packages}" |
| 52 | for package in ${packages} | 60 | for package in ${packages} |
| 53 | do | 61 | do |
| 54 | PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep -v devel) | 62 | PACKAGE_NAME=$(rpm -qa | grep "${MINGW_PACKAGE_PREFIX}-${package}" | grep -v devel) |