X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fsrc%2Fassembly%2Fdist.xml;h=c101a9d6f2b13ec2497e282795dbb36474557ae8;hb=9dfce8483418e7c5c9c0a76a4c790a1f8ab1a500;hp=f9ffc4cb678fe798e3705c06e5897fcddd66b505;hpb=dc8a8533c1dc7e44b8d1aa3892e420e05ce6d139;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/src/assembly/dist.xml b/dist/slc/src/assembly/dist.xml
index f9ffc4cb6..c101a9d6f 100644
--- a/dist/slc/src/assembly/dist.xml
+++ b/dist/slc/src/assembly/dist.xml
@@ -1,55 +1,59 @@
-<!--
-
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-            http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
+<!-- Copyright (C) 2007-2012 Argeo GmbH Licensed under the Apache License, 
+	Version 2.0 (the "License"); you may not use this file except in compliance 
+	with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 
+	Unless required by applicable law or agreed to in writing, software distributed 
+	under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES 
+	OR CONDITIONS OF ANY KIND, either express or implied. See the License for 
+	the specific language governing permissions and limitations under the License. -->
 <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>dist</id>
-	<baseDirectory>slc</baseDirectory>
+	<baseDirectory>argeo-slc-${project.version}</baseDirectory>
 	<formats>
-		<format>zip</format>
+		<format>tar.gz</format>
 	</formats>
 	<fileSets>
 		<fileSet>
-			<directory>target/base</directory>
-			<outputDirectory></outputDirectory>
+			<directory>src/main/base/bin</directory>
+			<outputDirectory>bin</outputDirectory>
+			<fileMode>0755</fileMode>
 			<includes>
-				<include>**</include>
+				<include>slc</include>
 			</includes>
 		</fileSet>
 	</fileSets>
 	<dependencySets>
 		<dependencySet>
 			<unpack>false</unpack>
-			<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}
-			</outputFileNameMapping>
-			<outputDirectory>lib</outputDirectory>
+			<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
+			<outputDirectory>modules</outputDirectory>
 			<includes>
 				<include>*:jar</include>
 			</includes>
+			<excludes>
+				<exclude>org.argeo.tp:org.eclipse.osgi</exclude>
+				<exclude>org.argeo.commons.base:org.argeo.osgi.boot</exclude>
+				<exclude>org.argeo.slc:org.argeo.slc.launcher</exclude>
+			</excludes>
 		</dependencySet>
 		<dependencySet>
-			<unpack>true</unpack>
+			<unpack>false</unpack>
+			<outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping>
+			<outputDirectory>boot</outputDirectory>
 			<includes>
-				<include>org.argeo.slc.runtime:org.argeo.slc.launcher:tar.gz:base
-				</include>
+				<include>org.argeo.tp:org.eclipse.osgi</include>
+				<include>org.argeo.commons.base:org.argeo.osgi.boot</include>
+				<include>org.argeo.slc:org.argeo.slc.launcher</include>
 			</includes>
 		</dependencySet>
+		<!-- <dependencySet> -->
+		<!-- <unpack>true</unpack> -->
+		<!-- <includes> -->
+		<!-- <include>org.argeo.slc.runtime:org.argeo.slc.launcher:tar.gz:base -->
+		<!-- </include> -->
+		<!-- </includes> -->
+		<!-- </dependencySet> -->
 	</dependencySets>
 </assembly>
\ No newline at end of file