jedit: update from 5.1.0 to 5.2.0

+30 -25
+26 -21
pkgs/applications/editors/jedit/build.xml.patch
··· 1 - --- a/build.xml 2013-07-28 18:03:55.000000000 +0100 2 - +++ b/build.xml 2014-11-12 21:54:48.443482074 +0000 3 - @@ -42,16 +42,6 @@ 1 + --- a/build.xml 2015-02-04 08:47:37.000000000 +0100 2 + +++ b/build.xml 2015-02-17 14:06:42.455283148 +0100 3 + @@ -43,16 +43,6 @@ 4 4 <property name="textAreaPackage" 5 5 location="../textarea"/> 6 6 ··· 17 17 <!-- Miscellaneous --> 18 18 <property name="jar.filename" 19 19 value="${ant.project.name}.jar"/> 20 - @@ -89,51 +79,8 @@ 20 + @@ -90,51 +80,8 @@ 21 21 value="true"/> 22 22 </target> 23 23 ··· 39 39 - 40 40 - <target name="init-ivy" 41 41 - depends="init,download-ivy" 42 - - unless="${ivy.done}"> 42 + - unless="ivy.done"> 43 43 - <property name="ivy.retrieve.pattern" 44 44 - value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/> 45 45 - <taskdef resource="org/apache/ivy/ant/antlib.xml" ··· 52 52 - <target name="retrieve" 53 53 - description="retrieve the dependencies" 54 54 - depends="init,init-ivy" 55 - - unless="${ivy.done}"> 55 + - unless="ivy.done"> 56 56 - <ivy:retrieve sync="true"/> 57 57 - <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" 58 58 - organisation="org.apache.ivy" ··· 70 70 <taskdef resource="net/sf/antcontrib/antlib.xml" 71 71 uri="antlib:net.sf.antcontrib"> 72 72 <classpath> 73 - @@ -238,37 +185,6 @@ 73 + @@ -239,37 +186,6 @@ 74 74 </javac> 75 75 </target> 76 76 ··· 108 108 <target name="prepare-textArea" 109 109 depends="init"> 110 110 <delete includeemptydirs="true" 111 - @@ -425,32 +341,8 @@ 111 + @@ -423,33 +339,8 @@ 112 112 </javac> 113 113 </target> 114 114 115 115 - <target name="test" 116 116 - depends="init,retrieve,compile,compile-test" 117 - - description="run unit tests"> 117 + - description="run unit tests" 118 + - unless="skip.tests"> 118 119 - <delete dir="${build.dir}/test/raw-reports"/> 119 120 - <mkdir dir="${build.dir}/test/raw-reports"/> 120 121 - <junit printsummary="true" ··· 142 143 description="build the jEdit JAR-file with full debug-information"> 143 144 <mkdir dir="${jar.location}"/> 144 145 <jar destfile="${jar.location}/${jar.filename}" 145 - @@ -508,7 +400,7 @@ 146 + @@ -504,11 +395,10 @@ 147 + </copy> 148 + </contrib:then> 149 + </contrib:if> 150 + - <antcall target="test" /> 146 151 </target> 147 152 148 153 <target name="build-exe-launcher" ··· 151 156 description="build the EXE launcher"> 152 157 <contrib:if> 153 158 <os family="windows"/> 154 - @@ -611,7 +503,7 @@ 159 + @@ -622,7 +512,7 @@ 155 160 </target> 156 161 157 162 <target name="unpack-docbook-xsl" ··· 160 165 <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip" 161 166 dest="${build.dir}/docbook-xsl/"/> 162 167 </target> 163 - @@ -655,7 +547,7 @@ 168 + @@ -668,7 +558,7 @@ 164 169 </presetdef> 165 170 166 171 <target name="generate-doc-faq" ··· 169 174 <dependset.html> 170 175 <srcfileset dir="doc/FAQ"/> 171 176 <targetfileset dir="${jar.location}/doc/FAQ"/> 172 - @@ -679,7 +571,7 @@ 177 + @@ -692,7 +582,7 @@ 173 178 </target> 174 179 175 180 <target name="generate-doc-news" ··· 178 183 <dependset.html> 179 184 <srcfileset dir="doc/whatsnew"/> 180 185 <targetfileset dir="${jar.location}/doc/whatsnew"/> 181 - @@ -703,7 +595,7 @@ 186 + @@ -716,7 +606,7 @@ 182 187 </target> 183 188 184 189 <target name="generate-doc-users-guide" ··· 187 192 <dependset.html> 188 193 <srcfileset dir="doc/users-guide"/> 189 194 <targetfileset dir="${jar.location}/doc/users-guide"/> 190 - @@ -838,7 +730,7 @@ 195 + @@ -851,7 +741,7 @@ 191 196 </target> 192 197 193 198 <target name="generate-pdf-users-guide" ··· 196 201 <fail message="Please set the property &quot;paper.type&quot;" 197 202 unless="paper.type"/> 198 203 <contrib:switch value="${paper.type}"> 199 - @@ -1143,7 +1035,7 @@ 204 + @@ -1154,7 +1044,7 @@ 200 205 </target> 201 206 202 207 <target name="compile-jarbundler" ··· 205 210 <mkdir dir="${classes.dir}/jarbundler"/> 206 211 <depend srcDir="${basedir}" 207 212 destDir="${classes.dir}/jarbundler" 208 - @@ -1173,7 +1065,7 @@ 213 + @@ -1180,7 +1070,7 @@ 209 214 </target> 210 215 211 216 <target name="dist-mac-finish" ··· 214 219 description="finish building the Mac OS X disk image (DMG-file) on Mac OS X"> 215 220 <fail message="The disk image (DMG-file) for easy distribution on Mac OS X can only be built on Mac OS X currently"> 216 221 <condition> 217 - @@ -1271,7 +1163,7 @@ 222 + @@ -1295,7 +1185,7 @@ 218 223 </target> 219 224 220 225 <target name="dist-mac" ··· 223 228 description="build the Mac OS X disk image (DMG-file)"> 224 229 <antcall target="compile-jarbundler"> 225 230 <param name="config.build.debuglevel" 226 - @@ -1386,7 +1278,7 @@ 231 + @@ -1411,7 +1301,7 @@ 227 232 </target> 228 233 229 234 <target name="prepare-dist-files" ··· 232 237 <antcall target="build"> 233 238 <param name="config.build.debuglevel" 234 239 value="lines,source"/> 235 - @@ -1567,7 +1459,7 @@ 240 + @@ -1592,7 +1482,7 @@ 236 241 </target> 237 242 238 243 <target name="dist-deb" ··· 241 246 description="build the DEB Package"> 242 247 <antcall target="compile-ar"> 243 248 <param name="config.build.debuglevel" 244 - @@ -1813,7 +1705,7 @@ 249 + @@ -1838,7 +1728,7 @@ 245 250 </target> 246 251 247 252 <target name="dist-sign-deb-Release"
+4 -4
pkgs/applications/editors/jedit/default.nix
··· 1 - {stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging}: 1 + { stdenv, fetchurl, ant, jdk, commonsBsf, commonsLogging }: 2 2 3 3 let 4 - version = "5.1.0"; 4 + version = "5.2.0"; 5 5 bsh = fetchurl { 6 6 url = http://www.beanshell.org/bsh-2.0b4.jar; 7 7 sha256 = "1di7hj2yms1m3wa8k70jpw0wzfnrgibpqnvdk33ahfaqi03mqfci"; ··· 20 20 name = "jedit-${version}"; 21 21 src = fetchurl { 22 22 url = "mirror://sourceforge/jedit/jedit${version}source.tar.bz2"; 23 - sha256 = "015rn4339mp4wrd901x56nr42wfcy429pg54n835c6n34b2jjdc6"; 23 + sha256 = "03wmbh90rl5lsc35d7jwcp9j5qyyzq1nccxf4fal8bmnx8n4si0x"; 24 24 }; 25 25 26 26 buildInputs = [ ant jdk commonsBsf commonsLogging ]; ··· 63 63 description = "Mature programmer's text editor (Java based)"; 64 64 homepage = http://www.jedit.org; 65 65 license = licenses.gpl2; 66 - platforms = platforms.linux; 66 + platforms = platforms.unix; 67 67 maintainers = [ maintainers.vbgl ]; 68 68 }; 69 69 }