Changeset 6e5c9a3


Ignore:
Timestamp:
Sep 20, 2011 12:40:18 PM (10 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3df7ef0
Parents:
3d91fac2 (diff), 450a5e1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '4f9e4125cd99ad55d386c416b659389a6a85a901'

and 'e68b93db0d4031a11910fd17c01edee5d6cd4a96'

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • core/c/jbigi/mbuild-all.sh

    r3d91fac2 r6e5c9a3  
    22
    33#FIXME What platforms for MacOS?
    4 MISC_DARWIN_PLATFORMS=""
     4MISC_DARWIN_PLATFORMS="powerpc powerpc64 powerpc64le powerpcle"
    55
    66# Note: You will have to add the CPU ID for the platform in the CPU ID code
     
    1515
    1616#
    17 # If you know of other platforms i2p on FREEBSD works on,
     17# If you know of other platforms i2p on *BSD works on,
    1818# please add them here.
    1919# Do NOT add any X86 platforms, do that below in the x86 platform list.
    2020#
    2121MISC_FREEBSD_PLATFORMS="alphaev56 ultrasparc2i"
    22 MISC_NETBSD_PLATFORMS="powerpc powerpc64 powerpc64le powerpcle atari amiga m68knommu"
     22MISC_NETBSD_PLATFORMS="armv5tel mips64el ultrasparc2i sgi hppa2.0 alphaev56 powerpc powerpc64 powerpc64le powerpcle atari amiga m68knommu" # and many, many more
     23MISC_OPENBSD_PLATFORMS="alphaev56 ultrasparc2i sgi powerpc powerpc64 hppa2.0 alphaev56 armv5tel mips64el"
    2324
    2425#
     
    4546LINUX_PLATFORMS="${X86_PLATFORMS} ${MISC_LINUX_PLATFORMS}"
    4647FREEBSD_PLATFORMS="${X86_PLATFORMS} ${MISC_FREEBSD_PLATFORMS}"
    47 NETBSD_PLATFORMS="${FREEBSD_PLATFORMS} ${LINUX_PLATFORMS} ${MISC_NETBSD_PLATFORMS}"
     48# As they say, "Of course it runs NetBSD!"
     49NETBSD_PLATFORMS="${FREEBSD_PLATFORMS} ${MISC_LINUX_PLATFORMS} ${MISC_NETBSD_PLATFORMS}"
     50OPENBSD_PLATFORM="${X86_PLATFORMS} ${MISC_OPENBSD_PLATFORMS}"
     51
     52# FIXME Is this all?
    4853DARWIN_PLATFORMS="core2 corei"
    4954
     
    8792        esac
    8893        case ${arch} in
    89                 x86_64)
     94                x86_64 | amd64)
    9095                        PLATFORM_LIST="${X86_64_PLATFORMS}"
    9196                        TARGET="-linux-X86_64-";;
     
    100105        esac
    101106        echo "Building ${TARGET} .so's for ${arch}";;
    102 NetBSD*)
    103         PLATFORM_LIST="${NETBSD_PLATFORMS}"
     107NetBSD*|FreeBSD*|OpenBSD*)
    104108        NAME="libjbigi"
    105109        TYPE="so"
    106         TARGET="-netbsd-"
    107         echo "Building netbsd .sos for all architectures";;
    108 FreeBSD*)
    109         PLATFORM_LIST="${FREEBSD_PLATFORMS}"
    110         NAME="libjbigi"
    111         TYPE="so"
    112         TARGET="-freebsd-"
    113         echo "Building freebsd .sos for all architectures";;
     110        PLATFORM_LIST=""
     111        BSDTYPE="`uname -s | tr [A-Z] [a-z]`"
     112        arch=$(uname -m | cut -f1 -d" ")
     113        case ${arch} in
     114                i[3-6]86)
     115                        arch="x86";;
     116        esac
     117        case ${arch} in
     118                x86_64|amd64)
     119                        PLATFORM_LIST="${X86_64_PLATFORMS}"
     120                        TARGET="-${BSDTYPE}-X86_64-";;
     121                ia64)
     122                        PLATFORM_LIST="${X86_64_PLATFORMS}"
     123                        TARGET="-${BSDTYPE}-ia64-";;
     124                x86)
     125                        PLATFORM_LIST="${X86_PLATFORMS}"
     126                        TARGET="-${BSDTYPE}-x86-";;
     127                *)
     128                        case ${BSDTYPE} in
     129                                netbsd)
     130                                        PLATFORM_LIST="${NETBSD_PLATFORMS}";;
     131                                openbsd)
     132                                        PLATFORM_LIST="${OPENBSD_PLATFORMS}";;
     133                                freebsd)
     134                                        PLATFORM_LIST="${FREEBSD_PLATFORMS}";;
     135                                *)
     136                                        echo "Unsupported build environment"
     137                                        exit 1;;
     138                        esac
     139        esac
     140        echo "Building ${BSDTYPE} .so's for ${arch}";;
    114141*)
    115142        echo "Unsupported build environment"
  • core/c/jbigi/mbuild_jbigi.sh

    r3d91fac2 r6e5c9a3  
    2424        LINKFLAGS="-dynamiclib -framework JavaVM"
    2525        LIBFILE="libjbigi.jnilib";;
    26 SunOS*)
     26SunOS*|OpenBSD*|NetBSD*|FreeBSD*|Linux*)
     27        UNIXTYPE="`uname -s | tr [A-Z] [a-z]`"
     28        if [ $UNIXTYPE = "sunos" ]; then
     29                UNIXTYPE="solaris"
     30        elif [ $UNIXTYPE = "freebsd" ]; then
     31                if [ -d /usr/local/openjdk6 ]; then
     32                        JAVA_HOME="/usr/local/openjdk6"
     33                elif [ -d /usr/local/openjdk7 ]; then
     34                        JAVA_HOME="/usr/local/openjdk7"
     35                fi
     36        elif [ $UNIXTYPE = "openbsd" ]; then
     37                if [ -d /usr/local/jdk-1.7.0 ]; then
     38                        JAVA_HOME="/usr/local/jdk-1.7.0"
     39                fi
     40        elif [ $UNIXTYPE = "netbsd" ]; then
     41                if [ -d /usr/pkg/java/openjdk7 ]; then
     42                        JAVA_HOME="/usr/pkg/java/openjdk7"
     43                fi
     44        elif [ $UNIXTYPE = "linux" -a -e /etc/debian_version ]; then
     45                if [ -d /usr/lib/jvm/default-java ]; then
     46                        JAVA_HOME="/usr/lib/jvm/default-java"
     47                fi
     48        fi
    2749        COMPILEFLAGS="-fPIC -Wall"
    28         INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
     50        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
    2951        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    3052        LIBFILE="libjbigi.so";;
    31 
    3253*)
    33         COMPILEFLAGS="-fPIC -Wall"
    34         INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    35         LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    36         LIBFILE="libjbigi.so";;
     54        echo "Unsupported system type."
     55        exit 1;;
    3756esac
    3857
    3958if [ "$1" = "dynamic" ] ; then
    40         echo "Building a jbigi lib that is dynamically linked to GMP" 
     59        echo "Building a jbigi lib that is dynamically linked to GMP"
    4160        LIBPATH="-L.libs"
    4261        INCLUDELIBS="-lgmp"
  • core/c/jcpuid/mbuild.sh

    r3d91fac2 r6e5c9a3  
    88Linux*)
    99        echo "Building linux .sos";;
    10 NetBSD*)
    11         echo "Building netbsd .sos";;
    12 FreeBSD*)
    13         echo "Building freebsd .sos";;
     10NetBSD*|OpenBSD*|FreeBSD*)
     11        echo "Building `uname -s |tr [A-Z] [a-z]` .sos";;
    1412Darwin*)
    1513        echo "Building OSX jnilibs";;
     
    4038        LINKFLAGS="-dynamiclib -framework JavaVM"
    4139        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-darwin.jnilib";;
    42 NetBSD*)
     40Linux*|OpenBSD*|NetBSD*|FreeBSD*|SunOS*)
     41        UNIXTYPE="`uname -s | tr [A-Z] [a-z]`"
     42        if [ $UNIXTYPE = "sunos" ]; then
     43                UNIXTYPE="solaris"
     44        elif [ $UNIXTYPE = "freebsd" ]; then
     45                if [ -d /usr/local/openjdk6 ]; then
     46                        JAVA_HOME="/usr/local/openjdk6"
     47                elif [ -d /usr/local/openjdk7 ]; then
     48                        JAVA_HOME="/usr/local/openjdk7"
     49                fi
     50        elif [ $UNIXTYPE = "openbsd" ]; then
     51                if [ -d /usr/local/jdk-1.7.0 ]; then
     52                        JAVA_HOME="/usr/local/jdk-1.7.0"
     53                fi
     54        elif [ $UNIXTYPE = "netbsd" ]; then
     55                if [ -d /usr/pkg/java/openjdk7 ]; then
     56                        JAVA_HOME="/usr/pkg/java/openjdk7"
     57                fi
     58        elif [ $UNIXTYPE = "linux" -a -e /etc/debian_version ]; then
     59                if [ -d /usr/lib/jvm/default-java ]; then
     60                        JAVA_HOME="/usr/lib/jvm/default-java"
     61                fi
     62        fi
    4363        case `uname -m` in
    44                 amd64)
    45                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86_64-netbsd.so"
    46                         LIBFILE="lib/netnet/support/CPUInformation/libjcpuid-x86_64-netbsd.so";;
     64                x86_64*|amd64)
     65                        LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86_64-${UNIXTYPE}.so"
     66                        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86_64-${UNIXTYPE}.so";;
     67                ia64*)
     68                        LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-${UNIXTYPE}.so"
     69                        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-ia64-${UNIXTYPE}.so";;
    4770                i?86*)
    48                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-netbsd.so"
    49                         LIBFILE="lib/netnet/support/CPUInformation/libjcpuid-x86-netbsd.so";;
    50                 *)
    51                         echo "Unknown build environment"
    52                         exit;;
    53         esac
    54         COMPILEFLAGS="-fPIC -Wall"
    55         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/netbsd/";;
    56 FreeBSD*)
    57         case `uname -m` in
    58                 amd64)
    59                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86_64-freebsd.so"
    60                         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86_64-freebsd.so";;
    61                 i?86*)
    62                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-freebsd.so"
    63                         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-freebsd.so";;
    64                 *)
    65                         echo "Unknown build environment"
    66                         exit;;
    67         esac
    68         COMPILEFLAGS="-fPIC -Wall"
    69         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include/ -I$JAVA_HOME/include/freebsd/";;
    70 Linux*)
    71         case `uname -m` in
    72                 x86_64*)
    73                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86_64-linux.so"
    74                         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86_64-linux.so";;
    75                 ia64*)
    76                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
    77                         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-ia64-linux.so";;
    78                 i?86*)
    79                         LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-linux.so"
    80                         LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-linux.so";;
     71                        LINKFLAGS="-shared -Wl,-soname,libjcpuid-x86-${UNIXTYPE}.so"
     72                        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-x86-${UNIXTYPE}.so";;
    8173                *)
    8274                        echo "Unsupported build environment"
     
    8476        esac
    8577        COMPILEFLAGS="-fPIC -Wall"
    86         INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/linux";;
     78        INCLUDES="-I. -Iinclude -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}";;
    8779
    8880esac
  • installer/resources/osid

    r3d91fac2 r6e5c9a3  
    2222#     solaris  = Solaris
    2323#     suse     = SuSE
     24#     openbsd  = OpenBSD
     25#     netbsd   = NetBSD
    2426#     unknown  = OS could not be determined
    2527
     
    3739SOLARIS=`echo "$HOST_OS" | grep Solaris`
    3840SUNOS=`echo "$HOST_OS" | grep SunOS`
     41NETBSD=`echo "$HOST_OS" |grep NetBSD`
     42OPENBSD=`echo "$HOST_OS" |grep OpenBSD`
    3943
    4044if [ ! "X$DARWIN" = "X" -o ! "X$MAC" = "X" ]; then
     
    4549if [ ! "X$FREEBSD" = "X" ]; then
    4650    echo freebsd
     51    exit 0
     52fi
     53
     54if [ ! "X$NETBSD" = "X" ]; then
     55    echo netbsd
     56    exit 0
     57fi
     58
     59if [ ! "X$OPENBSD" = "X" ]; then
     60    echo openbsd
    4761    exit 0
    4862fi
  • installer/resources/postinstall.sh

    r3d91fac2 r6e5c9a3  
    4747            wrapperpath="./lib/wrapper/linux-armv5"
    4848            cp ${wrapperpath}/libwrapper.so ./lib/
    49         elif [ `echo $OS_ARCH |grep ppc` ]; then
    50             wrapperpath="./lib/wrapper/linux-ppc"
    51             cp ${wrapperpath}/libwrapper.so ./lib/
     49        elif [ `echo $OS_ARCH |grep ppc` ]; then
     50            wrapperpath="./lib/wrapper/linux-ppc"
     51            cp ${wrapperpath}/libwrapper.so ./lib/
    5252        elif [ "X$X86_64" = "X" ]; then
    5353            wrapperpath="./lib/wrapper/linux"
     
    5656            wrapperpath="./lib/wrapper/linux64"
    5757            cp ${wrapperpath}/libwrapper.so ./lib
    58             # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    59             cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
     58            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
     59            cp ./lib/wrapper/linux/libwrapper.so ./lib/libwrapper-linux-x86-32.so
    6060        fi
    6161        ;;
    6262    freebsd )
    63         if [ ! `echo $OS_ARCH | grep amd64` ]; then
    64             wrapperpath="./lib/wrapper/freebsd"
    65             cp ${wrapperpath}/libwrapper.so ./lib/
    66         else
    67             wrapperpath="./lib/wrapper/freebsd64"
    68             cp ${wrapperpath}/libwrapper.so ./lib/
    69             # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
    70             cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
    71         fi
     63        if [ ! `echo $OS_ARCH | grep amd64` ]; then
     64            wrapperpath="./lib/wrapper/freebsd"
     65            cp ${wrapperpath}/libwrapper.so ./lib/
     66        else
     67            wrapperpath="./lib/wrapper/freebsd64"
     68            cp ${wrapperpath}/libwrapper.so ./lib/
     69            # the 32bit libwrapper.so will be needed if a 32 bit jvm is used
     70            cp ./lib/freebsd/libwrapper.so ./lib/libwrapper-freebsd-x86-32.so
     71        fi
    7272        ;;
    7373    osx )
    7474        wrapperpath="./lib/wrapper/macosx"
    7575        cp ${wrapperpath}/libwrapper.jnilib ./lib/
    76         chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
     76        chmod 755 ./Start\ I2P\ Router.app/Contents/MacOS/i2prouter
    7777        ;;
    7878    solaris )
    7979        wrapperpath="./lib/wrapper/solaris"
    8080        cp ${wrapperpath}/libwrapper.so ./lib/
     81        ;;
     82    netbsd|openbsd )
     83        # FIXME
     84        # This isn't displayed when installing, but if we fall back to the "*)"
     85        # choice, no cleanup happens and users are advised to copy the wrapper
     86        # in place...but there is no wrapper. Figuring how how to display this,
     87        # such as when doing a headless installation would be good.
     88        echo "The java wrapper is not supported on this platform."
     89        echo "Please use `pwd`/runplain.sh to start I2P."
     90        # But at least the cleanup below will happen.
    8191        ;;
    8292    * )
     
    8999esac
    90100
    91 cp $wrapperpath/i2psvc .
     101if [ ! "X$wrapperpath" = "x" ]; then
     102    cp $wrapperpath/i2psvc .
     103    chmod 755 ./i2psvc
     104fi
     105
    92106chmod 755 ./eepget
    93 chmod 755 ./i2psvc
    94107rm -rf ./icons
    95108rm -rf ./lib/wrapper
     
    110123rm -f ./postinstall.sh
    111124exit 0
    112 
Note: See TracChangeset for help on using the changeset viewer.