def buildingMD = "$jalviewDir/$docDir/building.md"
def css = "$jalviewDir/$docDir/github.css"
- def pandoc = pandoc_exec
+ def pandoc = null
+ pandoc_exec.split(",").each {
+ if (file(it.trim()).exists()) {
+ pandoc = it.trim()
+ return true
+ }
+ }
+
def hostname = "hostname".execute().text.trim()
- if (! file(pandoc).exists() && hostname.equals("jv-bamboo")) {
+ if ((pandoc == null || ! file(pandoc).exists()) && hostname.equals("jv-bamboo")) {
pandoc = System.getProperty("user.home")+"/buildtools/pandoc/bin/pandoc"
}
- if (file(pandoc).exists()) {
+ if (pandoc != null && file(pandoc).exists()) {
commandLine pandoc, '-s', '-o', buildingHTML, '--metadata', 'pagetitle="Building Jalview from Source"', '--toc', '-H', css, buildingMD
} else {
commandLine "true"
eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
-pandoc_exec = /usr/local/bin/pandoc
+pandoc_exec = /usr/local/bin/pandoc,/usr/bin/pandoc
dev = false
if (specversion >= modern)
{
- wrapper = new ShortcutKeyMaskExWrapper11();
+ wrapper = new jalview.util.ShortcutKeyMaskExWrapper11();
+ SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.SHIFT_DOWN_MASK;
+ ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper11.ALT_DOWN_MASK;
}
else
{
- wrapper = new ShortcutKeyMaskExWrapper8();
+ wrapper = new jalview.util.ShortcutKeyMaskExWrapper8();
+ SHIFT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.SHIFT_DOWN_MASK;
+ ALT_DOWN_MASK = jalview.util.ShortcutKeyMaskExWrapper8.ALT_DOWN_MASK;
}
- SHIFT_DOWN_MASK = wrapper.SHIFT_DOWN_MASK;
- ALT_DOWN_MASK = wrapper.ALT_DOWN_MASK;
}
public static int getMenuShortcutKeyMaskEx()
public class ShortcutKeyMaskExWrapper11 implements ShortcutKeyMaskExWrapperI
{
- public final static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
- public final static int ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
+ public final static int SHIFT_DOWN_MASK;
+
+ public final static int ALT_DOWN_MASK;
+
+ static
+ {
+ SHIFT_DOWN_MASK = KeyEvent.SHIFT_DOWN_MASK;
+ ALT_DOWN_MASK = KeyEvent.ALT_DOWN_MASK;
+ }
@Override
public int getMenuShortcutKeyMaskEx()
return e.getModifiersEx();
}
+
}
public class ShortcutKeyMaskExWrapper8 implements ShortcutKeyMaskExWrapperI
{
- public final static int SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK;
- public final static int ALT_DOWN_MASK = KeyEvent.ALT_MASK;
+ public final static int SHIFT_DOWN_MASK;
+
+ public final static int ALT_DOWN_MASK;
+
+ static
+ {
+ SHIFT_DOWN_MASK = KeyEvent.SHIFT_MASK;
+ ALT_DOWN_MASK = KeyEvent.ALT_MASK;
+ }
@Override
public int getMenuShortcutKeyMaskEx()