Changeset 1983


Ignore:
Timestamp:
Oct 7, 2012, 11:33:20 AM (5 years ago)
Author:
sam
Message:

build: do not try to advertise a bitten config for Android, NaCl or the
Raspi if running on Windows.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/run-bitten.sh

    r1975 r1983  
    33conffile="`mktemp 2>/dev/null`"
    44if [ "$conffile" = "" ]; then
    5   conffile="`mktemp -q /tmp/lol-bitten-XXXXXX`"
     5    conffile="`mktemp -q /tmp/lol-bitten-XXXXXX`"
    66fi
    77url="http://lol.zoy.org/builds"
    88
    99append() {
    10   echo "$*" >> "$conffile"
     10    echo "$*" >> "$conffile"
    1111}
    1212
     
    8181append "[msvc]"
    8282if [ -n "$VS100COMNTOOLS" ]; then
    83   append "version = 10"
     83    append "version = 10"
    8484elif [ -n "$VS110COMNTOOLS" ]; then
    85   append "version = 11"
     85    append "version = 11"
    8686elif [ -n "$VS90COMNTOOLS" ]; then
    87   append "version = 9"
     87    append "version = 9"
    8888fi
    8989append ""
     
    9595append "[xdk]"
    9696if [ -n "$XEDK" ]; then
    97   # FIXME: we don't know how to check the version
    98   append "version = 2.0.20675.0"
     97    # FIXME: we don't know how to check the version
     98    append "version = 2.0.20675.0"
    9999fi
    100100append ""
     
    107107# Try to "detect" the SNC compiler on Windows
    108108if [ -n "$SN_PS3_PATH" ]; then
    109   append "version = 410"
     109    append "version = 410"
    110110fi
    111111# The setup is easier to detect on Linux
    112112if [ -f "$CELLSDK/version-SDK" ]; then
    113   append "version = $(cat "$CELLSDK/version-SDK")"
     113    append "version = $(cat "$CELLSDK/version-SDK")"
    114114fi
    115115append ""
     
    121121append "[mingw64]"
    122122if x86_64-w64-mingw32-g++ --version >/dev/null 2>&1; then
    123   append "version = $(x86_64-w64-mingw32-g++ --version | sed -ne 's/.*g++ *([^)]*) *//p')"
     123    append "version = $(x86_64-w64-mingw32-g++ --version | sed -ne 's/.*g++ *([^)]*) *//p')"
    124124fi
    125125append ""
     
    127127append "[mingw32]"
    128128if i686-w64-mingw32-g++ --version >/dev/null 2>&1; then
    129   append "version = $(i686-w64-mingw32-g++ --version | sed -ne 's/.*g++ *([^)]*) *//p')"
     129    append "version = $(i686-w64-mingw32-g++ --version | sed -ne 's/.*g++ *([^)]*) *//p')"
    130130fi
    131131append ""
     
    136136
    137137append "[ndk]"
    138 if [ -f "$ANDROID_NDK_ROOT/RELEASE.TXT" ]; then
    139   append "version = $(cat "$ANDROID_NDK_ROOT/RELEASE.TXT")"
     138if [ "$family" != "windows" ]; then
     139    if [ -f "$ANDROID_NDK_ROOT/RELEASE.TXT" ]; then
     140        append "version = $(cat "$ANDROID_NDK_ROOT/RELEASE.TXT")"
     141    fi
    140142fi
    141143append ""
     
    146148
    147149append "[pepper]"
    148 if [ -d "$NACL_SDK_ROOT" ]; then
    149   pepper_version=0
    150   for dir in "$NACL_SDK_ROOT/pepper_"*; do
    151     new_version="$(echo "$dir" | sed 's/.*_//')"
    152     if [ "$new_version" -gt "$pepper_version" ]; then
    153       pepper_version="$new_version"
     150if [ "$family" != "windows" ]; then
     151    if [ -d "$NACL_SDK_ROOT" ]; then
     152        pepper_version=0
     153        for dir in "$NACL_SDK_ROOT/pepper_"*; do
     154            new_version="$(echo "$dir" | sed 's/.*_//')"
     155            if [ "$new_version" -gt "$pepper_version" ]; then
     156                pepper_version="$new_version"
     157            fi
     158        done
     159        if [ "$pepper_version" != 0 ]; then
     160            append "version = $pepper_version"
     161        fi
    154162    fi
    155   done
    156   if [ "$pepper_version" != 0 ]; then
    157     append "version = $pepper_version"
    158   fi
    159163fi
    160164append ""
     
    165169
    166170append "[raspi]"
    167 if [ -d "$RASPI_SDK_ROOT/tools" ]; then
    168   append "version = 0"
     171if [ "$family" != "windows" ]; then
     172    if [ -d "$RASPI_SDK_ROOT/tools" ]; then
     173        append "version = 0"
     174    fi
    169175fi
    170176append ""
Note: See TracChangeset for help on using the changeset viewer.