Changeset 2c0e6a3


Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (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 '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

Files:
15 added
32 deleted
45 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    rcbaa62d r2c0e6a3  
    128128
    129129
    130 Wrapper 3.1.1:
    131    Copyright (c) 1999, 2004 Tanuki Software
     130Java Service Wrapper Community Edition 32-bit 3.5.9:
     131   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
    132132   See licenses/LICENSE-Wrapper.txt
    133133
  • apps/addressbook/build.xml

    rcbaa62d r2c0e6a3  
    5252        <target name="jar" depends="compile, changes">
    5353                <jar basedir="${build}" destfile="${dist}/${jar}">
     54                <!-- set if unset -->
     55                <property name="workspace.changes" value="" />
    5456                        <manifest>
    5557                                <attribute name="Main-Class" value="addressbook.Daemon"/>
     
    6870                        <fileset dir="${build}"/>
    6971                </copy>
     72                <!-- set if unset -->
     73                <property name="workspace.changes.tr" value="" />
    7074                <war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
    7175                        <manifest>
     
    8286                            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
    8387                </uptodate>
     88                <condition property="shouldListChanges" >
     89                    <and>
     90                        <not>
     91                            <isset property="war.uptodate" />
     92                        </not>
     93                        <isset property="mtn.available" />
     94                    </and>
     95                </condition>
    8496        </target>
    8597
    86         <target name="changes">
     98        <target name="changes" depends="warUpToDate" if="shouldListChanges" >
    8799                <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    88100                    <arg value="list" />
  • apps/desktopgui/build.xml

    rcbaa62d r2c0e6a3  
    3030            <classpath>
    3131                <pathelement location="../../core/java/build/i2p.jar" />
    32                 <!-- doesn't matter if we're not on win32, we just need the java classes, not the platform-dependent code -->
    33                 <pathelement location="../../installer/lib/wrapper/win32/wrapper.jar" />
     32                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
    3433                <pathelement location="../../router/java/build/router.jar" />
    3534            </classpath>
     
    4039        </target>
    4140
    42         <target name="jar" depends="compile">
     41        <target name="bundle" >
    4342        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
    4443            <arg value="./bundle-messages.sh" />
     
    5150            <arg value="./bundle-messages.sh" />
    5251        </exec>
     52        </target>
     53
     54        <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    5355        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    5456            <arg value="list" />
     
    6264            <arg value="," />
    6365        </exec>
     66        </target>
     67
     68        <target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
     69                <!-- set if unset -->
     70                <property name="workspace.changes.tr" value="" />
    6471                <jar basedir="${build}" destfile="${dist}/${jar}">
    6572                        <manifest>
     
    7178                </jar>
    7279        </target>
     80
     81    <target name="jarUpToDate">
     82        <uptodate property="jar.uptodate" targetfile="${dist}/${jar}" >
     83            <srcfiles dir= "." includes="build/**/*.class" />
     84        </uptodate>
     85        <condition property="shouldListChanges" >
     86            <and>
     87                <not>
     88                    <isset property="jar.uptodate" />
     89                </not>
     90                <isset property="mtn.available" />
     91            </and>
     92        </condition>
     93    </target>
    7394
    7495    <target name="javadoc">
  • apps/i2psnark/java/build.xml

    rcbaa62d r2c0e6a3  
    3737    </target>
    3838
    39     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     39    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4040        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    4141            <arg value="list" />
     
    4949            <arg value="," />
    5050        </exec>
     51    </target>
     52
     53    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     54        <!-- set if unset -->
     55        <property name="workspace.changes.tr" value="" />
    5156        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
    5257            <manifest>
     
    6469            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class" />
    6570        </uptodate>
     71        <condition property="shouldListChanges" >
     72            <and>
     73                <not>
     74                    <isset property="jar.uptodate" />
     75                </not>
     76                <not>
     77                    <isset property="wjar.uptodate" />
     78                </not>
     79                <isset property="mtn.available" />
     80            </and>
     81        </condition>
    6682    </target>   
    6783
     
    7389          <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
    7490     -->
    75     <target name="war" depends="jar, bundle, warUpToDate" unless="war.uptodate" >
     91    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
     92        <!-- set if unset -->
     93        <property name="workspace.changes.tr" value="" />
    7694        <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
    7795          <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
  • apps/i2ptunnel/java/build.xml

    rcbaa62d r2c0e6a3  
    3535    </target>
    3636
    37     <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
    38       -  This will require sponge to rewrite some seedless stuff that uses it.
    39      -->
    40     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     37    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4138        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
    4239            <arg value="list" />
     
    5047            <arg value="," />
    5148        </exec>
     49    </target>
     50
     51
     52    <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
     53      -  This will require sponge to rewrite some seedless stuff that uses it.
     54     -->
     55    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     56        <!-- set if unset -->
     57        <property name="workspace.changes.j.tr" value="" />
    5258        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
    5359            <manifest>
     
    6571            <srcfiles dir= "build/obj" includes="**/*.class" />
    6672        </uptodate>
     73        <condition property="shouldListChanges" >
     74            <and>
     75                <not>
     76                    <isset property="jar.uptodate" />
     77                </not>
     78                <isset property="mtn.available" />
     79            </and>
     80        </condition>
    6781    </target>
    6882
     
    98112    </target>
    99113
    100     <target name="war" depends="precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     114    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
    101115        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
    102116            <arg value="list" />
     
    110124            <arg value="," />
    111125        </exec>
     126    </target>
     127
     128    <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" >
     129        <!-- set if unset -->
     130        <property name="workspace.changes.w.tr" value="" />
    112131        <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
    113132             basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
     
    124143            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, **/*.java, *.jsp" />
    125144        </uptodate>
     145        <condition property="shouldListChanges2" >
     146            <and>
     147                <not>
     148                    <isset property="war.uptodate" />
     149                </not>
     150                <isset property="mtn.available" />
     151            </and>
     152        </condition>
    126153    </target>
    127154
  • apps/jetty/build.xml

    rcbaa62d r2c0e6a3  
    9999    </target>
    100100
    101     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     101    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    102102        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    103103            <arg value="list" />
     
    111111            <arg value="," />
    112112        </exec>
     113    </target>
     114
     115    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     116        <!-- set if unset -->
     117        <property name="workspace.changes.tr" value="" />
    113118        <jar destfile="./jettylib/org.mortbay.jetty.jar" basedir="./build/obj" includes="**/*.class" update="true" >
    114119            <manifest>
     
    124129            <srcfiles dir= "build/obj" includes="**/*.class" />
    125130        </uptodate>
     131        <condition property="shouldListChanges" >
     132            <and>
     133                <not>
     134                    <isset property="jar.uptodate" />
     135                </not>
     136                <isset property="mtn.available" />
     137            </and>
     138        </condition>
    126139    </target>   
    127140
  • apps/ministreaming/java/build.xml

    rcbaa62d r2c0e6a3  
    3232    </target>
    3333
    34     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     34    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    3535        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    3636            <arg value="list" />
     
    4444            <arg value="," />
    4545        </exec>
     46    </target>
     47
     48    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     49        <!-- set if unset -->
     50        <property name="workspace.changes.tr" value="" />
    4651        <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
    4752            <manifest>
     
    5762            <srcfiles dir= "." includes="build/obj/**/*.class" />
    5863        </uptodate>
     64        <condition property="shouldListChanges" >
     65            <and>
     66                <not>
     67                    <isset property="jar.uptodate" />
     68                </not>
     69                <isset property="mtn.available" />
     70            </and>
     71        </condition>
    5972    </target>
    6073
  • apps/routerconsole/java/build.xml

    rcbaa62d r2c0e6a3  
    2626                <pathelement location="../../systray/java/lib/systray4j.jar" />
    2727                <pathelement location="../../desktopgui/build" />
    28                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     28                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    2929                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    3030            </classpath>
     
    5858                <pathelement location="../../systray/java/lib/systray4j.jar" />
    5959                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    60                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     60                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    6161                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    6262            </classpath>
     
    6868
    6969    <!-- the jar without the latest message classes from the jsps -->
    70     <target name="jar1" depends="compile, jarUpToDate" unless="jar.uptodate" >
     70    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    7171        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
    7272            <arg value="list" />
     
    8181            <arg value="," />
    8282        </exec>
     83    </target>
     84
     85    <target name="jar1" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     86        <!-- set if unset -->
     87        <property name="workspace.changes.j.tr" value="" />
    8388        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
    8489            <manifest>
     
    116121            <srcfiles dir= "build/obj" includes="**/*.class" />
    117122        </uptodate>
     123        <condition property="shouldListChanges" >
     124            <and>
     125                <not>
     126                    <isset property="jar.uptodate" />
     127                </not>
     128                <isset property="mtn.available" />
     129            </and>
     130        </condition>
    118131    </target>
    119132
     
    135148    </target>
    136149
    137     <!-- does NOT update the message classes, as those go in the jar -->
    138     <target name="war" depends="precompilejsp, warUpToDate" unless="war.uptodate" >
     150    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
    139151        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
    140152            <arg value="list" />
     
    148160            <arg value="," />
    149161        </exec>
     162    </target>
     163
     164    <!-- does NOT update the message classes, as those go in the jar -->
     165    <target name="war" depends="precompilejsp, warUpToDate, listChangedFiles2" unless="war.uptodate" >
     166        <!-- set if unset -->
     167        <property name="workspace.changes.w.tr" value="" />
    150168        <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
    151169        <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
     
    163181            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
    164182        </uptodate>
     183        <condition property="shouldListChanges" >
     184            <and>
     185                <not>
     186                    <isset property="jar.uptodate" />
     187                </not>
     188                <isset property="mtn.available" />
     189            </and>
     190        </condition>
    165191    </target>
    166192
     
    212238                <pathelement location="../../systray/java/lib/systray4j.jar" />
    213239                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    214                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     240                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    215241                <pathelement location="build/routerconsole.jar" />
    216242                <pathelement location="build/" />
     
    244270                <pathelement location="../../systray/java/lib/systray4j.jar" />
    245271                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    246                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     272                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    247273                <pathelement location="build/routerconsole.jar" />
    248274                <pathelement location="build" />
  • apps/sam/java/build.xml

    rcbaa62d r2c0e6a3  
    4646    </target>
    4747
    48     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     48    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4949        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    5050            <arg value="list" />
     
    5858            <arg value="," />
    5959        </exec>
     60    </target>
     61
     62    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     63        <!-- set if unset -->
     64        <property name="workspace.changes.tr" value="" />
    6065        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class">
    6166            <manifest>
     
    7378            <srcfiles dir= "build/obj" includes="**/*.class" />
    7479        </uptodate>
     80        <condition property="shouldListChanges" >
     81            <and>
     82                <not>
     83                    <isset property="jar.uptodate" />
     84                </not>
     85                <isset property="mtn.available" />
     86            </and>
     87        </condition>
    7588    </target>
    7689
  • apps/streaming/java/build.xml

    rcbaa62d r2c0e6a3  
    4545    </target>
    4646
    47     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     47    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4848        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    4949            <arg value="list" />
     
    5757            <arg value="," />
    5858        </exec>
     59    </target>
     60
     61    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     62        <!-- set if unset -->
     63        <property name="workspace.changes.tr" value="" />
    5964        <jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*.class" >
    6065            <manifest>
     
    7075            <srcfiles dir= "." includes="build/obj/**/*.class" />
    7176        </uptodate>
     77        <condition property="shouldListChanges" >
     78            <and>
     79                <not>
     80                    <isset property="jar.uptodate" />
     81                </not>
     82                <isset property="mtn.available" />
     83            </and>
     84        </condition>
    7285    </target>
    7386
  • apps/susidns/src/build.xml

    rcbaa62d r2c0e6a3  
    6868    <target name="all" depends="war"/>
    6969
    70     <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     70    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
    7171        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    7272            <arg value="list" />
     
    8080            <arg value="," />
    8181        </exec>
     82    </target>
     83
     84    <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     85        <!-- set if unset -->
     86        <property name="workspace.changes.tr" value="" />
    8287        <war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
    8388                <fileset dir=".">
     
    103108            <srcfiles dir= "." includes="WEB-INF/web-out.xml WEB-INF/**/*.class images/*.png css.css index.html WEB-INF/classes/${project}.properties" />
    104109        </uptodate>
     110        <condition property="shouldListChanges" >
     111            <and>
     112                <not>
     113                    <isset property="war.uptodate" />
     114                </not>
     115                <isset property="mtn.available" />
     116            </and>
     117        </condition>
    105118    </target>
    106119
  • apps/susimail/build.xml

    rcbaa62d r2c0e6a3  
    2323    <target name="jar" depends="compile, war" />
    2424
    25     <target name="war" depends="compile, bundle, warUpToDate" unless="war.uptodate" >
     25    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
    2626        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    2727            <arg value="list" />
     
    3535            <arg value="," />
    3636        </exec>
     37    </target>
     38
     39    <target name="war" depends="compile, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
     40        <!-- set if unset -->
     41        <property name="workspace.changes.tr" value="" />
    3742        <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
    3843             basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
     
    4954            <srcfiles dir= "src" excludes="LICENSE src/**/*" />
    5055        </uptodate>
     56        <condition property="shouldListChanges" >
     57            <and>
     58                <not>
     59                    <isset property="war.uptodate" />
     60                </not>
     61                <isset property="mtn.available" />
     62            </and>
     63        </condition>
    5164    </target>
    5265
  • apps/systray/java/build.xml

    rcbaa62d r2c0e6a3  
    2424    </target>
    2525
    26     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate">
     26    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    2727        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    2828            <arg value="list" />
     
    3636            <arg value="," />
    3737        </exec>
     38    </target>
     39
     40    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate">
     41        <!-- set if unset -->
     42        <property name="workspace.changes.tr" value="" />
    3843        <jar destfile="./build/systray.jar" basedir="./build/obj" includes="**/*.class">
    3944            <manifest>
     
    5156            <srcfiles dir= "build/obj" includes="**/*.class" />
    5257        </uptodate>
     58        <condition property="shouldListChanges" >
     59            <and>
     60                <not>
     61                    <isset property="jar.uptodate" />
     62                </not>
     63                <isset property="mtn.available" />
     64            </and>
     65        </condition>
    5366    </target>
    5467
  • build.xml

    rcbaa62d r2c0e6a3  
    160160    </target>
    161161
    162     <target name="buildProperties" >
     162    <target name="checkForMtn" >
     163        <available property="mtn.available" file="_MTN" type="dir" />
     164    </target>
     165
     166    <target name="getMtnRev" depends="checkForMtn" if="mtn.available" >
    163167        <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" >
    164168            <arg value="automate" />
    165169            <arg value="get_base_revision_id" />
    166170        </exec>
     171    </target>
     172
     173    <target name="buildProperties" depends="getMtnRev" >
     174        <!-- default if not set above -->
     175        <property name="workspace.version" value="unknown" />
    167176        <tstamp>
    168177            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
     
    241250    </target>
    242251
    243     <target name="jbigi">
     252    <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available" >
     253        <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
     254            <arg value="list" />
     255            <arg value="changed" />
     256            <arg value="installer/lib/jbigi" />
     257        </exec>
     258        <!-- \n in an attribute value generates an invalid manifest -->
     259        <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
     260            <arg value="-s" />
     261            <arg value="[:space:]" />
     262            <arg value="," />
     263        </exec>
     264    </target>
     265
     266    <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
     267        <!-- set if unset -->
     268        <property name="workspace.changes.jbigi.tr" value="" />
    244269        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    245270            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     271            <manifest>
     272                <attribute name="Build-Date" value="${build.timestamp}" />
     273                <attribute name="Base-Revision" value="${workspace.version}" />
     274                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     275            </manifest>
    246276        </jar>
    247277    </target>
    248278
    249     <target name="jbigi-windows-only" >
     279    <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
     280        <!-- set if unset -->
     281        <property name="workspace.changes.jbigi.tr" value="" />
    250282        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    251283            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     284            <manifest>
     285                <attribute name="Build-Date" value="${build.timestamp}" />
     286                <attribute name="Base-Revision" value="${workspace.version}" />
     287                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     288            </manifest>
    252289        </jar>
    253290    </target>
    254291
    255     <target name="jbigi-linux-only">
     292    <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
     293        <!-- set if unset -->
     294        <property name="workspace.changes.jbigi.tr" value="" />
    256295        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
    257296            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     297            <manifest>
     298                <attribute name="Build-Date" value="${build.timestamp}" />
     299                <attribute name="Base-Revision" value="${workspace.version}" />
     300                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
     301            </manifest>
    258302        </jar>
    259303    </target>
     
    338382                <pathelement location="apps/systray/java/lib/systray4j.jar" />
    339383                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    340                 <pathelement location="installer/lib/wrapper/win32/wrapper.jar" />
     384                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
    341385                <pathelement location="core/lib/junit.jar" />               
    342386            </classpath>
     
    353397        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    354398        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
     399        <delete dir="core/c/jbigi/bin" />
     400        <delete dir="core/c/jbigi/lib" />
     401        <delete dir="core/c/jcpuid/lib" />
    355402        <delete dir="debian/tmp" />
    356403        <delete dir="debian/db" />
     
    435482            <fileset dir="installer/lib/wrapper/freebsd/" />
    436483        </copy>
     484        <copy todir="pkg-temp/lib/wrapper/freebsd64/">
     485            <fileset dir="installer/lib/wrapper/freebsd64" />
     486        </copy>
    437487        <copy todir="pkg-temp/lib/wrapper/macosx/">
    438488            <fileset dir="installer/lib/wrapper/macosx/" />
     
    452502        <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" />
    453503        <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" />
    454         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
    455504        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    456505        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
     506        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    457507        <copy todir="pkg-temp/lib/wrapper/win32/">
    458508            <fileset dir="installer/lib/wrapper/win32/" />
     509        </copy>
     510        <copy todir="pkg-temp/lib/wrapper/win64/">
     511            <fileset dir="installer/lib/wrapper/win64/" />
    459512        </copy>
    460513    </target>
     
    463516    <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
    464517        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     518        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    465519    </target>
    466520
    467521    <target name="preppkg-linux" depends="preppkg-base">
    468522        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
    469         <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" />
     523        <!-- <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" /> old feature that per zzz isn't used-->
    470524        <copy file="installer/resources/eepget" todir="pkg-temp/" />
    471525        <copy file="installer/resources/i2prouter" todir="pkg-temp/" />
     
    747801        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    748802    </target>
    749     <target name="installer" depends="preppkg, buildProperties">
    750         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
    751         <mkdir dir="pkg-temp/installer" />
     803
     804    <target name="util-list-changes" depends="checkForMtn" if="mtn.available" >
    752805        <exec executable="mtn" outputproperty="workspace.changes.util" errorproperty="mtn.error.util" failifexecutionfails="false" >
    753806            <arg value="list" />
     
    761814            <arg value="," />
    762815        </exec>
     816    </target>
     817
     818    <target name="installer" depends="preppkg, buildProperties, util-list-changes" >
     819        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     820        <mkdir dir="pkg-temp/installer" />
     821        <!-- set if unset -->
     822        <property name="workspace.changes.util.tr" value="" />
    763823        <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    764824            <manifest>
     
    874934            <arg value="i2p.fba"/>
    875935            <arg value="-auxclasspath"/>
    876             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/linux/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     936            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    877937            <arg value="-sourcepath"/>
    878938            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/>
     
    11801240                        <!--wrapper - dont even think about it. i2p cosumes appreantly more mem without it on win32-->
    11811241                <copy file="installer/lib/wrapper/win32/wrapper.dll" todir="pkg-temp/lib" />
    1182                 <copy file="installer/lib/wrapper/win32/wrapper.jar" todir="pkg-temp/lib" />
     1242                <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    11831243                <copy file="installer/lib/wrapper/win32/I2Psvc.exe" tofile="pkg-temp/i2psvc.ex_" />
    11841244                        <!--  copy the unpack/start batchfiles -->
  • core/java/build.xml

    rcbaa62d r2c0e6a3  
    4040    </target>
    4141
    42     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     42    <target name="listChangedFiles" if="mtn.available" >
    4343        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    4444            <arg value="list" />
     
    5252            <arg value="," />
    5353        </exec>
     54    </target>
     55
     56    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     57        <!-- set if unset -->
     58        <property name="workspace.changes.tr" value="" />
    5459        <jar destfile="./build/i2p.jar" basedir="./build/obj" includes="**/*.class" >
    5560            <manifest>
  • core/java/src/net/i2p/util/LogManager.java

    rcbaa62d r2c0e6a3  
    1818import java.text.SimpleDateFormat;
    1919import java.util.ArrayList;
    20 import java.util.HashMap;
    2120import java.util.Iterator;
    2221import java.util.LinkedList;
    2322import java.util.List;
    24 import java.util.Map;
    2523import java.util.Properties;
    2624import java.util.Queue;
    2725import java.util.Set;
    2826import java.util.TimeZone;
    29 import java.util.TreeMap;
    3027import java.util.concurrent.ConcurrentHashMap;
    3128import java.util.concurrent.LinkedBlockingQueue;
    3229
    3330import net.i2p.I2PAppContext;
     31import net.i2p.data.DataHelper;
    3432
    3533/**
     
    287285
    288286        Properties p = new Properties();
    289         FileInputStream fis = null;
    290         try {
    291             fis = new FileInputStream(cfgFile);
    292             p.load(fis);
     287        try {
     288            DataHelper.loadProps(p, cfgFile);
    293289            _configLastRead = _context.clock().now();
    294290        } catch (IOException ioe) {
    295291            System.err.println("Error loading logger config from " + cfgFile.getAbsolutePath());
    296         } finally {
    297             if (fis != null) try {
    298                 fis.close();
    299             } catch (IOException ioe) { // nop
    300             }
    301292        }
    302293        parseConfig(p);
     
    364355        parseLimits(config, PROP_RECORD_PREFIX);
    365356    }
     357
    366358    private void parseLimits(Properties config, String recordPrefix) {
    367359        _limits.clear();
     
    560552    }
    561553
     554    /** @return success */
    562555    public boolean saveConfig() {
    563         String config = createConfig();
    564         FileOutputStream fos = null;
    565         try {
    566             fos = new FileOutputStream(_locationFile);
    567             fos.write(config.getBytes());
     556        Properties props = createConfig();
     557        try {
     558            DataHelper.storeProps(props, _locationFile);
    568559            return true;
    569560        } catch (IOException ioe) {
    570561            getLog(LogManager.class).error("Error saving the config", ioe);
    571562            return false;
    572         } finally {
    573             if (fos != null) try { fos.close(); } catch (IOException ioe) {}
    574         }
    575     }
    576    
    577     private String createConfig() {
    578         StringBuilder buf = new StringBuilder(8*1024);
    579         buf.append(PROP_FORMAT).append('=').append(new String(_format)).append('\n');
    580         buf.append(PROP_DATEFORMAT).append('=').append(_dateFormatPattern).append('\n');
    581         buf.append(PROP_DISPLAYONSCREEN).append('=').append((_displayOnScreen ? "TRUE" : "FALSE")).append('\n');
     563        }
     564    }
     565   
     566    private Properties createConfig() {
     567        Properties rv = new OrderedProperties();
     568        rv.setProperty(PROP_FORMAT, new String(_format));
     569        rv.setProperty(PROP_DATEFORMAT, _dateFormatPattern);
     570        rv.setProperty(PROP_DISPLAYONSCREEN, Boolean.toString(_displayOnScreen));
    582571        String filenameOverride = _context.getProperty(FILENAME_OVERRIDE_PROP);
    583572        if (filenameOverride == null)
    584             buf.append(PROP_FILENAME).append('=').append(_baseLogfilename).append('\n');
     573            rv.setProperty(PROP_FILENAME, _baseLogfilename);
    585574        else // this isn't technically correct - this could mess with some funky scenarios
    586             buf.append(PROP_FILENAME).append('=').append(DEFAULT_FILENAME).append('\n');
     575            rv.setProperty(PROP_FILENAME, DEFAULT_FILENAME);
    587576       
    588577        if (_fileSize >= 1024*1024)
    589             buf.append(PROP_FILESIZE).append('=').append( (_fileSize / (1024*1024))).append("m\n");
     578            rv.setProperty(PROP_FILESIZE,  (_fileSize / (1024*1024)) + "m");
    590579        else if (_fileSize >= 1024)
    591             buf.append(PROP_FILESIZE).append('=').append( (_fileSize / (1024))).append("k\n");
     580            rv.setProperty(PROP_FILESIZE,  (_fileSize / (1024))+ "k");
    592581        else if (_fileSize > 0)
    593             buf.append(PROP_FILESIZE).append('=').append(_fileSize).append('\n');
     582            rv.setProperty(PROP_FILESIZE, Integer.toString(_fileSize));
    594583        // if <= 0, dont specify
    595584       
    596         buf.append(PROP_ROTATIONLIMIT).append('=').append(_rotationLimit).append('\n');
    597         buf.append(PROP_DEFAULTLEVEL).append('=').append(Log.toLevelString(_defaultLimit)).append('\n');
    598         buf.append(PROP_DISPLAYONSCREENLEVEL).append('=').append(Log.toLevelString(_onScreenLimit)).append('\n');
    599         buf.append(PROP_CONSOLEBUFFERSIZE).append('=').append(_consoleBufferSize).append('\n');
    600 
    601         buf.append("# log limit overrides:\n");
    602        
    603         TreeMap limits = new TreeMap();
     585        rv.setProperty(PROP_ROTATIONLIMIT, Integer.toString(_rotationLimit));
     586        rv.setProperty(PROP_DEFAULTLEVEL, Log.toLevelString(_defaultLimit));
     587        rv.setProperty(PROP_DISPLAYONSCREENLEVEL, Log.toLevelString(_onScreenLimit));
     588        rv.setProperty(PROP_CONSOLEBUFFERSIZE, Integer.toString(_consoleBufferSize));
     589
    604590        for (LogLimit lim : _limits) {
    605             limits.put(lim.getRootName(), Log.toLevelString(lim.getLimit()));
    606         }
    607         for (Iterator iter = limits.entrySet().iterator(); iter.hasNext(); ) {
    608             Map.Entry entry = (Map.Entry)iter.next();
    609             String path = (String)entry.getKey();
    610             String lim = (String)entry.getValue();
    611             buf.append(PROP_RECORD_PREFIX).append(path);
    612             buf.append('=').append(lim).append('\n');
    613         }
    614        
    615         return buf.toString();
     591            rv.setProperty(PROP_RECORD_PREFIX + lim.getRootName(), Log.toLevelString(lim.getLimit()));
     592        }
     593       
     594        return rv;
    616595    }
    617596
  • history.txt

    rcbaa62d r2c0e6a3  
     12011-06-09 kytv
     2   * Added an x64 wrapper for Windows. This is needed because a 32bit wrapper
     3     cannot start a 64bit JVM.
     4
     52011-06-08 zzz
     6    * Build:
     7      - Add standard manifest to jbigi.jar
     8      - Don't do 'mtn list changed' if not in a workspace or not needed
     9    * LogManager: Use DataHelper methods for loading and storing config
     10
     112011-06-08 kytv
     12    * Update jbigi/jcpuid Windows dlls. As was done for FreeBSD and Linux, the
     13      libraries for 32bit CPUs were linked against gmp-4.3.2 and those for the
     14      64bit CPUs were linked against gmp-5.0.2.
     15
     162011-06-07 kytv
     17    * Upgrade the wrapper to 3.5.9. Noticable changes include:
     18      - FreeBSD amd64 is now a supported arch along with i386. To use the wrapper
     19        with the most recent version of FreeBSD the port 'misc/compat6x' will need
     20        to be installed.
     21      - OSX: Both Intel and PPC Macs are supported. 32-bit support. If you'd like 64-bit
     22        support, please file a bug in trac with the output of "uname -m".
     23    * Upgrade jbigi/jcpuid for FreeBSD i386 and add support for amd64. As was done with
     24      the Linux compiles, 32bit compiles were linked with gmp 4.3.2 and 64 bit builds
     25      (as well as 32bit builds for 64bit cpus) were linked against gmp 5.0.2.
     26
     272011-06-06 zzz
     28    * Drop andorid/ directory; further development will happen in
     29      an android-only branch.
     30
    1312011-06-05 zzz
    232    * Console: Tag stat descriptions at declaration rather than in Strings.java
     
    1444        little or no performance difference between the two versions for 32 bit processors.
    1545        See http://zzz.i2p/topics/306 for discussion and test results.
    16       - Replace old non-PIC 62-bit linux libs (GMP 4.1.4 built in 2005)
     46      - Replace old non-PIC 64-bit linux libs (GMP 4.1.4 built in 2005)
    1747        with PIC libs built with GMP 5.0.2. License is LGPLv3.
    1848        Built by sponge with GCC 4.4.4, downloaded from
  • installer/install.xml

    rcbaa62d r2c0e6a3  
    131131            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
    132132           
     133            <conditions>
     134                <condition type="variable" id="is64bit">
     135                    <name>SYSTEM_sun_arch_data_model</name>
     136                    <value>64</value>
     137                </condition>
     138            </conditions>
    133139            <!-- postinstall stuff for windows -->
     140            <!-- Wrapper for 32bit Windows JVM -->
    134141            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    135142                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
    136143            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    137144                <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     145            <!-- wrapper for 64bit Windows JVM -->
     146            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
     147                condition="is64bit" > <os family="windows" />
     148                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
     149            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
     150                condition="is64bit" > <os family="windows" />
     151                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     152            <!-- Arch-indep wrapper.jar on Windows -->
    138153            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    139                 <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
     154                <args><arg value="$INSTALL_PATH\lib\wrapper\all\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>
    140155            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    141156                <args><arg value="$INSTALL_PATH\i2prouter" /></args></executable>
     
    148163            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    149164                <args><arg value="$INSTALL_PATH\postinstall.sh" /></args></executable>
    150             <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    151                 <args><arg value="$INSTALL_PATH\postinstall.bat" /></args></executable>
    152165            <executable targetfile="$INSTALL_PATH/installer/delete.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
    153166                <args><arg value="$INSTALL_PATH\uninstall_i2p_service_unix" /></args></executable>
  • installer/lib/jbigi/README.txt

    rcbaa62d r2c0e6a3  
    4040   - 32 bit libjcpuid-linux-x86.so updated, compiled with -fPIC.
    4141   - 64 bit libjcpuid-linux-x86_64.so added, compiled with -fPIC.
     42   - 32 bit libjcpuid-freebsd-x86.so updated, compiled with -fPIC.
     43   - 64 bit libjcpid-freebsd-x86_64.so added, compiled with -fPIC.
     44   - 32 bit libjcpuid-x86-solaris.so added, compiled with -fPIC.
     45   - 32 bit jcpuid-windows.dll updated (no PIC for Windows).
    4246   - See also javadoc and code in CPUID.java
    4347  jbigi:
     
    4751     except for athlon64 and pentium4, which use GMP 5.0.2.
    4852   - All 64 bit linux files updated with GMP 5.0.2.
    49    - libjbigi-windows-athlon64.dll deleted, it was a duplicate of
    50      libjbigi-windows-athlon.dll. NativeBigInteger now uses athlon as
    51      a fallback for all 64-bit processors.
     53   - All 32 bit freebsd files updated with GMP 4.3.2, compiled with -fPIC.
     54   - All 64 bit freebsd files are new and were linked with GMP 5.0.2.
     55   - All existing windows files were updated with GMP 4.3.2. Just as was
     56     done for the non-windows architectures, files for 64 bit CPUs were
     57     linked with GMP 5.0.2.
     58   - jbigi-windows-athlon64.dll was updated, it used to be duplicate of
     59     jbigi-windows-athlon.dll.
    5260   - Note that all new 64 bit files will use the _64 suffix. For example,
    5361     the old libjbigi-linux-athlon64.so file was 64 bit; now it is 32 bit
  • installer/resources/postinstall.sh

    rcbaa62d r2c0e6a3  
    1717fi
    1818
    19 chmod 744 ./i2prouter
    20 # chmod 744 ./install_i2p_service_unix
    21 chmod 744 ./osid
    22 chmod 744 ./runplain.sh
    23 # chmod 744 ./uninstall_i2p_service_unix
     19chmod 755 ./i2prouter
     20# chmod 755 ./install_i2p_service_unix
     21chmod 755 ./osid
     22chmod 755 ./runplain.sh
     23# chmod 755 ./uninstall_i2p_service_unix
    2424
    2525ERROR_MSG="Cannot determine operating system type. From the subdirectory in lib/wrapper matching your operating system, please move i2psvc to your base I2P directory, and move the remaining two files to the lib directory."
     
    3333
    3434OS_ARCH=`uname -m`
    35 X86_64=`echo "$OS_ARCH" | grep x86_64`
     35X86_64=`echo "${OS_ARCH}" | grep x86_64`
    3636
    3737case $HOST_OS in
     
    3939        if [ "X$X86_64" = "X" ]; then
    4040            wrapperpath="./lib/wrapper/linux"
    41             cp $wrapperpath/libwrapper.so ./lib/
     41            cp ${wrapperpath}/libwrapper.so ./lib/
    4242        else
    4343            wrapperpath="./lib/wrapper/linux64"
    44             cp $wrapperpath/libwrapper.so ./lib
     44            cp ${wrapperpath}/libwrapper.so ./lib
    4545        fi
    4646        ;;
    4747    freebsd )
    48         wrapperpath="./lib/wrapper/freebsd"
    49         cp $wrapperpath/libwrapper.so ./lib/
     48        if [ ! `uname -m |grep amd64` ]; then
     49            wrapperpath="./lib/wrapper/freebsd"
     50            cp ${wrapperpath}/libwrapper.so ./lib/
     51        else
     52            wrapperpath="./lib/wrapper/freebsd64"
     53            cp ${wrapperpath}/libwrapper.so ./lib/
     54        fi
    5055        ;;
    5156    osx )
    5257        wrapperpath="./lib/wrapper/macosx"
    53         cp $wrapperpath/libwrapper.jnilib ./lib/
     58        cp ${wrapperpath}/libwrapper.jnilib ./lib/
    5459        ;;
    5560    solaris )
    5661        wrapperpath="./lib/wrapper/solaris"
    57         cp $wrapperpath/libwrapper.so ./lib/
     62        cp ${wrapperpath}/libwrapper.so ./lib/
    5863        ;;
    5964    * )
    60         echo "$ERROR_MSG"
     65        echo "${ERROR_MSG}"
    6166        exit 1
    6267        ;;
    6368esac
    6469
    65 cp $wrapperpath/wrapper.jar ./lib/
     70#cp $wrapperpath/wrapper.jar ./lib/
    6671cp $wrapperpath/i2psvc .
    67 chmod 744 ./eepget
    68 chmod 744 ./i2psvc
     72chmod 755 ./eepget
     73chmod 755 ./i2psvc
    6974rm -rf ./icons
    7075rm -rf ./lib/wrapper
  • installer/resources/runplain.sh

    rcbaa62d r2c0e6a3  
    2020CP=
    2121
    22 for jars in `ls ${I2P}/lib/*.jar`; do CP=${CP}:${jars}; echo $CP; done
     22for jars in `ls ${I2P}/lib/*.jar`; do CP=${CP}:${jars}; done
    2323JAVA=java
    2424
  • licenses/LICENSE-Wrapper.txt

    rcbaa62d r2c0e6a3  
    1 Copyright (c) 1999, 2004 Tanuki Software
    2 
    3 Permission is hereby granted, free of charge, to any person
    4 obtaining a copy of the Java Service Wrapper and associated
    5 documentation files (the "Software"), to deal in the Software
    6 without  restriction, including without limitation the rights
    7 to use, copy, modify, merge, publish, distribute, sub-license,
    8 and/or sell copies of the Software, and to permit persons to
    9 whom the Software is furnished to do so, subject to the
    10 following conditions:
    11 
    12 The above copyright notice and this permission notice shall be
    13 included in all copies or substantial portions of the Software.
    14 
    15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    16 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
    17 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
    18 NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
    19 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
    20 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    21 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    22 OTHER DEALINGS IN THE SOFTWARE.
    23 
    24 
    25 Portions of the Software have been derived from source code
    26 developed by Silver Egg Technology under the following license:
    27 
    28 Copyright (c) 2001 Silver Egg Technology
    29 
    30 Permission is hereby granted, free of charge, to any person
    31 obtaining a copy of this software and associated documentation
    32 files (the "Software"), to deal in the Software without
    33 restriction, including without limitation the rights to use,
    34 copy, modify, merge, publish, distribute, sub-license, and/or
    35 sell copies of the Software, and to permit persons to whom the
    36 Software is furnished to do so, subject to the following
    37 conditions:
    38 
    39 The above copyright notice and this permission notice shall be
    40 included in all copies or substantial portions of the Software.
    41 
     1----------------------------------------------------------------------
     2-----------------                                    -----------------
     3                         Tanuki Software, Ltd.
     4                 Community Software License Agreement
     5                             Version 1.1
     6
     7IMPORTANT-READ CAREFULLY: This license agreement is a legal agreement
     8between you ("Licensee") and Tanuki Software, Ltd. ("TSI"), which
     9includes computer software, associated media, printed materials, and
     10may include online or electronic documentation ( Software ).  PLEASE
     11READ THIS AGREEMENT CAREFULLY BEFORE YOU INSTALL, COPY, DOWNLOAD OR
     12USE THE SOFTWARE ACCOMPANYING THIS PACKAGE.
     13
     14Section 1 - Grant of License
     15
     16Community editions of the Software are made available on the GNU
     17General Public License, Version 2 ("GPLv2"), included in Section 4 of
     18this license document.  All sections of the Community Software License
     19Agreement must be complied with in addition to those of the GPLv2.
     20
     21
     22Section 2 - Definitions
     23
     242.1. "Community Edition" shall mean versions of the Software Program
     25distributed in source form under this license agreement, and all new
     26releases, corrections, enhancements and updates to the Software
     27Program, which TSI makes generally available under this agreement.
     28
     292.2. "Documentation" shall mean the contents of the website
     30describing the functionality and use of the Software Program, located
     31at http://wrapper.tanukisoftware.org
     32
     332.3. "Product" shall mean the computer programs, that are provided by
     34Licensee to Licensee customers or potential customers, and that
     35contain both the Software Program as a component of the Product, and a
     36component or components (other than the Software Program) that provide
     37the material functionality of the Product.  If the Product is released
     38in source form, the Software Program or any of its components may only
     39be included in executable form.
     40
     412.4. "Software Program" shall mean the computer software and license
     42file provided by TSI under this Agreement, including all new releases,
     43corrections, enhancements and updates to such computer software, which
     44TSI makes generally available and which Licensee receive pursuant to
     45Licensee subscription to TSIMS. Some specific features or platforms
     46may not be enabled if they do not fall under the feature set(s)
     47covered by the specific license fees paid.
     48
     492.5 "End User" shall mean the customers of the Licensee or any
     50recipient of the Product whether or not any payment is made to use
     51the Product.
     52
     53
     54Section 3 - Licensee Obligations
     55
     56A copy of this license must be distributed in full with the Product
     57in a location that is obvious to any End User.
     58
     59In accordance with Section 4, the full source code of all components
     60of the Product must be made available to any and all End Users.
     61
     62Licensee may extend and/or modify the Software Program and distribute
     63under the terms of this agreement provided that the copyright notice
     64and license information displayed in the console and log files are
     65not obfuscated or obstructed in any way.
     66
     67
     68Section 4 - GPLv2 License Agreement
     69
     70                        GNU GENERAL PUBLIC LICENSE
     71                           Version 2, June 1991
     72
     73         Copyright (C) 1989, 1991 Free Software Foundation, Inc.
     74       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
     75
     76    Everyone is permitted to copy and distribute verbatim copies of
     77    this license document, but changing it is not allowed.
     78
     79    Preamble
     80
     81    The licenses for most software are designed to take away your
     82    freedom to share and change it. By contrast, the GNU General
     83    Public License is intended to guarantee your freedom to share and
     84    change free software--to make sure the software is free for all
     85    its users. This General Public License applies to most of the Free
     86    Software Foundation's software and to any other program whose
     87    authors commit to using it.  (Some other Free Software Foundation
     88    software is covered by the GNU Library General Public License
     89    instead.) You can apply it to your programs, too.
     90
     91    When we speak of free software, we are referring to freedom, not
     92    price. Our General Public Licenses are designed to make sure that
     93    you have the freedom to distribute copies of free software (and
     94    charge for this service if you wish), that you receive source code
     95    or can get it if you want it, that you can change the software or
     96    use pieces of it in new free programs; and that you know you can
     97    do these things.
     98
     99    To protect your rights, we need to make restrictions that forbid
     100    anyone to deny you these rights or to ask you to surrender the
     101    rights. These restrictions translate to certain responsibilities
     102    for you if you distribute copies of the software, or if you modify
     103    it.
     104
     105    For example, if you distribute copies of such a program, whether
     106    gratis or for a fee, you must give the recipients all the rights
     107    that you have. You must make sure that they, too, receive or can
     108    get the source code. And you must show them these terms so they
     109    know their rights.
     110
     111    We protect your rights with two steps:
     112
     113    (1) copyright the software, and
     114    (2) offer you this license which gives you legal permission to
     115    copy, distribute and/or modify the software.
     116
     117    Also, for each author's protection and ours, we want to make
     118    certain that everyone understands that there is no warranty for
     119    this free software. If the software is modified by someone else
     120    and passed on, we want its recipients to know that what they have
     121    is not the original, so that any problems introduced by others
     122    will not reflect on the original authors' reputations.
     123
     124    Finally, any free program is threatened constantly by software
     125    patents. We wish to avoid the danger that redistributors of a free
     126    program will individually obtain patent licenses, in effect making
     127    the program proprietary. To prevent this, we have made it clear
     128    that any patent must be licensed for everyone's free use or not
     129    licensed at all.
     130
     131    The precise terms and conditions for copying, distribution and
     132    modification follow.
     133    GNU GENERAL PUBLIC LICENSE
     134    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
     135
     136    0. This License applies to any program or other work which
     137    contains a notice placed by the copyright holder saying it may be
     138    distributed under the terms of this General Public License. The
     139    "Program", below, refers to any such program or work, and a "work
     140    based on the Program" means either the Program or any derivative
     141    work under copyright law: that is to say, a work containing the
     142    Program or a portion of it, either verbatim or with modifications
     143    and/or translated into another language. (Hereinafter, translation
     144    is included without limitation in the term "modification".) Each
     145    licensee is addressed as "you".
     146
     147    Activities other than copying, distribution and modification are
     148    not covered by this License; they are outside its scope. The act
     149    of running the Program is not restricted, and the output from the
     150    Program is covered only if its contents constitute a work based on
     151    the Program (independent of having been made by running the
     152    Program). Whether that is true depends on what the Program does.
     153
     154    1. You may copy and distribute verbatim copies of the Program's
     155    source code as you receive it, in any medium, provided that you
     156    conspicuously and appropriately publish on each copy an
     157    appropriate copyright notice and disclaimer of warranty; keep
     158    intact all the notices that refer to this License and to the
     159    absence of any warranty; and give any other recipients of the
     160    Program a copy of this License along with the Program.
     161
     162    You may charge a fee for the physical act of transferring a copy,
     163    and you may at your option offer warranty protection in exchange
     164    for a fee.
     165
     166    2. You may modify your copy or copies of the Program or any
     167    portion of it, thus forming a work based on the Program, and copy
     168    and distribute such modifications or work under the terms of
     169    Section 1 above, provided that you also meet all of these
     170    conditions:
     171
     172    a) You must cause the modified files to carry prominent notices
     173    stating that you changed the files and the date of any change.
     174
     175    b) You must cause any work that you distribute or publish, that in
     176    whole or in part contains or is derived from the Program or any
     177    part thereof, to be licensed as a whole at no charge to all third
     178    parties under the terms of this License.
     179
     180    c) If the modified program normally reads commands interactively
     181    when run, you must cause it, when started running for such
     182    interactive use in the most ordinary way, to print or display an
     183    announcement including an appropriate copyright notice and a
     184    notice that there is no warranty (or else, saying that you provide
     185    a warranty) and that users may redistribute the program under
     186    these conditions, and telling the user how to view a copy of this
     187    License. (Exception: if the Program itself is interactive but does
     188    not normally print such an announcement, your work based on the
     189    Program is not required to print an announcement.)
     190
     191    These requirements apply to the modified work as a whole. If
     192    identifiable sections of that work are not derived from the
     193    Program, and can be reasonably considered independent and separate
     194    works in themselves, then this License, and its terms, do not
     195    apply to those sections when you distribute them as separate works.
     196    But when you distribute the same sections as part of a whole which
     197    is a work based on the Program, the distribution of the whole must
     198    be on the terms of this License, whose permissions for other
     199    licensees extend to the entire whole, and thus to each and every
     200    part regardless of who wrote it.
     201
     202    Thus, it is not the intent of this section to claim rights or
     203    contest your rights to work written entirely by you; rather, the
     204    intent is to exercise the right to control the distribution of
     205    derivative or collective works based on the Program.
     206
     207    In addition, mere aggregation of another work not based on the
     208    Program with the Program (or with a work based on the Program) on
     209    a volume of a storage or distribution medium does not bring the
     210    other work under the scope of this License.
     211
     212    3. You may copy and distribute the Program (or a work based on it,
     213    under Section 2) in object code or executable form under the terms
     214    of Sections 1 and 2 above provided that you also do one of the
     215    following:
     216
     217    a) Accompany it with the complete corresponding machine-readable
     218    source code, which must be distributed under the terms of Sections
     219    1 and 2 above on a medium customarily used for software
     220    interchange; or,
     221
     222    b) Accompany it with a written offer, valid for at least three
     223    years, to give any third party, for a charge no more than your
     224    cost of physically performing source distribution, a complete
     225    machine-readable copy of the corresponding source code, to be
     226    distributed under the terms of Sections 1 and 2 above on a medium
     227    customarily used for software interchange; or,
     228
     229    c) Accompany it with the information you received as to the offer
     230    to distribute corresponding source code. (This alternative is
     231    allowed only for noncommercial distribution and only if you
     232    received the program in object code or executable form with such
     233    an offer, in accord with Subsection b above.)
     234
     235    The source code for a work means the preferred form of the work
     236    for making modifications to it. For an executable work, complete
     237    source code means all the source code for all modules it contains,
     238    plus any associated interface definition files, plus the scripts
     239    used to control compilation and installation of the executable.
     240    However, as a special exception, the source code distributed need
     241    not include anything that is normally distributed (in either
     242    source or binary form) with the major components (compiler,
     243    kernel, and so on) of the operating system on which the executable
     244    runs, unless that component itself accompanies the executable.
     245
     246    If distribution of executable or object code is made by offering
     247    access to copy from a designated place, then offering equivalent
     248    access to copy the source code from the same place counts as
     249    distribution of the source code, even though third parties are not
     250    compelled to copy the source along with the object code.
     251
     252    4. You may not copy, modify, sublicense, or distribute the Program
     253    except as expressly provided under this License. Any attempt
     254    otherwise to copy, modify, sublicense or distribute the Program is
     255    void, and will automatically terminate your rights under this
     256    License. However, parties who have received copies, or rights,
     257    from you under this License will not have their licenses
     258    terminated so long as such parties remain in full compliance.
     259
     260    5. You are not required to accept this License, since you have not
     261    signed it. However, nothing else grants you permission to modify
     262    or distribute the Program or its derivative works. These actions
     263    are prohibited by law if you do not accept this License.
     264    Therefore, by modifying or distributing the Program (or any work
     265    based on the Program), you indicate your acceptance of this
     266    License to do so, and all its terms and conditions for copying,
     267    distributing or modifying the Program or works based on it.
     268
     269    6. Each time you redistribute the Program (or any work based on
     270    the Program), the recipient automatically receives a license from
     271    the original licensor to copy, distribute or modify the Program
     272    subject to these terms and conditions. You may not impose any
     273    further restrictions on the recipients' exercise of the rights
     274    granted herein. You are not responsible for enforcing compliance
     275    by third parties to this License.
     276
     277    7. If, as a consequence of a court judgment or allegation of
     278    patent infringement or for any other reason (not limited to
     279    patent issues), conditions are imposed on you (whether by court
     280    order, agreement or otherwise) that contradict the conditions of
     281    this License, they do not excuse you from the conditions of this
     282    License. If you cannot distribute so as to satisfy simultaneously
     283    your obligations under this License and any other pertinent
     284    obligations, then as a consequence you may not distribute the
     285    Program at all. For example, if a patent license would not permit
     286    royalty-free redistribution of the Program by all those who
     287    receive copies directly or indirectly through you, then the only
     288    way you could satisfy both it and this License would be to refrain
     289    entirely from distribution of the Program.
     290
     291    If any portion of this section is held invalid or unenforceable
     292    under any particular circumstance, the balance of the section is
     293    intended to apply and the section as a whole is intended to apply
     294    in other circumstances.
     295
     296    It is not the purpose of this section to induce you to infringe
     297    any patents or other property right claims or to contest validity
     298    of any such claims; this section has the sole purpose of
     299    protecting the integrity of the free software distribution system,
     300    which is implemented by public license practices. Many people have
     301    made generous contributions to the wide range of software
     302    distributed through that system in reliance on consistent
     303    application of that system; it is up to the author/donor to decide
     304    if he or she is willing to distribute software through any other
     305    system and a licensee cannot impose that choice.
     306
     307    This section is intended to make thoroughly clear what is believed
     308    to be a consequence of the rest of this License.
     309
     310    8. If the distribution and/or use of the Program is restricted in
     311    certain countries either by patents or by copyrighted interfaces,
     312    the original copyright holder who places the Program under this
     313    License may add an explicit geographical distribution limitation
     314    excluding those countries, so that distribution is permitted only
     315    in or among countries not thus excluded. In such case, this
     316    License incorporates the limitation as if written in the body of
     317    this License.
     318
     319    9. The Free Software Foundation may publish revised and/or new
     320    versions of the General Public License from time to time. Such new
     321    versions will be similar in spirit to the present version, but may
     322    differ in detail to address new problems or concerns.
     323
     324    Each version is given a distinguishing version number. If the
     325    Program specifies a version number of this License which applies
     326    to it and "any later version", you have the option of following
     327    the terms and conditions either of that version or of any later
     328    version published by the Free Software Foundation. If the Program
     329    does not specify a version number of this License, you may choose
     330    any version ever published by the Free Software Foundation.
     331
     332    10. If you wish to incorporate parts of the Program into other
     333    free programs whose distribution conditions are different, write
     334    to the author to ask for permission. For software which is
     335    copyrighted by the Free Software Foundation, write to the Free
     336    Software Foundation; we sometimes make exceptions for this. Our
     337    decision will be guided by the two goals of preserving the free
     338    status of all derivatives of our free software and of promoting
     339    the sharing and reuse of software generally.
     340   
     341    NO WARRANTY
     342
     343    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
     344    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
     345    LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
     346    AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
     347    OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
     348    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
     349    FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
     350    PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
     351    DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
     352    OR CORRECTION.
     353
     354    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
     355    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
     356    MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
     357    LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
     358    INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
     359    INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
     360    DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
     361    OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
     362    OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN
     363    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
     364
     365    END OF TERMS AND CONDITIONS
     366
     367
     368Section 4 - 3rd Party Components
     369
     370(1) The Software Program includes software and documentation components
     371developed in part by Silver Egg Technology, Inc.("SET") prior to 2001
     372and released under the following license.
     373
     374    Copyright (c) 2001 Silver Egg Technology
     375
     376    Permission is hereby granted, free of charge, to any person
     377    obtaining a copy of this software and associated documentation
     378    files (the "Software"), to deal in the Software without
     379    restriction, including without limitation the rights to use,
     380    copy, modify, merge, publish, distribute, sub-license, and/or
     381    sell copies of the Software, and to permit persons to whom the
     382    Software is furnished to do so, subject to the following
     383    conditions:
     384   
     385    The above copyright notice and this permission notice shall be
     386    included in all copies or substantial portions of the Software.
     387
     388    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     389    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
     390    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
     391    NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
     392    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
     393    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     394    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     395    OTHER DEALINGS IN THE SOFTWARE.
  • router/java/build.xml

    rcbaa62d r2c0e6a3  
    5454    </target>
    5555
    56     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     56    <target name="listChangedFiles" if="mtn.available" >
    5757        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    5858            <arg value="list" />
     
    6666            <arg value="," />
    6767        </exec>
     68    </target>
     69
     70    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     71        <!-- set if unset -->
     72        <property name="workspace.changes.tr" value="" />
    6873        <jar destfile="./build/router.jar" basedir="./build/obj" includes="**/*.class" >
    6974            <manifest>
  • router/java/src/net/i2p/router/RouterVersion.java

    rcbaa62d r2c0e6a3  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 18;
     21    public final static long BUILD = 21;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.