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