Changeset 61be475 for installer


Ignore:
Timestamp:
May 8, 2016 9:47:30 PM (4 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
b316315
Parents:
29befb4 (diff), 99a5b10 (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:

propagate from branch 'i2p.i2p' (head 6706bab853107973d7d0ff28212aae65bd098591)

to branch 'i2p.i2p.str4d.ui' (head 645f60a4d23af4116ae660b09dfff32d19a65c32)

Location:
installer
Files:
1 added
26 edited

Legend:

Unmodified
Added
Removed
  • installer/lib/wrapper/linux-armv6/README.txt

    r29befb4 r61be475  
    22
    33       apt-get install default-jdk ant
     4       export JAVA_HOME=/usr/lib/jvm/default-java
    45       ant -Dbits=32 compile-c-unix
    56       mv bin/wrapper bin/i2psvc
    67       strip --strip-unneeded bin/i2psvc lib/libwrapper.so
    7 
     8       cp bin/i2psvc $I2P
     9       cp lib/libwrapper.so $I2P/lib
     10       cp /path/to/wrapper-delta-pack-3.5.xx/lib/wrapper.jar $I2P/lib
     11       (test it)
     12       cp bin/i2psvc lib/libwrapper.so /path/to/installer/lib/wrapper/linux-armv6
     13       chmod -x i2psvc librapper.so
  • installer/resources/i2prouter

    r29befb4 r61be475  
    207207freebsd10() {
    208208    echo
    209     echo "The current version of the Tanuki wrapper does not"
    210     echo "support FreeBSD 10."
     209    echo "The current version of the Tanuki wrapper that is bundled"
     210    echo "with I2P does not support FreeBSD 10."
    211211    echo
    212     echo "See https://trac.i2p2.de/ticket/1118 for more information"
    213     echo "and a workaround for this issue."
     212    echo "See http://trac.i2p2.de/ticket/1118#comment:13 for a work-around."
     213    echo "After applying the work-around, as a normal user or a dedicated"
     214    echo "i2p user, you can then run:"
     215    echo "$ ./i2prouter start"
    214216    echo
    215     echo "In the meantime, you may start I2P by running the script"
     217    echo "Or, you may also start I2P by running the script:"
    216218    echo "${I2P}/runplain.sh"
    217219    echo
     
    228230                *)
    229231                    # We should never get here on recent versions of FreeBSD
    230                     if ! $(pkg_info -E 'libiconv*' > /dev/null 2>&1); then
     232                    if ! $(pkg info -E 'libiconv*' > /dev/null 2>&1); then
    231233                        echo
    232234                        echo "The wrapper requires libiconv."
    233235                        echo
    234                         echo "It can be installed with pkg_add -r libiconv"
     236                        echo "It can be installed with pkg install libiconv"
    235237                        echo
    236238                    fi
     
    487489fi
    488490
    489 # OSX always places Java in the same location so we can reliably set JAVA_HOME
     491# Through Java 6, OSX always places Java in the same location so we can reliably set JAVA_HOME
     492# As of OSX 10.5 / Java 7, call /usr/libexec/java_home to find it
     493# https://developer.apple.com/library/mac/qa/qa1170/_index.html
    490494if [ "$DIST_OS" = "macosx" ]
    491495then
    492496    if [ -z "$JAVA_HOME" ]; then
    493         JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
     497        if [ -x "/usr/libexec/java_home" ]; then
     498            JAVA_HOME=`/usr/libexec/java_home`
     499        fi
     500        if [ -z "$JAVA_HOME" ]; then
     501            JAVA_HOME="/Library/Java/Home"
     502        fi
     503        export JAVA_HOME
    494504    fi
    495505fi
  • installer/resources/package-lists/java/package-list

    r29befb4 r61be475  
    1818java.lang.annotation
    1919java.lang.instrument
     20java.lang.invoke
    2021java.lang.management
    2122java.lang.ref
     
    2829java.nio.charset
    2930java.nio.charset.spi
     31java.nio.file
     32java.nio.file.attribute
     33java.nio.file.spi
    3034java.rmi
    3135java.rmi.activation
     
    121125javax.swing.plaf.metal
    122126javax.swing.plaf.multi
     127javax.swing.plaf.nimbus
    123128javax.swing.plaf.synth
    124129javax.swing.table
     
    164169javax.xml.ws.soap
    165170javax.xml.ws.spi
     171javax.xml.ws.spi.http
    166172javax.xml.ws.wsaddressing
    167173javax.xml.xpath
  • installer/resources/package-lists/javaee/package-list

    r29befb4 r61be475  
    22javax.annotation.security
    33javax.annotation.sql
     4javax.batch.api
     5javax.batch.api.chunk
     6javax.batch.api.chunk.listener
     7javax.batch.api.listener
     8javax.batch.api.partition
     9javax.batch.operations
     10javax.batch.runtime
     11javax.batch.runtime.context
    412javax.decorator
    513javax.ejb
     
    715javax.ejb.spi
    816javax.el
     17javax.enterprise.concurrent
    918javax.enterprise.context
    1019javax.enterprise.context.spi
     
    3241javax.faces.el
    3342javax.faces.event
     43javax.faces.flow
     44javax.faces.flow.builder
    3445javax.faces.lifecycle
    3546javax.faces.model
     
    4253javax.interceptor
    4354javax.jms
     55javax.json
     56javax.json.spi
     57javax.json.stream
    4458javax.jws
    4559javax.jws.soap
     
    8296javax.validation.bootstrap
    8397javax.validation.constraints
     98javax.validation.constraintvalidation
     99javax.validation.executable
    84100javax.validation.groups
    85101javax.validation.metadata
    86102javax.validation.spi
     103javax.websocket
     104javax.websocket.server
    87105javax.ws.rs
     106javax.ws.rs.client
     107javax.ws.rs.container
    88108javax.ws.rs.core
    89109javax.ws.rs.ext
     
    103123javax.xml.rpc.server
    104124javax.xml.rpc.soap
     125javax.xml.soap
    105126javax.xml.ws
    106127javax.xml.ws.handler
  • installer/resources/package-lists/jetty/package-list

    r29befb4 r61be475  
    1414org.eclipse.jetty.deploy.util
    1515org.eclipse.jetty.embedded
     16org.eclipse.jetty.example.asyncrest
    1617org.eclipse.jetty.http
    1718org.eclipse.jetty.http.gzip
     
    3536org.eclipse.jetty.nosql.mongodb
    3637org.eclipse.jetty.nosql.mongodb.jmx
     38org.eclipse.jetty.osgi.annotations
    3739org.eclipse.jetty.osgi.boot
    3840org.eclipse.jetty.osgi.boot.internal.jsp
     
    4143org.eclipse.jetty.osgi.boot.jasper
    4244org.eclipse.jetty.osgi.boot.jsp
    43 org.eclipse.jetty.osgi.boot.logback
    44 org.eclipse.jetty.osgi.boot.logback.internal
    4545org.eclipse.jetty.osgi.boot.utils
    4646org.eclipse.jetty.osgi.boot.utils.internal
    4747org.eclipse.jetty.osgi.boot.warurl
    4848org.eclipse.jetty.osgi.boot.warurl.internal
    49 org.eclipse.jetty.osgi.equinoxtools
    50 org.eclipse.jetty.osgi.equinoxtools.console
    5149org.eclipse.jetty.osgi.httpservice
    5250org.eclipse.jetty.osgi.nested
     
    7977org.eclipse.jetty.server.ssl
    8078org.eclipse.jetty.servlet
    81 org.eclipse.jetty.servlet.api
    8279org.eclipse.jetty.servlet.jmx
    8380org.eclipse.jetty.servlet.listener
Note: See TracChangeset for help on using the changeset viewer.