From cb96d0f5ccaa061483bb0d8c36fc167db7366573 Mon Sep 17 00:00:00 2001
From: Rogiel Sulzbach <rogiel@rogiel.com>
Date: Mon, 24 Oct 2011 15:12:09 -0200
Subject: [PATCH] Add final zipfile with both login and gameserver binaries as
 zip

Adds to the maven build process an assembly descriptor that creates
an single zip file containing both the login and the gameserver zip
files together. Currently, includes only mysql binaries.
---
 .../src/assembly/distribution-derby-bin.xml   | 15 +++---
 .../src/assembly/distribution-h2-bin.xml      | 15 +++---
 .../src/assembly/distribution-mysql5-bin.xml  | 15 +++---
 .../assembly/distribution-orientdb-bin.xml    | 15 +++---
 pom.xml                                       | 47 ++++++++++++++++++-
 src/assembly/bin.xml                          | 16 +++++++
 6 files changed, 94 insertions(+), 29 deletions(-)
 create mode 100644 src/assembly/bin.xml

diff --git a/l2jserver2-gameserver/src/assembly/distribution-derby-bin.xml b/l2jserver2-gameserver/src/assembly/distribution-derby-bin.xml
index 31cf9dd6e..c4fa4f826 100644
--- a/l2jserver2-gameserver/src/assembly/distribution-derby-bin.xml
+++ b/l2jserver2-gameserver/src/assembly/distribution-derby-bin.xml
@@ -29,14 +29,15 @@
 			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-${project.version}.jar</include>
-			</includes>
-		</fileSet>
 	</fileSets>
+	<files>
+		<file>
+			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>l2jserver2.jar</destName>
+			<fileMode>0755</fileMode>
+		</file>
+	</files>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/libs</outputDirectory>
diff --git a/l2jserver2-gameserver/src/assembly/distribution-h2-bin.xml b/l2jserver2-gameserver/src/assembly/distribution-h2-bin.xml
index befe43f26..5c3da8929 100644
--- a/l2jserver2-gameserver/src/assembly/distribution-h2-bin.xml
+++ b/l2jserver2-gameserver/src/assembly/distribution-h2-bin.xml
@@ -29,14 +29,15 @@
 			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-${project.version}.jar</include>
-			</includes>
-		</fileSet>
 	</fileSets>
+	<files>
+		<file>
+			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>l2jserver2.jar</destName>
+			<fileMode>0755</fileMode>
+		</file>
+	</files>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/libs</outputDirectory>
diff --git a/l2jserver2-gameserver/src/assembly/distribution-mysql5-bin.xml b/l2jserver2-gameserver/src/assembly/distribution-mysql5-bin.xml
index 39a918494..a1e95ebd4 100644
--- a/l2jserver2-gameserver/src/assembly/distribution-mysql5-bin.xml
+++ b/l2jserver2-gameserver/src/assembly/distribution-mysql5-bin.xml
@@ -29,14 +29,15 @@
 			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-${project.version}.jar</include>
-			</includes>
-		</fileSet>
 	</fileSets>
+	<files>
+		<file>
+			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>l2jserver2.jar</destName>
+			<fileMode>0755</fileMode>
+		</file>
+	</files>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/libs</outputDirectory>
diff --git a/l2jserver2-gameserver/src/assembly/distribution-orientdb-bin.xml b/l2jserver2-gameserver/src/assembly/distribution-orientdb-bin.xml
index dd47519ff..fa7bb9f40 100644
--- a/l2jserver2-gameserver/src/assembly/distribution-orientdb-bin.xml
+++ b/l2jserver2-gameserver/src/assembly/distribution-orientdb-bin.xml
@@ -29,14 +29,15 @@
 			<directory>${project.basedir}/distribution/sql</directory>
 			<outputDirectory>/</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>${project.build.directory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>${project.artifactId}-${project.version}.jar</include>
-			</includes>
-		</fileSet>
 	</fileSets>
+	<files>
+		<file>
+			<source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+			<outputDirectory>/</outputDirectory>
+			<destName>l2jserver2.jar</destName>
+			<fileMode>0755</fileMode>
+		</file>
+	</files>
 	<dependencySets>
 		<dependencySet>
 			<outputDirectory>/libs</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 1c780a9cb..c66e8d7fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,6 @@
 		<module>l2jserver2-common</module>
 		<module>l2jserver2-gameserver</module>
 		<module>l2jserver2-loginserver</module>
-		<module>l2jserver2-tools</module>
 	</modules>
 
 	<issueManagement>
@@ -80,6 +79,18 @@
 					<skipTests>true</skipTests>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>install</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -101,7 +112,41 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<inherited>false</inherited>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/bin.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>assembly</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<executions>
+						<execution>
+							<phase>package</phase>
+							<goals>
+								<goal>install</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 	<dependencies>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
new file mode 100644
index 000000000..03221daaa
--- /dev/null
+++ b/src/assembly/bin.xml
@@ -0,0 +1,16 @@
+<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>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<baseDirectory>${basedir}</baseDirectory>
+	<files>
+		<file>
+			<source>${basedir}/l2jserver2-gameserver/target/l2jserver2-gameserver-${project.version}-mysql5-bin.zip</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+	</files>
+</assembly>
\ No newline at end of file