Skip to content

Commit 1241ede

Browse files
committed
Get the Duby Plugin for NetBeans building again.
* Updated dependencies to more recent versions, since old ones are too old now * Removed nbproject/private stuff, since it gets generated and references machine-specific locations * Removed some unused and uncompilable code in DubyParser * Added JUnit as a dependency
1 parent 44938b9 commit 1241ede

File tree

6 files changed

+17
-24
lines changed

6 files changed

+17
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ build
22
dist
33
pkg
44
nbproject/private
5+
Duby Plugin/nbproject/private
56
examples/appengine/war/
67
*.class
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=549b805f
1+
build.xml.data.CRC32=b32b0a6b
22
build.xml.script.CRC32=c6ff82a7
3-
build.xml.stylesheet.CRC32=79c3b980@1.28.2.7
3+
build.xml.stylesheet.CRC32=79c3b980@1.31.1.7
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=549b805f
6+
nbproject/build-impl.xml.data.CRC32=b32b0a6b
77
nbproject/build-impl.xml.script.CRC32=2b293a18
8-
nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.28.2.7
8+
nbproject/build-impl.xml.stylesheet.CRC32=261c4bef@1.31.1.7

Duby Plugin/Duby Editor/nbproject/project.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,21 @@
2323
<implementation-version/>
2424
</run-dependency>
2525
</dependency>
26+
<dependency>
27+
<code-name-base>org.netbeans.libs.junit4</code-name-base>
28+
<build-prerequisite/>
29+
<compile-dependency/>
30+
<run-dependency>
31+
<specification-version>1.7.1</specification-version>
32+
</run-dependency>
33+
</dependency>
2634
<dependency>
2735
<code-name-base>org.netbeans.modules.csl.api</code-name-base>
2836
<build-prerequisite/>
2937
<compile-dependency/>
3038
<run-dependency>
3139
<release-version>1</release-version>
32-
<specification-version>1.9.2.1.1.1.1</specification-version>
40+
<specification-version>1.14.1.1.1.1.2</specification-version>
3341
</run-dependency>
3442
</dependency>
3543
<dependency>
@@ -38,15 +46,16 @@
3846
<compile-dependency/>
3947
<run-dependency>
4048
<release-version>2</release-version>
41-
<specification-version>1.30.2.1</specification-version>
49+
<specification-version>1.33.1.1</specification-version>
4250
</run-dependency>
4351
</dependency>
4452
<dependency>
4553
<code-name-base>org.netbeans.modules.parsing.api</code-name-base>
4654
<build-prerequisite/>
4755
<compile-dependency/>
4856
<run-dependency>
49-
<specification-version>1.16.2.1</specification-version>
57+
<release-version>1</release-version>
58+
<specification-version>1.26.1.2</specification-version>
5059
</run-dependency>
5160
</dependency>
5261
<dependency>

Duby Plugin/Duby Editor/src/org/jruby/duby/editor/DubyParser.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,6 @@ private ParseResult parse(String text) {
5858
}
5959
}
6060

61-
private Node parseRuby(Snapshot snapshot) {
62-
String source = snapshot.getText().toString();
63-
String fileName = "";
64-
Ruby18Parser rubyParser = new Ruby18Parser();
65-
66-
final FileObject fo = snapshot.getSource().getFileObject();
67-
if (fo != null) {
68-
fileName = fo.getNameExt();
69-
}
70-
71-
ParserConfiguration configuration = new ParserConfiguration(0, CompatVersion.RUBY1_8, true);
72-
LexerSource lexerSource =
73-
LexerSource.getSource(fileName, new StringReader(source), configuration);
74-
return rubyParser.parse(configuration, lexerSource).getAST();
75-
}
76-
7761
@Override
7862
public void parse(Snapshot snapshot, Task arg1, SourceModificationEvent arg2) throws ParseException {
7963
try {

Duby Plugin/nbproject/private/platform-private.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

Duby Plugin/nbproject/private/private.properties

Whitespace-only changes.

0 commit comments

Comments
 (0)