Skip to content

Commit

Permalink
[ci skip] Merge PR 24062
Browse files Browse the repository at this point in the history
Merge PR bioconda#24062, commits were: 
 * Fix my own mistake
 * Update meta.yaml
 * Bump java versiona and add javafx lib

Tested locally. MALT's bundled JRE actually includes Java 14?
```
openjdk 14.0.2 2020-07-14
OpenJDK Runtime Environment AdoptOpenJDK (build 14.0.2+12)
OpenJDK 64-Bit Server VM AdoptOpenJDK (build 14.0.2+12, mixed mode)
```
 * Merge pull request bioconda#3 from bioconda/master

syncing
 * Update meta.yaml
 * Update build.sh
 * Update SHA
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #2 from bioconda/master

Get latest bioconda version
 * Update meta.yaml
 * Update damageprofiler.py
 * Merge pull request #1 from bioconda/master

Syncing to get latest base changes
  • Loading branch information
jfy133 authored Sep 4, 2020
1 parent 4caf0fb commit e0afc39
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions recipes/malt/build.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

# call installer
chmod u+x MALT_unix_0_4_1.sh
chmod u+x MALT_unix_0_5_0.sh
MALT="$PREFIX/opt/$PKG_NAME-$PKG_VERSION"
./MALT_unix_0_4_1.sh -q -dir "$MALT"
./MALT_unix_0_5_0.sh -q -dir "$MALT"

ln -s "$MALT"/malt-build "$PREFIX"/bin/malt-build
ln -s "$MALT"/malt-run "$PREFIX"/bin/malt-run
13 changes: 7 additions & 6 deletions recipes/malt/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package:
name: malt
version: 0.41
version: 0.5.0
build:
noarch: generic
number: 1
number: 0
source:
md5: 1e7b3d126e3f761e7d09ddf0029a3dff
url: https://software-ab.informatik.uni-tuebingen.de/download/malt/MALT_unix_0_4_1.sh
md5: f9e72f05e12dba0175631856e56e014a
url: https://software-ab.informatik.uni-tuebingen.de/download/malt/MALT_unix_0_5_0.sh
requirements:
build:
- openjdk 8.0.144 zulu8.23.0.3_2
- openjdk >=11
- javafx-sdk >=11
run:
- openjdk >=8.0.144, <9
- openjdk >=11
test:
commands:
- malt-run -h
Expand Down

0 comments on commit e0afc39

Please sign in to comment.