Commit 9280eb0b0004f6d65129eacf00c6f2b356c37857

Authored by Perry Werneck
1 parent 5943f9db

Updating string for windows package; adding option to zip only the

binaries.
Showing 1 changed file with 22 additions and 7 deletions   Show diff stats
@@ -641,6 +641,21 @@ makeInstaller() @@ -641,6 +641,21 @@ makeInstaller()
641 641
642 cd ${WORKDIR}/build/${ARCH} 642 cd ${WORKDIR}/build/${ARCH}
643 643
  644 + # Remove duplicates
  645 + fdupes -q -p -n -H -o name -r . |
  646 + while read _file
  647 + do
  648 + if test -z "$_target" ; then
  649 + _target="$_file";
  650 + else
  651 + if test -z "$_file" ; then
  652 + _target="";
  653 + continue ;
  654 + fi ;
  655 + ln -f "$_target" "$_file";
  656 + fi ;
  657 + done
  658 +
644 TARCH=${ARCH} 659 TARCH=${ARCH}
645 if [ "${TARCH}" == "x86_32" ]; then 660 if [ "${TARCH}" == "x86_32" ]; then
646 TARCH="i686" 661 TARCH="i686"
@@ -648,17 +663,17 @@ makeInstaller() @@ -648,17 +663,17 @@ makeInstaller()
648 663
649 if [ "${MAKE_ZIP}" == "1" ]; then 664 if [ "${MAKE_ZIP}" == "1" ]; then
650 665
651 - ZIPNAME="${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}-${ARCH}.zip"  
652 - 666 + ZIPNAME="${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}-${ARCH}-bin.zip"
653 rm -f "${ZIPNAME}" 667 rm -f "${ZIPNAME}"
654 - zip -9 "${ZIPNAME}" *.dll *.exe *.ico 668 + zip -9 -j "${ZIPNAME}" bin/*
  669 + copy_install_file "${ZIPNAME}"
655 670
656 pushd runtime 671 pushd runtime
657 - zip -9 -r "${ZIPNAME}" .  
658 -  
659 - popd  
660 - 672 + ZIPNAME="${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}-${ARCH}-runtime.zip"
  673 + rm -f "${ZIPNAME}"
  674 + zip -9 -r "${ZIPNAME}" *
661 copy_install_file "${ZIPNAME}" 675 copy_install_file "${ZIPNAME}"
  676 + popd
662 677
663 fi 678 fi
664 679