Commit 6472eb0cef6d7100ecb04e3cd8d2c38cfda859ef
1 parent
bd3d4eed
Exists in
master
and in
5 other branches
Updating windows package build script.
Showing
1 changed file
with
5 additions
and
10 deletions
Show diff stats
win/pack.sh
| @@ -363,26 +363,21 @@ pack() | @@ -363,26 +363,21 @@ pack() | ||
| 363 | exit -1 | 363 | exit -1 |
| 364 | fi | 364 | fi |
| 365 | 365 | ||
| 366 | - echo "------------------------------------------------------" | ||
| 367 | - echo makensis -DWITHGTK pw3270.nsi | ||
| 368 | - | ||
| 369 | - /bin/bash | ||
| 370 | - | ||
| 371 | makensis -DWITHGTK pw3270.nsi | 366 | makensis -DWITHGTK pw3270.nsi |
| 372 | if [ "$?" != "0" ]; then | 367 | if [ "$?" != "0" ]; then |
| 373 | cleanup | 368 | cleanup |
| 374 | exit -1 | 369 | exit -1 |
| 375 | fi | 370 | fi |
| 376 | 371 | ||
| 377 | - cp -v ./win/*.exe ${PROJECTDIR} | 372 | + cp -v *.exe ${PROJECTDIR} |
| 378 | if [ "$?" != "0" ]; then | 373 | if [ "$?" != "0" ]; then |
| 379 | cleanup | 374 | cleanup |
| 380 | exit -1 | 375 | exit -1 |
| 381 | fi | 376 | fi |
| 382 | 377 | ||
| 383 | - if [ -d ~/public_html ]; then | 378 | + if [ -d ~/public_html/win/pw3270 ]; then |
| 384 | mkdir -p ~/public_html/win/pw3270/${1} | 379 | mkdir -p ~/public_html/win/pw3270/${1} |
| 385 | - cp -v ./win/*.exe ~/public_html/win/pw3270/${1} | 380 | + cp -v *.exe ~/public_html/win/pw3270/${1} |
| 386 | if [ "$?" != "0" ]; then | 381 | if [ "$?" != "0" ]; then |
| 387 | cleanup | 382 | cleanup |
| 388 | exit -1 | 383 | exit -1 |
| @@ -390,7 +385,7 @@ pack() | @@ -390,7 +385,7 @@ pack() | ||
| 390 | fi | 385 | fi |
| 391 | 386 | ||
| 392 | # if [ ! -z ${WIN_PACKAGE_SERVER} ]; then | 387 | # if [ ! -z ${WIN_PACKAGE_SERVER} ]; then |
| 393 | -# scp ./win/*.exe ${WIN_PACKAGE_SERVER}/pw3270 | 388 | +# scp *.exe ${WIN_PACKAGE_SERVER}/pw3270 |
| 394 | # if [ "$?" != "0" ]; then | 389 | # if [ "$?" != "0" ]; then |
| 395 | # cleanup | 390 | # cleanup |
| 396 | # exit -1 | 391 | # exit -1 |
| @@ -499,7 +494,7 @@ fi | @@ -499,7 +494,7 @@ fi | ||
| 499 | # Create installers | 494 | # Create installers |
| 500 | # | 495 | # |
| 501 | pack x86_32 | 496 | pack x86_32 |
| 502 | -#pack x86_64 | 497 | +pack x86_64 |
| 503 | 498 | ||
| 504 | cleanup | 499 | cleanup |
| 505 | 500 |