Revision f606e2bf tools/ide/QtCreator/QtCreatorSetup.sh

View differences:

tools/ide/QtCreator/QtCreatorSetup.sh
600 600
  fi
601 601

  
602 602
  # change to project directory
603
  local amiroosrootdir=$(realpath $(dirname ${BASH_SOURCE[0]})/../../..)
603 604
  cd "$projectdir"
604 605

  
605 606
  # run make, but only run the GCC preprocessor and produce no binaries
606
  local amiroosrootdir=$(realpath $(dirname ${BASH_SOURCE[0]})/../../..)
607 607
  local sourcefiles=()
608 608
  local sourcefile=""
609 609
  local parse_state="WAIT_FOR_INCLUDE_OR_COMPILE"
......
634 634
          sourcefiles[${#sourcefiles[@]}]="$sourcefile"
635 635
        # whenever the next source file is processed, a message appears like:
636 636
        # Compining <filnemame>
637
        elif [[ "$line" =~ ^Compiling[[:blank:]].+\..+$ ]]; then
637
        elif [[ "$line" =~ ^Compiling[[:blank:]](.+\..+)$ ]]; then
638 638
          printf "."
639
          sourcefile=${line##* }
639
          sourcefile=${BASH_REMATCH[1]}
640 640
          parse_state="WAIT_FOR_COMPILERCALL"
641 641
        fi;;
642 642
      WAIT_FOR_COMPILERCALL)
643 643
        # wait for the actual call of the compiler to retrieve the full path to the source file
644 644
        if [[ "$line" == *${sourcefile}* ]]; then
645 645
          line="${line%%${sourcefile}*}${sourcefile}"
646
          sourcefile=${line##* }
647 646
          sourcefile=$(realpath ${amiroosrootdir}/modules/${module}/${line##* })
648 647
          sourcefiles[${#sourcefiles[@]}]="$sourcefile"
649 648
          parse_state="WAIT_FOR_INCLUDE_OR_COMPILE"
......
888 887
    fi
889 888
  else
890 889
    if [ $wipe != true ]; then
891
      files=$(find "${projectdir}" -maxdepth 1 -type f | grep -E "^.${modulename}\.(includes|files|config|creator|cflags|cxxflags)$")
890
      files=$(find "${projectdir}" -maxdepth 1 -type f | grep -E "^${modulename}\.(includes|files|config|creator|cflags|cxxflags)$")
892 891
    else
893
      files=$(find "${projectdir}" -maxdepth 1 -type f | grep -E "^.${modulename}\.(includes|files|config|creator|cflags|cxxflags|creator(\.user(\..+)?)?)$")
892
      files=$(find "${projectdir}" -maxdepth 1 -type f | grep -E "^${modulename}\.(includes|files|config|creator|cflags|cxxflags|creator(\.user(\..+)?)?)$")
894 893
    fi
895 894
  fi
896 895
  if [ ! -z "$files" ]; then
......
986 985
          shift 1;;
987 986
        -m=*|--module=*)
988 987
          createModuleProject modules[@] --module="${1#*=}"; printf "\n"; shift 1;;
989
        -m*|--module*)
990
           createModuleProject modules[@] --module="${2}"; printf "\n"; shift 2;;
988
        -m|--module)
989
          createModuleProject modules[@] --module="${2}"; printf "\n"; shift 2;;
991 990
        -a|--all)
992
           createAllProjects modules[@]; shift 1;;
991
          createAllProjects modules[@]; shift 1;;
993 992
        -c|--clean)
994 993
          deleteProjects; printf "\n"; shift 1;;
995 994
        -w|--wipe)

Also available in: Unified diff