Commit c34b482ccc4a3995d96b4f91ca31fbb203975a3f
1 parent
c18407ba
Exists in
master
and in
4 other branches
Adding option to pack windows version in "zip" format.
Showing
1 changed file
with
57 additions
and
6 deletions
Show diff stats
win/pack.sh
... | ... | @@ -34,6 +34,7 @@ PACKAGE_EXTRAS="libhllapi" |
34 | 34 | TARGET_ARCHS="x86_64 x86_32" |
35 | 35 | GIT_URL="https://github.com/PerryWerneck" |
36 | 36 | BUILD_UNSTABLE=0 |
37 | +MAKE_ZIP=1 | |
37 | 38 | |
38 | 39 | PROJECTDIR=$(dirname $(dirname $(readlink -f ${0}))) |
39 | 40 | WORKDIR=$(mktemp -d) |
... | ... | @@ -591,6 +592,47 @@ makeInstaller() |
591 | 592 | TARCH="i686" |
592 | 593 | fi |
593 | 594 | |
595 | + if [ ${BUILD_UNSTABLE} == "1" ]; then | |
596 | + TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}" | |
597 | + else | |
598 | + TARGET_PATH="/${PRODUCT_NAME}/${ARCH}" | |
599 | + fi | |
600 | + | |
601 | + if [ "${MAKE_ZIP}" == "1" ]; then | |
602 | + | |
603 | + ZIPNAME="${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}-${ARCH}.zip" | |
604 | + | |
605 | + rm -f "${ZIPNAME}" | |
606 | + zip -9 "${ZIPNAME}" *.dll *.exe *.ico | |
607 | + | |
608 | + pushd runtime | |
609 | + zip -9 -r "${ZIPNAME}" . | |
610 | + | |
611 | + popd | |
612 | + | |
613 | + if [ -d ~/public_html ]; then | |
614 | + mkdir -p ~/public_html/win/${TARGET_PATH} | |
615 | + cp -v "${ZIPNAME}" ~/public_html/win/${TARGET_PATH} | |
616 | + if [ "$?" != "0" ]; then | |
617 | + failed "Can't copy zip to ~/public_html/win/${TARGET_PATH}" | |
618 | + fi | |
619 | + fi | |
620 | + | |
621 | + if [ "${PUBLISH}" == "1" ] && [ ! -z ${WIN_PACKAGE_SERVER} ]; then | |
622 | + | |
623 | + scp "${ZIPNAME}" ${WIN_PACKAGE_SERVER}/${TARGET_PATH} | |
624 | + if [ "$?" != "0" ]; then | |
625 | + failed "Can't publish zip to ${WIN_PACKAGE_SERVER}/${TARGET_PATH}" | |
626 | + fi | |
627 | + fi | |
628 | + | |
629 | + mv -f "${ZIPNAME}" ${PROJECTDIR} | |
630 | + if [ "$?" != "0" ]; then | |
631 | + failed "Can't move zip to ${PROJECTDIR}" | |
632 | + fi | |
633 | + | |
634 | + fi | |
635 | + | |
594 | 636 | for NSI in *.nsi |
595 | 637 | do |
596 | 638 | makensis ${NSIS_ARGS} ${NSI} |
... | ... | @@ -599,12 +641,6 @@ makeInstaller() |
599 | 641 | failed "Error building ${ARCH} ${NSI}" |
600 | 642 | fi |
601 | 643 | |
602 | - if [ ${BUILD_UNSTABLE} == "1" ]; then | |
603 | - TARGET_PATH="/${PRODUCT_NAME}/unstable/${ARCH}" | |
604 | - else | |
605 | - TARGET_PATH="/${PRODUCT_NAME}/${ARCH}" | |
606 | - fi | |
607 | - | |
608 | 644 | if [ -d ~/public_html ]; then |
609 | 645 | mkdir -p ~/public_html/win/${TARGET_PATH} |
610 | 646 | cp -v *-[0-9]*-${TARCH}.exe ~/public_html/win/${TARGET_PATH} |
... | ... | @@ -737,6 +773,15 @@ do |
737 | 773 | SHELL-ON-ERROR) |
738 | 774 | PAUSE_ON_ERROR=1 |
739 | 775 | ;; |
776 | + | |
777 | + NO_ZIP) | |
778 | + MAKE_ZIP=0 | |
779 | + ;; | |
780 | + | |
781 | + ZIP) | |
782 | + MAKE_ZIP=1 | |
783 | + ;; | |
784 | + | |
740 | 785 | HELP) |
741 | 786 | echo "${0} [options]" |
742 | 787 | echo "" |
... | ... | @@ -751,6 +796,12 @@ do |
751 | 796 | echo " --pre-reqs Install required packages" |
752 | 797 | echo " --shell-on-error Open a shell when the build process failed" |
753 | 798 | echo " --unstable Build unstable version" |
799 | + | |
800 | + if [ "${MAKE_ZIP}" == "1" ]; then | |
801 | + echo " --no-zip Don't create zip file" | |
802 | + else | |
803 | + echo " --zip Create zip file" | |
804 | + fi | |
754 | 805 | |
755 | 806 | if [ ! -z ${WIN_PACKAGE_SERVER} ]; then |
756 | 807 | echo " --no-publish Don't publish binaries in ${WIN_PACKAGE_SERVER}/${PRODUCT_NAME}" | ... | ... |