Changeset a821ea2


Ignore:
Timestamp:
Jan 26, 2010 4:25:03 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
977d39ae
Parents:
b97197c
Message:

take non-linux stuff out of debian jbigi.jar

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rb97197c ra821ea2  
    255255        <defaultexcludes default="true"/>
    256256    </target>
     257
    257258    <target name="pkg" depends="distclean, updater, preppkg, installer" />
     259
    258260    <target name="pkgclean" depends="deletepkg-temp">
    259261        <delete>
     
    261263        </delete>
    262264    </target>
    263     <target name="preppkg" depends="build, buildexe, preplicenses, prepconsoleDocs">
     265
     266    <target name="preppkg" depends="preppkg-linux, buildexe">
     267        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     268        <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
     269        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
     270        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
     271        <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
     272        <copy file="installer/resources/eepget.bat" todir="pkg-temp/" />
     273        <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
     274        <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
     275        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
     276        <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
     277        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
     278        <copy todir="pkg-temp/lib/wrapper/freebsd/">
     279            <fileset dir="installer/lib/wrapper/freebsd/" />
     280        </copy>
     281        <copy todir="pkg-temp/lib/wrapper/macosx/">
     282            <fileset dir="installer/lib/wrapper/macosx/" />
     283        </copy>
     284        <copy todir="pkg-temp/lib/wrapper/solaris/">
     285            <fileset dir="installer/lib/wrapper/solaris/" />
     286        </copy>
     287        <copy todir="pkg-temp/lib/wrapper/win32/">
     288            <fileset dir="installer/lib/wrapper/win32/" />
     289        </copy>
     290    </target>
     291
     292    <!-- only what is needed for debian, etc. -->
     293    <target name="preppkg-linux-only" depends="preppkg-linux">
     294        <!-- rip the non-linux stuff out of jbigi.jar -->
     295        <mkdir dir="tmpextract" />
     296        <unjar src="build/jbigi.jar" dest="tmpextract/" />
     297        <jar destfile="pkg-temp/lib/jbigi.jar" >
     298            <fileset dir="tmpextract/" includes="*linux*" />
     299        </jar>
     300        <delete dir="tmpextract/" />
     301    </target>
     302
     303    <target name="preppkg-linux" depends="build, preplicenses, prepconsoleDocs">
    264304        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    265305        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
     
    269309        <copy file="build/commons-el.jar" todir="pkg-temp/lib/" />
    270310        <copy file="build/javax.servlet.jar" todir="pkg-temp/lib/" />
    271         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
    272311        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    273312        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
     
    278317        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
    279318        <copy file="build/systray.jar" todir="pkg-temp/lib" />
    280         <!-- <copy file="build/sucker.jar" todir="pkg-temp/lib" /> -->
    281319        <copy file="build/i2psnark.jar" todir="pkg-temp/lib/" />
    282         <copy file="i2p.exe" todir="pkg-temp/" failonerror="false" />
    283320        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
    284321        <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
    285         <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    286         <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
    287         <copy file="apps/systray/java/resources/iggy.xpm" todir="pkg-temp/icons" />
    288322        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    289323        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
     
    291325        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    292326        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    293         <!-- <copy file="build/syndie.war" todir="pkg-temp/webapps/" /> -->
    294327        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    295328        <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" />
     
    299332        <copy file="installer/resources/clients.config" todir="pkg-temp/" />
    300333        <copy file="installer/resources/eepget" todir="pkg-temp/" />
    301         <copy file="installer/resources/eepget.bat" todir="pkg-temp/" />
    302334        <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
    303         <copy file="installer/resources/i2prouter.bat" todir="pkg-temp/" />
    304         <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
    305335        <copy file="installer/resources/i2ptunnel.config" todir="pkg-temp/" />
    306         <!-- <copy file="installer/resources/install_i2p_service_unix" todir="pkg-temp/" /> -->
    307         <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    308336        <copy file="installer/resources/osid" todir="pkg-temp/" />
    309         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
    310337        <copy file="installer/resources/postinstall.sh" todir="pkg-temp/" />
    311338        <copy file="installer/resources/systray.config" todir="pkg-temp/" />
    312         <!-- <copy file="installer/resources/uninstall_i2p_service_unix" todir="pkg-temp/" /> -->
    313         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    314339        <copy file="installer/resources/wrapper.config" todir="pkg-temp/" />
    315         <copy todir="pkg-temp/lib/wrapper/freebsd/">
    316             <fileset dir="installer/lib/wrapper/freebsd/" />
    317         </copy>
    318340        <copy todir="pkg-temp/lib/wrapper/linux/">
    319341            <fileset dir="installer/lib/wrapper/linux/" />
     
    321343        <copy todir="pkg-temp/lib/wrapper/linux64/">
    322344            <fileset dir="installer/lib/wrapper/linux64/" />
    323         </copy>
    324         <copy todir="pkg-temp/lib/wrapper/macosx/">
    325             <fileset dir="installer/lib/wrapper/macosx/" />
    326         </copy>
    327         <copy todir="pkg-temp/lib/wrapper/solaris/">
    328             <fileset dir="installer/lib/wrapper/solaris/" />
    329         </copy>
    330         <copy todir="pkg-temp/lib/wrapper/win32/">
    331             <fileset dir="installer/lib/wrapper/win32/" />
    332345        </copy>
    333346        <copy file="installer/resources/hosts.txt" todir="pkg-temp/" />
     
    337350        <mkdir dir="pkg-temp/scripts" />
    338351        <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
    339         <!-- test classes aren't in the jars anymore
    340         <copy file="core/perl/i2pbench.sh" todir="pkg-temp/scripts/" />
    341         <copy file="core/perl/i2ptest.sh" todir="pkg-temp/scripts/" />
    342         -->
    343         <!-- polecat: please put your modified toolbar.html in installer/resources/toolbar.html
    344              and uncomment the following -->
    345         <!-- <copy file="installer/resources/toolbar.html" todir="pkg-temp/docs/" /> -->
    346352        <!-- overwrite the news put in by the updater -->
    347353        <copy file="installer/resources/initialNews.xml" tofile="pkg-temp/docs/news.xml" overwrite="true" />
     
    368374        <copy file="installer/resources/jetty.xml" tofile="pkg-temp/eepsite/jetty.xml" />
    369375    </target>
     376
    370377    <target name="preplicenses">
    371378        <copy file="LICENSE.txt" todir="pkg-temp/" />
  • debian/README.txt

    rb97197c ra821ea2  
    1515Todo:
    1616
    17 - Remove 1MB lib/jbigi.jar, just build and include dynamic libjbigi
     17- Remove lib/jbigi.jar, just build and include dynamic libjbigi
    1818  and the linux libjcpuid (and add dependency on libgmp)
    1919- Initial router.config for i2psvc (without confusing i2p that
  • debian/rules

    rb97197c ra821ea2  
    22
    33build:
    4         ant preppkg
     4        ant preppkg-linux-only
    55        mkdir -p debian/tmp/usr/lib
    66        mkdir -p debian/tmp/etc/init.d
    77        cp -a debian/scripts/init debian/tmp/etc/init.d/i2p
    88        cp -a pkg-temp debian/tmp/usr/lib/i2p
    9         rm -f debian/tmp/usr/lib/i2p/*.bat
    10         rm -f debian/tmp/usr/lib/i2p/i2p.exe
    11         rm -rf debian/tmp/usr/lib/i2p/icons
    12         rm -f debian/tmp/usr/lib/i2p/lib/systray4j.dll
    13         rm -rf debian/tmp/usr/lib/i2p/lib/wrapper/freebsd
    14         rm -rf debian/tmp/usr/lib/i2p/lib/wrapper/macosx
    15         rm -rf debian/tmp/usr/lib/i2p/lib/wrapper/solaris
    16         rm -rf debian/tmp/usr/lib/i2p/lib/wrapper/win32
    179        chmod +x debian/tmp/usr/lib/i2p/postinstall.sh
    1810        sed 's|$$INSTALL_PATH|/usr/lib/i2p|g' debian/tmp/usr/lib/i2p/wrapper.config > debian/tmp/usr/lib/i2p/a
  • debian/scripts/prerm

    rb97197c ra821ea2  
    1111I2P=/usr/lib/i2p
    1212rm -f $I2P/i2psvc $I2P/lib/libwrapper.so $I2P/lib/wrapper.jar
     13# copied out of jbigi.jar by the router
     14rm -f $I2P/libjbigi.so $I2P/libjcpuid.so
    1315
    1416# the home directory for the i2p daemon
Note: See TracChangeset for help on using the changeset viewer.