Skip to content

Commit

Permalink
Fixed installation to not use mega-jars.
Browse files Browse the repository at this point in the history 
git-svn-id: https://open-delta.googlecode.com/svn/trunk@429 dd429c29-c832-59a0-e864-46e68368aa0b
  • Loading branch information
chris.flemming.ala@gmail.com committed Apr 7, 2011
1 parent 37d267d commit c03f50c
Show file tree
Hide file tree
Showing 12 changed files with 312 additions and 184 deletions.
55 changes: 34 additions & 21 deletions confor/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
<url>http://code.google.com/p/open-delta/</url> <url>http://code.google.com/p/open-delta/</url>
</scm> </scm>
<build> <build>

<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
Expand All @@ -21,6 +20,7 @@
<archive> <archive>
<manifest> <manifest>
<mainClass>au.org.ala.delta.confor.CONFOR</mainClass> <mainClass>au.org.ala.delta.confor.CONFOR</mainClass>
<addClasspath>true</addClasspath>
</manifest> </manifest>
<manifestEntries> <manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version> <Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
Expand All @@ -32,30 +32,43 @@
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version> <version>2.2-beta-5</version>
<configuration>
<archive>
<manifest>
<mainClass>au.org.ala.delta.confor.CONFOR</mainClass>
</manifest>
<manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
</manifestEntries>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<classifier>with-dependencies</classifier>
<finalName>${project.build.finalName}-with-dependencies</finalName>

</configuration>
<executions> <executions>
<execution>
<id>dependency-jars</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../delta-dependency-jar-dir-assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<finalName>dependencies</finalName>
</configuration>
</execution>
<execution> <execution>
<id>with-dependencies</id> <id>with-dependencies</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration>
<archive>
<manifest>
<mainClass>au.org.ala.delta.confor.CONFOR</mainClass>
</manifest>
<manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
</manifestEntries>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<classifier>with-dependencies</classifier>
<appendAssemblyId>false</appendAssemblyId>
<finalName>${project.build.finalName}-with-dependencies</finalName>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
Expand Down Expand Up @@ -103,7 +116,7 @@
</binFileExtensions> </binFileExtensions>
<repositoryLayout>flat</repositoryLayout> <repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName> <repositoryName>lib</repositoryName>
<generateRepository>true</generateRepository> <generateRepository>false</generateRepository>
<showConsoleWindow>true</showConsoleWindow> <showConsoleWindow>true</showConsoleWindow>
</configuration> </configuration>
<executions> <executions>
Expand Down Expand Up @@ -131,7 +144,7 @@
<dontWrapJar>true</dontWrapJar> <dontWrapJar>true</dontWrapJar>
<headerType>console</headerType> <headerType>console</headerType>
<outfile>target/CONFOR.exe</outfile> <outfile>target/CONFOR.exe</outfile>
<jar>lib/${project.build.finalName}-with-dependencies.jar</jar> <jar>lib/${project.build.finalName}.jar</jar>
<errTitle>Error</errTitle> <errTitle>Error</errTitle>
<icon>installer/resources/Delta_CONFOR.ico</icon> <icon>installer/resources/Delta_CONFOR.ico</icon>
<jre> <jre>
Expand All @@ -149,7 +162,7 @@
<dontWrapJar>true</dontWrapJar> <dontWrapJar>true</dontWrapJar>
<headerType>console</headerType> <headerType>console</headerType>
<outfile>target/CONFOR-NOJRE.exe</outfile> <outfile>target/CONFOR-NOJRE.exe</outfile>
<jar>lib/${project.build.finalName}-with-dependencies.jar</jar> <jar>lib/${project.build.finalName}.jar</jar>
<errTitle>Error</errTitle> <errTitle>Error</errTitle>
<icon>installer/resources/Delta_CONFOR.ico</icon> <icon>installer/resources/Delta_CONFOR.ico</icon>
<jre> <jre>
Expand Down
20 changes: 20 additions & 0 deletions delta-dependency-jar-dir-assembly.xml
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,20 @@
<!-- This assembly plugin descriptor is used by the executable sub projects
e.g. Intkey, editor to output all of their dependent jars to a directory.
These jars are then later used in building the installer file. -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>dependencies</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<unpack>false</unpack>
<scope>runtime</scope>
</dependencySet>
</dependencySets>
</assembly>
35 changes: 0 additions & 35 deletions delta-dir-assembly.xml
View file

This file was deleted.

66 changes: 39 additions & 27 deletions delta-editor/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</repository> </repository>
</repositories> </repositories>



<scm> <scm>
<connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection> <connection>scm:svn:http://open-delta.googlecode.com/svn/trunk/</connection>
<developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection> <developerConnection>scm:svn:https://open-delta.googlecode.com/svn/trunk/</developerConnection>
Expand All @@ -35,45 +34,58 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive>
<manifest>
<mainClass>au.org.ala.delta.editor.DeltaEditor</mainClass>
<addClasspath>true</addClasspath>
</manifest>
<manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<configuration>
<archive> <archive>
<manifest> <manifest>
<mainClass>au.org.ala.delta.editor.DeltaEditor</mainClass> <mainClass>au.org.ala.delta.editor.DeltaEditor</mainClass>
<addClasspath>true</addClasspath>
</manifest> </manifest>
<manifestEntries> <manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version> <Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
</manifestEntries> </manifestEntries>
</archive> </archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<classifier>with-dependencies</classifier>
<finalName>${project.build.finalName}-with-dependencies</finalName>

</configuration> </configuration>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<executions> <executions>
<execution>
<id>dependency-jars</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>../delta-dependency-jar-dir-assembly.xml</descriptor>
</descriptors>
<finalName>dependencies</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
<execution> <execution>
<id>with-dependencies</id> <id>with-dependencies</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>single</goal> <goal>single</goal>
</goals> </goals>
<configuration>
<archive>
<manifest>
<mainClass>au.org.ala.delta.editor.DeltaEditor</mainClass>
</manifest>
<manifestEntries>
<Implementation-Version>${project.version} (${buildNumber})</Implementation-Version>
</manifestEntries>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
<classifier>with-dependencies</classifier>
<finalName>${project.build.finalName}-with-dependencies</finalName>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
Expand Down Expand Up @@ -149,7 +161,7 @@
</binFileExtensions> </binFileExtensions>
<repositoryLayout>flat</repositoryLayout> <repositoryLayout>flat</repositoryLayout>
<repositoryName>lib</repositoryName> <repositoryName>lib</repositoryName>
<generateRepository>true</generateRepository> <generateRepository>false</generateRepository>
<showConsoleWindow>false</showConsoleWindow> <showConsoleWindow>false</showConsoleWindow>
</configuration> </configuration>
<executions> <executions>
Expand Down Expand Up @@ -195,7 +207,7 @@
<dontWrapJar>true</dontWrapJar> <dontWrapJar>true</dontWrapJar>
<headerType>gui</headerType> <headerType>gui</headerType>
<outfile>target/DeltaEditor-NOJRE.exe</outfile> <outfile>target/DeltaEditor-NOJRE.exe</outfile>
<jar>lib\${project.build.finalName}-with-dependencies.jar</jar> <jar>lib\${project.build.finalName}.jar</jar>
<errTitle>Error</errTitle> <errTitle>Error</errTitle>
<icon>installer\resources\delta_editor.ico</icon> <icon>installer\resources\delta_editor.ico</icon>
<jre> <jre>
Expand Down Expand Up @@ -223,7 +235,7 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

<groupId>au.org.ala.delta</groupId> <groupId>au.org.ala.delta</groupId>
<artifactId>delta-ui-common</artifactId> <artifactId>delta-ui-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
Expand Down
66 changes: 66 additions & 0 deletions delta-installer-jar-dir-assembly.xml
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,66 @@
<!-- This assembly plugin descriptor is used to output all jars that need to
go into the installer - both jars of delta modules and their dependencies - into
a single directory. This simplifies the creation of the installer. -->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>jardir</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/delta-editor/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>*with-dependencies*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/delta-editor/target/dependencies</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/intkey/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>*with-dependencies*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/intkey/target/dependencies</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/confor/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
<excludes>
<exclude>*with-dependencies*.jar</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${project.basedir}/confor/target/dependencies</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
</fileSets>
</assembly>
Loading

0 comments on commit c03f50c

Please sign in to comment.