Changeset 2e15488
- Timestamp:
- Apr 29, 2016 6:40:02 PM (5 years ago)
- Branches:
- master
- Children:
- c3f5c04
- Parents:
- f2239ba
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
build.properties
rf2239ba r2e15488 132 132 # Don't compile GettextResource.java, we will use libintl.jar from the gettext-base package 133 133 #with-gettext-base=true 134 # Don't compile gnu/getopt classes, we will use libgetopt-java package 135 #with-libgetopt-java=true -
build.xml
rf2239ba r2e15488 2029 2029 <!-- gettext-base --> 2030 2030 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" /> 2031 <!-- libgetopt-java --> 2032 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/geopt" /> 2031 2033 <!-- systray4j --> 2032 2034 <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" /> … … 2098 2100 <fileset dir="../i2p-${Extended.Version}/_MTN" /> 2099 2101 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" /> 2102 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/geopt" /> 2100 2103 <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" /> 2101 2104 <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" /> -
core/java/build.xml
rf2239ba r2e15488 23 23 24 24 <!-- fixups if we're using libintl.jar for GettextResource.java --> 25 <condition property="source.exclude " value="src/gnu/gettext/GettextResource.java" else="" >25 <condition property="source.exclude1" value="gnu/gettext/GettextResource.java" else="NOTHING" > 26 26 <istrue value="${with-gettext-base}" /> 27 27 </condition> 28 <condition property="javac.classpath.mod " value="/usr/share/java/libintl.jar ${javac.classpath}" else="${javac.classpath}" >28 <condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" > 29 29 <istrue value="${with-gettext-base}" /> 30 30 </condition> 31 <!-- fixups if we're using gnu-getopt.jar for gnu/getopt/* --> 32 <condition property="source.exclude2" value="gnu/getopt/**" else="NOTHING" > 33 <istrue value="${with-libgetopt-java}" /> 34 </condition> 35 <condition property="javac.classpath.mod2" value="/usr/share/java/gnu-getopt.jar:" else="" > 36 <istrue value="${with-libgetopt-java}" /> 37 </condition> 38 <condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" > 39 <istrue value="${with-libgetopt-java}" /> 40 </condition> 41 <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath}" /> 31 42 32 43 <target name="compile" depends="depend"> 33 44 <mkdir dir="./build" /> 34 45 <mkdir dir="./build/obj" /> 35 <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on" 46 <!-- sourcepath="" necessary for excludes to work, see ant manual for javac --> 47 <javac sourcepath="" srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on" 36 48 debuglevel="lines,vars,source" 37 49 includeAntRuntime="false" 38 excludes="${source.exclude}"39 50 destdir="./build/obj" classpath="${javac.classpath.mod}" > 40 51 <compilerarg line="${javac.compilerargs}" /> 52 <include name="**/*.java" /> 53 <exclude name="${source.exclude1}" /> 54 <exclude name="${source.exclude2}" /> 41 55 </javac> 42 56 </target> … … 62 76 <fileset dir="./build/obj" includes="**/*.class" /> 63 77 <!-- the getopt translation files --> 64 <fileset dir="src" includes=" gnu/getopt/*.properties" />78 <fileset dir="src" includes="${translation.includes}" /> 65 79 <manifest> 66 80 <attribute name="Implementation-Version" value="${full.version}" /> -
debian/control
rf2239ba r2e15488 15 15 ,dh-apparmor 16 16 ,gettext 17 ,libgetopt-java 17 18 ,libgmp-dev (>= 2:5.0.5) 18 19 ,libservice-wrapper-java … … 77 78 geoip-database, 78 79 gettext-base, 80 libgetopt-java, 79 81 libjetty8-java, libservlet3.0-java, 80 82 glassfish-javaee -
debian/i2p-router.links
rf2239ba r2e15488 85 85 # ubuntu and debian: everywhere 86 86 usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar 87 88 89 # comment out if not building with libgetopt-java 90 # ubuntu and debian: everywhere 91 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar -
debian/rules
rf2239ba r2e15488 143 143 @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties 144 144 145 @# debian and ubuntu: everywhere 146 @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties 147 145 148 TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc 146 149 echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset
for help on using the changeset viewer.