Changeset ecb28eb


Ignore:
Timestamp:
Jun 13, 2015 7:57:05 PM (5 years ago)
Author:
dev <dev@…>
Branches:
master
Children:
52b362d
Parents:
1a012dfc
Message:

Added support for all ARM targets provided in GMP, on platforms running Linux.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java

    r1a012dfc recb28eb  
    256256    }
    257257   
    258     public String checkAvailable(UpdateType type, long maxWait) {
    259         return checkAvailable(type, "", maxWait);
    260     }
    261 
    262258    /**
    263259     *  Is an update available?
    264260     *  Blocking.
    265261     *  An available update may still have a constraint or lack sources.
     262     *  @param type the UpdateType of this request
     263     *  @param id id of this request
     264     *  @param maxWait max time to block
     265     *  @return new version or null if nothing newer is available
     266     *  @since 0.9.21
     267     */
     268    public String checkAvailable(UpdateType type) {
     269        return checkAvailable(type, "", DEFAULT_CHECK_TIME);
     270    }
     271
     272    /**
     273     *  Is an update available?
     274     *  Blocking.
     275     *  An available update may still have a constraint or lack sources.
     276     *  @param type the UpdateType of this request
     277     *  @param maxWait max time to block
     278     *  @return new version or null if nothing newer is available
     279     */
     280    public String checkAvailable(UpdateType type, long maxWait) {
     281        return checkAvailable(type, "", maxWait);
     282    }
     283
     284    /**
     285     *  Is an update available?
     286     *  Blocking.
     287     *  An available update may still have a constraint or lack sources.
     288     *  @param type the UpdateType of this request
     289     *  @param id id of this request
    266290     *  @param maxWait max time to block
    267291     *  @return new version or null if nothing newer is available
  • core/c/jbigi/mbuild-all.sh

    r1a012dfc recb28eb  
    2626# Do NOT add any X86 platforms, do that below in the x86 platform list.
    2727#
    28 MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 armv5tel mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447"
     28MISC_LINUX_PLATFORMS="hppa2.0 alphaev56 mips64el itanium itanium2 ultrasparc2 ultrasparc2i alphaev6 powerpc970 powerpc7455 powerpc7447"
    2929
    3030#
     
    4343
    4444#
     45# ARM
     46#
     47# These platforms exist as of GMP 6.0.0.
     48# Some of them will be renamed in the next version of GMP.
     49ARM_PLATFORMS="armv5 armv6 armv7a armcortex8 armcortex9 armcortex15"
     50# Rename output of armv7a to armv7 since that's what NBI expects.
     51# This is due to versions after GMP 6.0.0 changing the target name.
     52TRANSLATE_NAME_armv7a="armv7"
     53
     54#
     55# X86_64
     56#
    4557# Are there any other X86 platforms that work on i2p? Add them here.
    4658#
     
    4860# starting with k10 added for 6.0.0
    4961# As of GMP 6.0.0, libgmp 3,
    50 # the following architectures appear to build to identical code:
    51 #    coreisbr coreihwl coreibwl
    52 #    core2 corei
    53 #    bulldozer piledriver streamroller excavator
    54 #    bobcat jaguar
    55 #    k62 k63
    56 #    viac32 pentium3
    57 #
    58 # Even more duplicates are in 32-bit mode, so it doesn't pay to have everything for 32 bit.
    59 #
    6062X86_64_PLATFORMS="coreisbr coreihwl coreibwl bobcat jaguar bulldozer piledriver steamroller excavator atom athlon64 core2 corei nano pentium4 k10"
    6163
     
    177179                x86)
    178180                        PLATFORM_LIST="${X86_PLATFORMS}";;
     181                arm*)
     182                        PLATFORM_LIST="${ARM_PLATFORMS}";;
    179183                *)
    180184                        PLATFORM_LIST="${LINUX_PLATFORMS}";;
     
    230234        echo "Attempting .${4} creation for ${3}${5}${2}${6}"
    231235        ../../build_jbigi.sh static || return 1
    232         cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${2}${6}.${4}
     236        PLATFORM="${2}"
     237        eval TRANSLATED_NAME=\$TRANSLATE_NAME_$PLATFORM
     238        if [ -n "$TRANSLATED_NAME" ]; then
     239            PLATFORM="${TRANSLATED_NAME}"
     240        fi
     241        cp ${3}.${4} ../../lib/net/i2p/util/${3}${5}${PLATFORM}${6}.${4}
    233242        return 0
    234243}
     
    252261            export ABI=32
    253262        fi
    254         sleep 1
    255        
     263
    256264        # Nonfatal bail out on unsupported platform.
    257265        (cd ../../gmp-${1}; make clean)
     
    292300fi
    293301
    294 # Don't touch this one.
    295 NO_PLATFORM=none
    296 
    297 for x in $X86_PLATFORMS
     302
     303for x in $PLATFORM_LIST
    298304do
    299305        (
Note: See TracChangeset for help on using the changeset viewer.