Changeset 5004626


Ignore:
Timestamp:
Jan 22, 2016 8:11:58 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
c4ea50f
Parents:
48d3294
Message:

Add top-level imagegen to build, javadoc, and licenses
Fix zxing build from top

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r48d3294 r5004626  
    187187   See licenses/LICENSE-GPLv2.txt
    188188
     189   Imagegen:
     190     Identicon:
     191       Copyright (c) 2007-2014 Don Park <donpark@docuverse.com>
     192       See licenses/LICENSE-Identicon.txt
     193     RandomArt:
     194       Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
     195       Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
     196       See licenses/LICENSE-BSD.txt
     197     Zxing:
     198       See licenses/LICENSE-Apache2.0.txt
     199
    189200   Jetty 8.1.17.v20150415:
    190201   See licenses/ABOUT-Jetty.html
  • apps/imagegen/zxing/build.xml

    r48d3294 r5004626  
    1818
    1919    <!-- only used if not set by a higher build.xml -->
    20     <property name="javac.compilerargs" value="" />
     20    <property name="javac.compilerargs7" value="" />
    2121
    2222    <target name="compile" depends="depend">
     
    2626               includeAntRuntime="false"
    2727               destdir="./build/obj" >
    28             <compilerarg line="${javac.compilerargs}" />
     28            <compilerarg line="${javac.compilerargs7}" />
    2929        </javac>
    3030        <javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="1.7" target="1.7"
    3131               includeAntRuntime="false"
    3232               destdir="./build/obj" classpath="./build/obj" >
    33             <compilerarg line="${javac.compilerargs}" />
     33            <compilerarg line="${javac.compilerargs7}" />
    3434        </javac>
    3535    </target>
     
    4444            destdir="./buildTest/obj"
    4545            classpath="./build/zxing.jar" >
    46             <compilerarg line="${javac.compilerargs}" />
     46            <compilerarg line="${javac.compilerargs7}" />
    4747        </javac>
    4848    </target>
  • build.xml

    r48d3294 r5004626  
    285285    </target>
    286286
    287     <target name="buildSusiDNS" depends="buildCore, buildJetty" >
     287    <target name="buildSusiDNS" depends="buildCore, buildJetty, buildImagegen" >
    288288        <ant dir="apps/susidns/src" target="all" />
    289289        <copy file="apps/susidns/src/susidns.war" todir="build/" />
     290    </target>
     291
     292    <target name="buildImagegen" depends="buildCore, buildJetty" >
     293        <ant dir="apps/imagegen" target="all" />
     294        <copy file="apps/imagegen/imagegen/build/imagegen.war" todir="build/" />
    290295    </target>
    291296
     
    703708            <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" />
    704709            <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
     710            <group title="Imagegen Application" packages="com.docuverse.identicon:com.google.zxing:com.google.zxing.*:net.i2p.imagegen" />
    705711            <group title="Installer Utilities" packages="net.i2p.installer" />
    706712            <group title="Jetty Utilities" packages="net.i2p.jetty:net.i2p.servlet:net.i2p.servlet.*:org.mortbay.servlet:org.mortbay.util" />
     
    728734                <pathelement location="apps/susimail/src/src" />
    729735                <pathelement location="apps/jetty/java/src" />
     736                <pathelement location="apps/imagegen/imagegen/webapp/src/main/java" />
     737                <pathelement location="apps/imagegen/identicon/core/src/main/java" />
     738                <pathelement location="apps/imagegen/zxing/core/src/main/java" />
     739                <pathelement location="apps/imagegen/zxing/javase/src/main/java" />
    730740                <pathelement location="installer/java/src" />
    731741            </sourcepath>
     
    11511161        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    11521162        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     1163        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    11531164        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    11541165        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     
    12021213        <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
    12031214        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
     1215        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    12041216    </target>
    12051217
     
    14041416        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    14051417        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
     1418        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    14061419        <!-- as of 0.7.12; someday, we can remove these from the updater -->
    14071420        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
     
    17781791            <arg value="build/i2ptunnel.jar"/>
    17791792            <arg value="build/i2ptunnel.war"/>
     1793            <arg value="build/imagegen.war"/>
    17801794            <arg value="build/jetty-i2p.jar"/>
    17811795            <arg value="build/mstreaming.jar"/>
Note: See TracChangeset for help on using the changeset viewer.