Permalink
Browse files

Migrate onto the new java core.

  • Loading branch information...
1 parent 7b0d2a2 commit cbe016b2833612f141542339bbe617efdb8fbeaf @xuhdev xuhdev committed May 17, 2014
Showing with 12 additions and 12 deletions.
  1. +3 −3 .gitmodules
  2. +7 −5 build.xml
  3. +1 −0 editorconfig-core-java
  4. +0 −1 editorconfig-core-java-binding
  5. +1 −3 src/org/editorconfig/jedit/EditorConfigPlugin.java
View
@@ -1,3 +1,3 @@
-[submodule "editorconfig-core-java-binding"]
- path = editorconfig-core-java-binding
- url = git://github.com/editorconfig/editorconfig-core-java-binding.git
+[submodule "editorconfig-core-java"]
+ path = editorconfig-core-java
+ url = https://github.com/editorconfig/editorconfig-core-java.git
View
@@ -35,14 +35,14 @@ POSSIBILITY OF SUCH DAMAGE.
<property name="dist.target" value="all" />
<property name="build.support" value="./build-support" />
<property name="jedit.plugins.dir" value="${install.dir}" />
- <property name="editorconfig.java.dir" value="./editorconfig-core-java-binding" />
+ <property name="editorconfig.java.dir" value="./editorconfig-core-java" />
<import file="${build.support}/plugin-build.xml" />
<target name="test-submodule" >
- <!-- Check the EditorConfig Core Java Binding files. If they do not exist,
+ <!-- Check the EditorConfig Java Core files. If they do not exist,
remind user to checkout the submodule. -->
- <fail message="It seems that EditorConfig Core Java Binding submodule is not available. Please run 'git submodule update --init --recursive' to checkout the submodule.">
+ <fail message="It seems that EditorConfig Java Core submodule is not available. Please run 'git submodule update --init --recursive' to checkout the submodule.">
<condition>
<not>
<available file="${editorconfig.java.dir}" type="dir" />
@@ -60,7 +60,9 @@ POSSIBILITY OF SUCH DAMAGE.
<!-- build the EditorConfig core -->
<target name="build-editorconfig-core" depends="test-submodule" >
<ant dir="${editorconfig.java.dir}" inheritall="false" />
- <copy file="${editorconfig.java.dir}/build/editorconfig.jar"
+ <move file="${editorconfig.java.dir}/lib/editorconfig-core-java.jar"
+ tofile="${editorconfig.java.dir}/lib/editorconfig.jar" />
+ <copy file="${editorconfig.java.dir}/lib/editorconfig.jar"
todir="${install.dir}" force="true" />
</target>
@@ -69,7 +71,7 @@ POSSIBILITY OF SUCH DAMAGE.
</selector>
<path id="project.class.path">
- <pathelement location="${basedir}/${editorconfig.java.dir}/build/editorconfig.jar" />
+ <pathelement location="${basedir}/${editorconfig.java.dir}/lib/editorconfig.jar" />
</path>
<target name="all" depends="build-editorconfig-core,build" />
Submodule editorconfig-core-java-binding deleted from 761c2b
@@ -91,9 +91,7 @@ public void loadEditorConfig(Buffer buf)
// editorconfig.jar cannot locate itself, thus if we don't point them
// out explicitly, python modules may not be found.
if (ec == null)
- ec = new EditorConfig(Arrays.asList(
- this.getPluginJAR().getRequiredJars().toArray(
- new String[1])));
+ ec = new EditorConfig();
// EditorConfig confs
EditorConfigConf ecConf = new EditorConfigConf();

0 comments on commit cbe016b

Please sign in to comment.