-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #384 from TiVo/v15build
Version 14.1.5 fixes, on the way to v15.
- Loading branch information
Showing
8 changed files
with
258 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # | ||
| # Copyright 2000-2013 JetBrains s.r.o. | ||
| # Copyright 2014-2016 AS3Boyan | ||
| # Copyright 2014-2014 Elias Ku | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| # | ||
| # Properties for building against IDEA version 14. | ||
| # | ||
|
|
||
| # Target version of IDEA that we typically build for. | ||
| # This is appended to the name of the intellij-haxe-XXX jar file. | ||
| idea.version=14.1.5 | ||
|
|
||
| # Human-readable versions of IDEA that this build is compatible with. | ||
| plugin.compatibility.description=IDEA 14.1.5 and 14.1.6 | ||
|
|
||
| # ################################################### | ||
| # IDEA build IDs that are compatible with this plugin. | ||
| # ################################################### | ||
| # | ||
| # IDEA builds prior to this one will not install this plugin. | ||
| # | ||
| plugin.installable.since=141.2735 | ||
| # | ||
| # IDEA builds after this one will not install this plugin. | ||
| # | ||
| plugin.installable.until=141.9999 | ||
|
|
||
| # ################################################### | ||
| # Where to find Idea14-specific code. | ||
| # ################################################### | ||
| version.specific.code.location=src/14.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # | ||
| # Properties for building against IDEA version 15. | ||
| # | ||
|
|
||
| # Target version of IDEA that we typically build for. | ||
| # This is appended to the name of the intellij-haxe-XXX jar file. | ||
| idea.version=14.1 | ||
|
|
||
| # Human-readable versions of IDEA that this build is compatible with. | ||
| plugin.compatibility.description=IDEA 15 | ||
|
|
||
| # ################################################### | ||
| # IDEA build IDs that are compatible with this plugin. | ||
| # ################################################### | ||
| # | ||
| # IDEA builds prior to this one will not install this plugin. | ||
| # | ||
| plugin.installable.since=143.0 | ||
| # | ||
| # IDEA builds after this one will not install this plugin. | ||
| # | ||
| plugin.installable.until= | ||
|
|
||
| # ################################################### | ||
| # Where to find Idea14-specific code. | ||
| # ################################################### | ||
| # Use the 14.1 source tree, for the moment. | ||
| version.specific.code.location=src/14.1 |
64 changes: 64 additions & 0 deletions
64
src/common/com/intellij/plugins/haxe/build/ApiInvoker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| * Copyright 2000-2013 JetBrains s.r.o. | ||
| * Copyright 2014-2016 AS3Boyan | ||
| * Copyright 2014-2014 Elias Ku | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.intellij.plugins.haxe.build; | ||
|
|
||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * Created by ebishton on 1/16/16. | ||
| */ | ||
| public class ApiInvoker<R> { | ||
|
|
||
| private Object myInstance; | ||
| private Method myMethodToInvoke; | ||
| private String myDebugName; | ||
|
|
||
| public ApiInvoker(Object o, String methodName, Class<?>... argTypes) { | ||
| Class klass; | ||
| myDebugName = ""; | ||
| try { | ||
| if (o instanceof Class) { | ||
| // We're looking for a static method. | ||
| myInstance = null; | ||
| klass = (Class) o; | ||
| } else { | ||
| // We have an instance method. | ||
| myInstance = o; | ||
| klass = o.getClass(); | ||
| } | ||
| myDebugName = (null == klass ? "<unknown>" : klass.getName()) | ||
| + "." + methodName; | ||
| // Don't stop of null klass... Just let the exception be thrown | ||
| // naturally. | ||
| myMethodToInvoke = klass.getDeclaredMethod(methodName, argTypes); | ||
| } catch (NoSuchMethodException e) { | ||
| throw new UnsupportedApiException("Didn't find " + myDebugName + ";", e); | ||
| } | ||
| } | ||
|
|
||
| public R invoke(Object... args) { | ||
| try { | ||
| return (R) myMethodToInvoke.invoke(myInstance, args); | ||
| } catch (IllegalAccessException e) { | ||
| throw new UnsupportedApiException("Error invoking " + myDebugName + ";", e); | ||
| } catch (InvocationTargetException e) { | ||
| throw new UnsupportedApiException("Error invoking " + myDebugName + ";", e.getCause()); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/common/com/intellij/plugins/haxe/build/UnsupportedApiException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.intellij.plugins.haxe.build; | ||
|
|
||
| /** | ||
| * Created by ebishton on 1/17/16. | ||
| */ | ||
| class UnsupportedApiException extends UnsupportedOperationException { | ||
| public UnsupportedApiException() { | ||
| super(); | ||
| } | ||
|
|
||
| public UnsupportedApiException(String reason) { | ||
| super(reason); | ||
| } | ||
|
|
||
| public UnsupportedApiException(String reason, Throwable cause) { | ||
| super(reason + ":" + cause.getMessage(), cause); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters