Skip to content
Snippets Groups Projects
Commit e8461341 authored by “kpepper”'s avatar “kpepper”
Browse files

Build process updates, mostly for Mac

parent aa30c423
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 695 additions and 588 deletions
.classpath
+ 5
− 1
View file @ e8461341
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
...@@ -20,13 +21,15 @@ ...@@ -20,13 +21,15 @@
</classpathentry> </classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="src/assembly"/> <classpathentry kind="src" path="src/assembly"/>
<classpathentry kind="src" path="src/site"/> <classpathentry kind="src" path="src/site"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
...@@ -37,6 +40,7 @@ ...@@ -37,6 +40,7 @@
</classpathentry> </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/evosuite"> <classpathentry kind="src" output="target/test-classes" path="src/test/evosuite">
<attributes> <attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/> <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
......
.gitignore
+ 1
− 0
View file @ e8461341
...@@ -7,3 +7,4 @@ test/coverage-report ...@@ -7,3 +7,4 @@ test/coverage-report
dependency-reduced-pom.xml dependency-reduced-pom.xml
maven.properties maven.properties
.evosuite .evosuite
maven-archiver
README.md
+ 102
− 3
View file @ e8461341
...@@ -32,8 +32,16 @@ Artemis is a free genome browser and annotation tool that allows visualisation o ...@@ -32,8 +32,16 @@ Artemis is a free genome browser and annotation tool that allows visualisation o
ACT is a free tool for displaying pairwise comparisons between two or more DNA sequences. It can be used to identify and analyse regions of similarity and difference between genomes and to explore conservation of synteny, in the context of the entire sequences and their annotation. ACT is a free tool for displaying pairwise comparisons between two or more DNA sequences. It can be used to identify and analyse regions of similarity and difference between genomes and to explore conservation of synteny, in the context of the entire sequences and their annotation.
DNAPlotter generates images of circular and linear DNA maps.
BamView is a standalone BAM/CRAM file viewer.
For further information, please see the [Artemis GitHub page](http://sanger-pathogens.github.io/Artemis/) For further information, please see the [Artemis GitHub page](http://sanger-pathogens.github.io/Artemis/)
## Prerequisites
Java 9+ must be installed. Ideally Java 11.
## Installation ## Installation
Please refer to the relevant documentation in the Documentation section below. Please refer to the relevant documentation in the Documentation section below.
...@@ -45,12 +53,103 @@ Please refer to the relevant documentation in the Documentation section below. ...@@ -45,12 +53,103 @@ Please refer to the relevant documentation in the Documentation section below.
## Building ## Building
If you would prefer to build the applications from scratch rather than use the pre-built releases in GitHub, then you will firstly need the source code from GitHub. This can be obtained by cloning the repository: If you would prefer to build the applications from scratch rather than use the pre-built releases in GitHub, then you will firstly need the source code from GitHub. This can be obtained by cloning the repository:
```
git clone https://github.com/sanger-pathogens/Artemis.git
```
or by downloading the source zip file for a particular release. The latest version of Apache Maven (Java 11 compatible, e.g. v3.6.0) will need to be installed beforehand, in order to build. The application jars can be built by issuing the following commands in the top-level folder:
When building for the first time:
```
mvn validate
```
This is required to install some legacy libraries to the Maven repository and will be phased out in future releases.
And then to build/rebuild the applications :
```
mvn clean package
```
Clean is only required if you wish to do a complete rebuild.
If you do not wish to run tests then add the <i>-Dskip.tests=true</i> flag to the above command.
Note that if you are running a build from behind a proxy you will need to add the proxy parameters to the mvn command line, e.g.
```
mvn -Dhttps.proxyHost=myproxyhost -Dhttps.proxyPort=myproxyport -DproxySet=true package
```
## Searching and Using Local Sequence Databases
Artemis and ACT can optionally be used with local sequence databases on non-Windows systems.
[Note: this may require a lot of disk space]
If you wish to do this then carry out the following steps:
1. To download and install BLAST+ locally, check here:
```
ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/
```
to get the latest Mac OS X release:
```
ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ncbi-blast-2.7.1+-x64-macosx.tar.gz
```
Uncompress, if you have downloaded a .tar.gz, e.g.
```
tar -zxvf ncbi-blast-2.7.1+-x64-macosx.tar.gz
```
For a Mac OS X install you can mount the resulting .dmg image by double-clicking it and then selecting the .pkg installer file to actually install the BLAST+ executables into the default location (/usr/local/ncbi/blast). Comprehensive installation instructions for all operating systems are provided [here](https://www.ncbi.nlm.nih.gov/books/NBK279690/).
2. To download and install Fasta locally, check here:
```
ftp://ftp.ebi.ac.uk/pub/software/unix/fasta/
```
and download the latest release, e.g.
```
ftp://ftp.ebi.ac.uk/pub/software/unix/fasta/fasta3/fasta-36.3.8g.tar.gz
```
Uncompress the tar:
```
tar -zxvf fasta-36.3.8g.tar.gz
```
Build the executables, e.g. for a Mac:
```
cd fasta/src
make -f ../make/Makefile.os_x86_64 all
```
Move the fasta folder to a convenient area, preferably /usr/local/ for Macs:
3. Ensure that the BLAST+ and Fasta executables are available in your PATH and that local databases can be found by Artemis:
On the command line type:
```
blastp -help
fasta36 -help
```
If the executables are not found then their respective installation bin folders will need to be added to your .profile PATH variable. This can be achieved by uncommenting and setting the relevant environment variables in the **Variables for locally installed Blast databases** section of the Artemis **setenv** script. The location of the databases is assumed by default to be &lt;home directory&gt;/blast-data but this can be overridden by setting the BLASTDB and FASTLIBS variables. The setenv script should then be called from your login **.profile** file. Alternatively copy the relevant variables into your profile.
Note that database locations can also be specified directly within the Artemis/ACT applications.
4. Download and format the uniprot database(s):
git clone http://github.com/sanger-pathogens/Artemis.git You can do this by using the Artemis etc/setup_uniprot_dbs.sh script. This script can be changed as desired, to for instance, include additional databases or create a FASTLIBS file.
or by downloading the source zip file for a particular release. Apache Maven and Java 8 will need to be installed beforehand, in order to build. The applications can be built by issuing the following command in the top-level folder: ```
mkdir $HOME/blast-data
cd blast-data
cp <Artemis folder>/etc/setup_blast_dbs.sh .
./setup_blast_dbs.sh
```
mvn validate clean test package (Note: the environment variable http_proxy may need to be set for the ftp downloads to work).
## License ## License
Artemis is free software, licensed under [GPLv3](https://github.com/sanger-pathogens/artemis/blob/master/LICENSE). Artemis is free software, licensed under [GPLv3](https://github.com/sanger-pathogens/artemis/blob/master/LICENSE).
......
act
+ 9
− 3
View file @ e8461341
...@@ -97,8 +97,8 @@ done ...@@ -97,8 +97,8 @@ done
APPLICATION_HOME=`dirname "$PRG"` APPLICATION_HOME=`dirname "$PRG"`
JAR_NAME=act.jar JAR_NAME=act.jar
JAR_FILE_DEFAULT=$APPLICATION_HOME/target/unix-jars/$JAR_NAME JAR_FILE_DEFAULT=$APPLICATION_HOME/target/jars/$JAR_NAME
JAR_FILE_INSTALLED=$APPLICATION_HOME/$JAR_NAME JAR_FILE_INSTALLED=$APPLICATION_HOME/dist/$JAR_NAME
# #
# Use a custom Java version if necessary # Use a custom Java version if necessary
...@@ -117,7 +117,7 @@ fi ...@@ -117,7 +117,7 @@ fi
add_proxy_properties add_proxy_properties
# #
# "-mx1g" sets the maximum amount of memory to use. # "-mx2g" sets the maximum amount of memory to use.
# This may need to be increased when dealing with large files # This may need to be increased when dealing with large files
# #
if [[ "$ARTEMIS_JVM_FLAGS" = "" ]] if [[ "$ARTEMIS_JVM_FLAGS" = "" ]]
...@@ -127,6 +127,12 @@ else ...@@ -127,6 +127,12 @@ else
FLAGS="$ARTEMIS_JVM_FLAGS -noverify" FLAGS="$ARTEMIS_JVM_FLAGS -noverify"
fi fi
#
# Temporary flags to avoid Java 9+ reflection warnings being written to the terminal.
# Should not be necessary when Ibatis is replaced.
#
FLAGS="$FLAGS --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
PLATTMP=`uname` PLATTMP=`uname`
if [[ "$PLATTMP" = "Darwin" ]] if [[ "$PLATTMP" = "Darwin" ]]
then then
......
art
+ 10
− 3
View file @ e8461341
...@@ -103,8 +103,8 @@ done ...@@ -103,8 +103,8 @@ done
APPLICATION_HOME=`dirname "$PRG"` APPLICATION_HOME=`dirname "$PRG"`
JAR_NAME=artemis.jar JAR_NAME=artemis.jar
JAR_FILE_DEFAULT=$APPLICATION_HOME/target/unix-jars/$JAR_NAME JAR_FILE_DEFAULT=$APPLICATION_HOME/target/jars/$JAR_NAME
JAR_FILE_INSTALLED=$APPLICATION_HOME/$JAR_NAME JAR_FILE_INSTALLED=$APPLICATION_HOME/dist/$JAR_NAME
# #
# Use a custom Java version if necessary # Use a custom Java version if necessary
...@@ -123,7 +123,7 @@ fi ...@@ -123,7 +123,7 @@ fi
add_proxy_properties add_proxy_properties
# #
# "-mx1g" sets the maximum amount of memory to use. # "-mx2g" sets the maximum amount of memory to use.
# This may need to be increased when dealing with large files # This may need to be increased when dealing with large files
# #
if [[ "$ARTEMIS_JVM_FLAGS" = "" ]] if [[ "$ARTEMIS_JVM_FLAGS" = "" ]]
...@@ -133,6 +133,13 @@ else ...@@ -133,6 +133,13 @@ else
FLAGS="$ARTEMIS_JVM_FLAGS -noverify" FLAGS="$ARTEMIS_JVM_FLAGS -noverify"
fi fi
#
# Temporary flags to avoid Java 9+ reflection warnings being written to the terminal.
# Should not be necessary when Ibatis is replaced.
#
FLAGS="$FLAGS --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED"
PLATTMP=`uname` PLATTMP=`uname`
if [[ "$PLATTMP" = "Darwin" ]] if [[ "$PLATTMP" = "Darwin" ]]
then then
......
bamview
+ 4
− 4
View file @ e8461341
...@@ -41,8 +41,8 @@ done ...@@ -41,8 +41,8 @@ done
APPLICATION_PROPERTIES="-Djdbc.drivers=org.postgresql.Driver -Dartemis.environment=UNIX $SANGER_ARTEMIS_OPTIONS" APPLICATION_PROPERTIES="-Djdbc.drivers=org.postgresql.Driver -Dartemis.environment=UNIX $SANGER_ARTEMIS_OPTIONS"
APPLICATION_HOME=`dirname "$PRG"` APPLICATION_HOME=`dirname "$PRG"`
JAR_NAME=bamview.jar JAR_NAME=bamview.jar
JAR_FILE_DEFAULT=$APPLICATION_HOME/target/unix-jars/$JAR_NAME JAR_FILE_DEFAULT=$APPLICATION_HOME/target/jars/$JAR_NAME
JAR_FILE_INSTALLED=$APPLICATION_HOME/$JAR_NAME JAR_FILE_INSTALLED=$APPLICATION_HOME/dist/$JAR_NAME
# #
# Use a custom Java version if necessary # Use a custom Java version if necessary
...@@ -61,7 +61,7 @@ fi ...@@ -61,7 +61,7 @@ fi
add_proxy_properties add_proxy_properties
# #
# "-mx1g" sets the maximum amount of memory to use. # "-mx2g" sets the maximum amount of memory to use.
# This may need to be increased when dealing with large files # This may need to be increased when dealing with large files
# #
if [[ "$ARTEMIS_JVM_FLAGS" = "" ]] if [[ "$ARTEMIS_JVM_FLAGS" = "" ]]
...@@ -74,7 +74,7 @@ fi ...@@ -74,7 +74,7 @@ fi
PLATTMP=`uname` PLATTMP=`uname`
if [[ "$PLATTMP" = "Darwin" ]] if [[ "$PLATTMP" = "Darwin" ]]
then then
APPLICATION_PROPERTIES="$APPLICATION_PROPERTIES -Xdock:name=BamView" APPLICATION_PROPERTIES="$APPLICATION_PROPERTIES -Dapple.laf.useScreenMenuBar=true -Xdock:name=BamView"
fi fi
if [[ "$QUIET" = "no" ]] if [[ "$QUIET" = "no" ]]
......
dnaplotter
+ 3
− 3
View file @ e8461341
...@@ -78,8 +78,8 @@ done ...@@ -78,8 +78,8 @@ done
APPLICATION_HOME=`dirname "$PRG"` APPLICATION_HOME=`dirname "$PRG"`
JAR_NAME=dnaplotter.jar JAR_NAME=dnaplotter.jar
JAR_FILE_DEFAULT=$APPLICATION_HOME/target/unix-jars/$JAR_NAME JAR_FILE_DEFAULT=$APPLICATION_HOME/target/jars/$JAR_NAME
JAR_FILE_INSTALLED=$APPLICATION_HOME/$JAR_NAME JAR_FILE_INSTALLED=$APPLICATION_HOME/dist/$JAR_NAME
# #
# Use a custom Java version if necessary # Use a custom Java version if necessary
...@@ -98,7 +98,7 @@ fi ...@@ -98,7 +98,7 @@ fi
add_proxy_properties add_proxy_properties
# #
# "-mx1g" sets the maximum amount of memory to use. # "-mx2g" sets the maximum amount of memory to use.
# This may need to be increased when dealing with large files # This may need to be increased when dealing with large files
# #
if [[ "$ARTEMIS_JVM_FLAGS" = "" ]] if [[ "$ARTEMIS_JVM_FLAGS" = "" ]]
......
etc/writedb_entry
+ 2
− 2
View file @ e8461341
...@@ -54,8 +54,8 @@ FLAGS="-mx2048m -ms20m -Djdbc.drivers=org.postgresql.Driver -Dibatis" ...@@ -54,8 +54,8 @@ FLAGS="-mx2048m -ms20m -Djdbc.drivers=org.postgresql.Driver -Dibatis"
DEFAULT_CONNECTION="-Dchado=db.genedb.org:5432/snapshot?genedb_ro -Dread_only" DEFAULT_CONNECTION="-Dchado=db.genedb.org:5432/snapshot?genedb_ro -Dread_only"
APPLICATION_HOME=`dirname "$PRG"`/.. APPLICATION_HOME=`dirname "$PRG"`/..
JAR_NAME=artemis.jar JAR_NAME=artemis.jar
JAR_FILE_DEFAULT=$APPLICATION_HOME/target/unix-jars/$JAR_NAME JAR_FILE_DEFAULT=$APPLICATION_HOME/target/jars/$JAR_NAME
JAR_FILE_INSTALLED=$APPLICATION_HOME/$JAR_NAME JAR_FILE_INSTALLED=$APPLICATION_HOME/dist/$JAR_NAME
# #
# Use a custom Java version if necessary # Use a custom Java version if necessary
......
icons/Readme.txt deleted 100644 → 0
+ 0
− 83
View file @ aa30c423
Artemis, ACT & DNAPlotter
=========================
Artemis is a free genome viewer and annotation tool that allows visualization of sequence features and the results of analyses within the context of the sequence, and its six-frame translation.
ACT (Artemis Comparison Tool) is a DNA sequence comparison viewer based on Artemis.
DNAPlotter generates images of circular and linear DNA maps.
BamView is a standalone BAM/CRAM file viewer.
Installation on MacOSX
======================
1. Drag and drop the Artemis, ACT, DNAPlotter and BamView icons to an Applications directory, for example an 'Applications' directory in your home directory.
2. Then eject the disk image (right click and select 'Eject').
3. Drag the icons from where you have installed them, into your dock.
4. To run 'art' and 'act' from the command line add the following to your UNIX PATH:
$ARTEMIS/Artemis.app/Contents
where $ARTEMIS is the directory you have installed to. This can be done by adding a line to ~/.bashrc (if you are using bash shell) for example:
PATH=~/Applications/Artemis.app/Contents; export PATH
Searching and Using Local Sequence Databases (Optional)
=======================================================
1. Download and install BLAST:
ftp://ftp.ncbi.nih.gov/blast/executables/release/
get the latest release, e.g.:
ftp://ftp.ncbi.nih.gov/blast/executables/release/2.2.18/blast-2.2.18-universal-macosx.tar.gz
Untar and add the contents of the bin directory into Artemis.app/Contents/blast.
2. Download and install Fasta
ftp://ftp.ebi.ac.uk/pub/software/unix/fasta
Get the latest, e.g.:
ftp://ftp.ebi.ac.uk/pub/software/unix/fasta/fasta3/fasta-34.26.5.shar.Z
Put this in Artemis.app/Contents/fasta and unwrap and compile:
uncompress fasta-34.26.5.shar.Z
cat fasta-34.26.5.shar | sh
make -f Makefile.os_x all
3. Download and format uniprot database
You can do this by using the setup_dbs.sh script in Artemis.app/Contents/blast-data
cd Artemis.app/Contents/blast-data
./setup_dbs.sh
(Note the environment variable http_proxy may need to be set for the download to work).
Additional databases can be added here.
To select to run searches locally ensure that under the 'Options' menu 'Send Searches via SSH' is not toggled.
BamView CRAM reference lookup
=============================
BamView now has the ability to download CRAM reference sequences if none is specified on startup.
This behaviour can be further governed using two environment variables REF_PATH and REF_CACHE.
The usage of these variables is the same as for samtools. Please refer to this article for details:
http://www.htslib.org/workflow/
References:
===========
"K. Rutherford, J. Parkhill, J. Crook, T. Horsnell, P. Rice, M-A. Rajandream and B. Barrell (2000) Artemis: sequence visualisation and annotation." Bioinformatics 16 (10) 944-945.
T.J. Carver, K.M. Rutherford, M. Berriman, M-A. Rajandream, B.G. Barrell and J. Parkhill, "ACT: the Artemis Comparison Tool", Bioinformatics, 2005.
lib/README
+ 2
− 0
View file @ e8461341
These are old libraries and the intention is to remove or upgrade them.
Lib versions: Lib versions:
============= =============
......
pom.xml
+ 227
− 482
View file @ e8461341
This diff is collapsed.
src/assembly/macosx-release-assembly.xml 0 → 100644
+ 326
− 0
View file @ e8461341
<?xml version="1.0"?>
<project name="Mac OSX bundle script">
<path id="artemis.class.path">
<pathelement path="${project.build.directory}/jars/${artemis.jar.name}" />
</path>
<path id="act.class.path">
<pathelement path="${project.build.directory}/jars/${act.jar.name}" />
</path>
<path id="dnaplotter.class.path">
<!-- Use self-contained jar -->
<pathelement path="${project.build.directory}/win-jars/${dnaplotter.jar.name}" />
</path>
<path id="bamview.class.path">
<!-- Use self-contained jar -->
<pathelement path="${project.build.directory}/win-jars/${bamview.jar.name}" />
</path>
<taskdef name="bundleapp"
classpath="${osx.bundler.jar}"
classname="com.oracle.appbundler.AppBundlerTask" />
<target name="bundle-mac-osx" description="Bundle Mac OSX Non-CHADO configured jars">
<mkdir dir="${osx.app.folder}/apps" />
<delete quiet="true">
<fileset dir="${osx.app.folder}" includes="${osx.release.filename}.*"/>
</delete>
<!-- Artemis App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="artemis.class.path"
outputdirectory="${osx.app.folder}/apps"
name="${artemis.application.name}"
displayname="${artemis.application.name}"
executableName="${artemis.application.name}"
identifier="uk.ac.sanger.artemis"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/artemis.icns"
mainclassname="${artemis.main.class}"
copyright="${copyright.text}"
plistClassPaths="$APP_ROOT/Contents,$APP_ROOT/Contents/Java/${artemis.jar.name}">
<bundledocument extensions="gff,gff3,embl,EMBL,genbank,gbk,fasta,fa"
name="sequence"
role="viewer"
handlerRank="owner">
</bundledocument>
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${artemis.application.name}" />
<option value="${macosx.dock.command.line.arg}=${artemis.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- ACT App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="act.class.path"
outputdirectory="${osx.app.folder}/apps"
name="${act.application.name}"
displayname="${act.application.name}"
executableName="${act.application.name}"
identifier="uk.ac.sanger.act"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/act.icns"
mainclassname="${act.main.class}"
copyright="${copyright.text}"
plistClassPaths="$APP_ROOT/Contents,$APP_ROOT/Contents/Java/${act.jar.name}">
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${act.application.name}" />
<option value="${macosx.dock.command.line.arg}=${act.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- DNA Plotter App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="dnaplotter.class.path"
outputdirectory="${osx.app.folder}/apps"
name="${dnaplotter.application.name}"
displayname="${dnaplotter.application.name}"
executableName="${dnaplotter.application.name}"
identifier="uk.ac.sanger.dnaplotter"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/dnaplotter.icns"
mainclassname="${dnaplotter.main.class}"
copyright="${copyright.text}">
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${dnaplotter.application.name}" />
<option value="${macosx.dock.command.line.arg}=${dnaplotter.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- BamView App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="bamview.class.path"
outputdirectory="${osx.app.folder}/apps"
name="${bamview.application.name}"
displayname="${bamview.application.name}"
executableName="${bamview.application.name}"
identifier="uk.ac.sanger.bamview"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/bamview.icns"
mainclassname="${bamview.main.class}"
copyright="${copyright.text}">
<bundledocument extensions="bam,cram"
name="alignment"
role="viewer"
handlerRank="owner">
</bundledocument>
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${bamview.application.name}" />
<option value="${macosx.dock.command.line.arg}=${bamview.application.name}" />
</bundleapp>
<copy file="${artemis.icons.path}/dmg_icon.icns" tofile="${osx.app.folder}/apps/.VolumeIcon.icns"/>
<!-- Set up additional folders -->
<copy todir="${osx.app.folder}/apps/${artemis.application.name}.app/Contents/etc">
<fileset dir="etc"/>
</copy>
<copy todir="${osx.app.folder}/apps/${act.application.name}.app/Contents/etc">
<fileset dir="etc"/>
</copy>
<echo>NOTE: hdiutil must be installed to create a Mac .dmg image file...</echo>
<exec executable="hdiutil">
<arg value="create"/>
<arg value="${osx.app.folder}/${osx.release.filename}.dmg"/>
<arg value="-srcfolder"/>
<arg value="${osx.app.folder}/apps"/>
<arg value="-volname"/>
<arg value="${osx.bundler.volume}"/>
</exec>
<exec executable="gzip">
<arg value="${osx.app.folder}/${osx.release.filename}.dmg"/>
</exec>
</target>
<target name="bundle-mac-osx-chado" description="Bundle Mac OSX CHADO configured jars">
<mkdir dir="${osx.app.chado.folder}/apps" />
<delete quiet="true">
<fileset dir="${osx.app.chado.folder}" includes="${osx.chado.release.filename}.*"/>
</delete>
<!-- Artemis (Chado enabled) App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="artemis.class.path"
outputdirectory="${osx.app.chado.folder}/apps"
name="${artemis.chado.application.name}"
displayname="${artemis.chado.application.name}"
executableName="${artemis.chado.application.name}"
identifier="uk.ac.sanger.artemis"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/artemis.icns"
mainclassname="${artemis.main.class}"
copyright="${copyright.text}"
workingdirectory="$APP_ROOT/Contents/"
plistClassPaths="$APP_ROOT/Contents,$APP_ROOT/Contents/Java/${artemis.jar.name}">
<bundledocument extensions="gff,gff3,embl,EMBL,genbank,gbk,fasta,fa"
name="sequence"
role="viewer"
handlerRank="owner">
</bundledocument>
<option value="${postgres.command.line.arg}" />
<option value="${chado.command.line.arg}" />
<option value="${ibatis.command.line.arg}" />
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${artemis.application.name}" />
<option value="${macosx.dock.command.line.arg}=${artemis.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- ACT (Chado enabled) App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="act.class.path"
outputdirectory="${osx.app.chado.folder}/apps"
name="${act.chado.application.name}"
displayname="${act.chado.application.name}"
executableName="${act.chado.application.name}"
identifier="uk.ac.sanger.act"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/act.icns"
mainclassname="${act.main.class}"
copyright="${copyright.text}"
plistClassPaths="$APP_ROOT/Contents,$APP_ROOT/Contents/Java/${act.jar.name}">
<option value="${postgres.command.line.arg}" />
<option value="${chado.command.line.arg}" />
<option value="${ibatis.command.line.arg}" />
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${act.application.name}" />
<option value="${macosx.dock.command.line.arg}=${act.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- DNA Plotter App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="dnaplotter.class.path"
outputdirectory="${osx.app.chado.folder}/apps"
name="${dnaplotter.application.name}"
displayname="${dnaplotter.application.name}"
executableName="${dnaplotter.application.name}"
identifier="uk.ac.sanger.dnaplotter"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/dnaplotter.icns"
mainclassname="${dnaplotter.main.class}"
copyright="${copyright.text}">
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${dnaplotter.application.name}" />
<option value="${macosx.dock.command.line.arg}=${dnaplotter.application.name}" />
<option value="${sangeroptions.command.line.arg}" />
<option value="${blackbelt.command.line.arg}" />
</bundleapp>
<!-- BamView App -->
<bundleapp jvmrequired="${java.compatibility.major.version}"
classpathref="bamview.class.path"
outputdirectory="${osx.app.chado.folder}/apps"
name="${bamview.application.name}"
displayname="${bamview.application.name}"
executableName="${bamview.application.name}"
identifier="uk.ac.sanger.bamview"
shortversion="${project.version}"
version="${project.version}"
icon="${project.build.directory}/icons/bamview.icns"
mainclassname="${bamview.main.class}"
copyright="${copyright.text}">
<bundledocument extensions="bam,cram"
name="alignment"
role="viewer"
handlerRank="owner">
</bundledocument>
<option value="${maxheap.command.line.arg}" />
<option value="${initialheap.command.line.arg}" />
<option value="${noverify.command.line.arg}" />
<option value="${unixenv.command.line.arg}" />
<option value="${macosx.use.menubar.arg}" />
<option value="${macosx.menuname.command.line.arg}=${bamview.application.name}" />
<option value="${macosx.dock.command.line.arg}=${bamview.application.name}" />
</bundleapp>
<copy file="${artemis.icons.path}/dmg_icon.icns" tofile="${osx.app.chado.folder}/apps/.VolumeIcon.icns"/>
<!-- Set up additional folders -->
<copy todir="${osx.app.chado.folder}/apps/${artemis.chado.application.name}.app/Contents/etc">
<fileset dir="etc"/>
</copy>
<copy todir="${osx.app.chado.folder}/apps/${act.chado.application.name}.app/Contents/etc">
<fileset dir="etc"/>
</copy>
<echo>NOTE: hdiutil must be installed to create a Mac .dmg image file...</echo>
<exec executable="hdiutil">
<arg value="create"/>
<arg value="${osx.app.chado.folder}/${osx.chado.release.filename}.dmg"/>
<arg value="-srcfolder"/>
<arg value="${osx.app.chado.folder}/apps"/>
<arg value="-volname"/>
<arg value="${osx.bundler.chado.volume}"/>
</exec>
<exec executable="gzip">
<arg value="${osx.app.chado.folder}/${osx.chado.release.filename}.dmg"/>
</exec>
</target>
</project>
src/assembly/unix-release-assembly.xml
+ 3
− 3
View file @ e8461341
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
<!-- Assembles a simple release tar gz with jars and scripts --> <!-- Assembles a simple release tar gz with jars and scripts -->
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/unix-jars</directory> <directory>target/jars</directory>
<outputDirectory>${unix.assembly.folder}</outputDirectory> <outputDirectory>${unix.assembly.folder}/dist</outputDirectory>
<includes> <includes>
<include>*.jar</include> <include>*.jar</include>
</includes> </includes>
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
<include>etc/**</include> <include>etc/**</include>
</includes> </includes>
<directoryMode>0755</directoryMode> <directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding> <lineEnding>unix</lineEnding>
</fileSet> </fileSet>
<fileSet> <fileSet>
...@@ -37,6 +36,7 @@ ...@@ -37,6 +36,7 @@
<include>LICENSE</include> <include>LICENSE</include>
<include>README*</include> <include>README*</include>
</includes> </includes>
<lineEnding>unix</lineEnding>
</fileSet> </fileSet>
<fileSet> <fileSet>
<outputDirectory>${unix.assembly.folder}</outputDirectory> <outputDirectory>${unix.assembly.folder}</outputDirectory>
......
src/assembly/windows-release-assembly.xml
+ 1
− 1
View file @ e8461341
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>target/jars</directory> <directory>target/win-jars</directory>
<outputDirectory>${windows.assembly.folder}</outputDirectory> <outputDirectory>${windows.assembly.folder}</outputDirectory>
<includes> <includes>
<include>*.jar</include> <include>*.jar</include>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment