Skip to content

Commit

Permalink
Added dedicated installer module
Browse files Browse the repository at this point in the history
  • Loading branch information
@gary-rowe
gary-rowe committed Mar 16, 2014
1 parent cac3171 commit db7b233
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 239 deletions.
16 changes: 16 additions & 0 deletions AUTHORS
View file
@@ -0,0 +1,16 @@
# MultiBit HD

All contributors are listed in alphabetical order by surname.

## Developers

Jim Burton
Gary Rowe

## Testers

## Internationalisation

http://translate.multibit.org

Thanks to all the people who translated MultiBit HD.
22 changes: 22 additions & 0 deletions COPYING
View file
@@ -0,0 +1,22 @@
Copyright (c) 2014 MultiBit Developers

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom
the Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall
be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER DEALINGS IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion LICENSE
View file
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 Bitcoin Solutions Ltd
Copyright (c) 2014 Bitcoin Solutions Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
89 changes: 0 additions & 89 deletions enforcer.txt
View file

This file was deleted.

27 changes: 27 additions & 0 deletions mbhd-install/pom.xml
View file
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>mbhd-parent</artifactId>
<groupId>org.multibit.hd</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>mbhd-install</artifactId>

<name>MultiBit HD Installer</name>
<description>Build the installers and perform any code signing.</description>

<dependencies>

<!-- MultiBit HD dependencies to ensure build order -->
<dependency>
<groupId>org.multibit.hd</groupId>
<artifactId>mbhd-swing</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>

</project>
Empty file removed mbhd-swing/package/macosx/MultiBit HD.icns
View file
Empty file.
149 changes: 0 additions & 149 deletions mbhd-swing/pom.xml
View file
Expand Up @@ -14,155 +14,6 @@
<name>MultiBit HD Swing</name>
<description>The Swing implementation of the MultiBit HD user interface.</description>

<properties>
<!-- JavaFX used for packaging (make sure to update Info.plist if changing) -->
<installer.mainClass>org.multibit.hd.ui.MultiBitHD</installer.mainClass>
<!-- Icon names are attached to this -->
<installer.appName>MultiBit HD</installer.appName>
<installer.jarName>multibit-hd</installer.jarName>
<installer.appId>MultiBitHD</installer.appId>

<!-- JavaFX Ant JAR -->
<installer.tools.ant.jar>${java.home}/../lib/ant-javafx.jar</installer.tools.ant.jar>

</properties>

<profiles>

<profile>

<!-- To activate this, build as 'mvn -Dinstaller=true clean package' -->
<id>installer</id>
<activation>
<property>
<name>installer</name>
<value>true</value>
</property>
</activation>

<!-- Only use these plugins if building the final JavaFx installer -->
<build>
<plugins>
<!-- Configure the JavaFx packager -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<executions>
<execution>
<id>unpack-dependencies</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>${java.home}/../bin/javafxpackager</executable>
<arguments>
<argument>-createjar</argument>
<argument>-nocss2bin</argument>
<argument>-appclass</argument>
<argument>${installer.mainClass}</argument>
<argument>-srcdir</argument>
<argument>target/classes</argument>
<argument>-outdir</argument>
<argument>target</argument>
<argument>-outfile</argument>
<argument>${installer.jarName}</argument>
</arguments>
</configuration>
</plugin>

<!-- This will copy all your dependencies to target/libs, which will be picked up by the ant task below -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>target/libs</outputDirectory>
<includeScope>compile</includeScope>
<includeScope>runtime</includeScope>
<excludeArtifactIds>javafx</excludeArtifactIds>
</configuration>
</execution>
</executions>
</plugin>

<!-- AntRun plugin for JavaFx packaging (requires lib/ant-javafx.jar in JDK) -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun.version}</version>
<executions>
<execution>
<id>create-javafx-packages</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<!-- Ignore this namespace -->
<target xmlns:fx="javafx:com.sun.javafx.tools.ant">

<echo>Start of Ant tasks.</echo>

<taskdef
uri="javafx:com.sun.javafx.tools.ant"
resource="com/sun/javafx/tools/ant/antlib.xml">

<!-- Configure the classpath to include the current working directory
and the Ant JavaFX JAR -->
<classpath path=".:${installer.tools.ant.jar}"/>

</taskdef>

<echo>Define application...</echo>
<fx:application id="${installer.appId}"
name="${installer.appName}"
mainClass="${installer.mainClass}"/>

<echo>Creating JAR...</echo>
<fx:jar destfile="target/${installer.jarName}.jar" verbose="true">
<fx:application refid="${installer.appId}"/>
<fx:fileset dir="target/classes"/>
<fx:resources>
<fx:fileset dir="target" includes="libs/*.jar"/>
</fx:resources>
</fx:jar>

<fx:deploy width="600" height="400"
outdir="target/packaged"
embedJNLP="true" verbose="true"
outfile="${installer.appName}"
nativeBundles="all">
<fx:application refid="${installer.appId}"/>
<fx:resources>
<fx:fileset dir="target" includes="${installer.jarName}.jar"/>
<fx:fileset dir="target" includes="libs/*.jar"/>
</fx:resources>
<fx:permissions/>
</fx:deploy>

<echo>End of Ant tasks.</echo>
</target>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

</profile>
</profiles>

<dependencies>

<!-- MultiBit HD support libraries -->
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Expand Up @@ -35,6 +35,7 @@
<module>mbhd-core</module>
<module>mbhd-brit</module>
<module>mbhd-swing</module>
<module>mbhd-install</module>
</modules>

<url>http://github.com/bitcoin-solutions/multibit-hd</url>
Expand Down

0 comments on commit db7b233

Please sign in to comment.