X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=87c9cdb023dc045696d115d4d93273ff7c8ebc5e;hb=408ab7b0ee2c34ca673fef6864938e8f09f52bca;hp=6230d578f9fa9fb8fa70ef6c6da4b981eadb068a;hpb=aacb88b5111ac54f5dc4eadf6e980572d644114d;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index 6230d578f..87c9cdb02 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -1,10 +1,9 @@
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.13.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>org.argeo.slc.sdk</artifactId>
@@ -110,51 +109,83 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--
+				<plugin> <groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId> <version>1.1</version>
+				<executions> <execution> <id>create-repository</id>
+				<phase>deploy</phase> <goals> <goal>exec</goal> </goals>
+				</execution> </executions> <configuration>
+				<executable>${argeo.p2.cmd}</executable> optional
+				<workingDirectory>/tmp</workingDirectory> <arguments>
+				<argument>-noSplash</argument> <argument>-application</argument>
+				<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
+				<argument>-metadataRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-artifactRepository</argument>
+				<argument>file:${argeo.p2.repository}</argument>
+				<argument>-bundles</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-features</argument>
+				<argument>${project.build.directory}</argument>
+				<argument>-compress</argument>
+				<argument>-publishArtifacts</argument> </arguments> </configuration>
+				</plugin>
+			-->
+			<!-- 
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>1.1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>create-repository</id>
+						<id>p2-copyToRepo</id>
 						<phase>deploy</phase>
 						<goals>
-							<goal>exec</goal>
+							<goal>run</goal>
 						</goals>
+						<configuration>
+							<tasks>
+								<mkdir dir="${project.build.directory}/repobase" />
+								<copy todir="${project.build.directory}/repobase">
+									<fileset dir="${project.build.directory}/lib">
+										<include name="*.jar" />
+									</fileset>
+									<fileset dir="${project.build.directory}/libsrc">
+										<include name="*.jar" />
+									</fileset>
+								</copy>
+								<exec executable="${argeo.p2.cmd}">
+									<arg value="-noSplash" />
+									<arg value="-application" />
+									<arg value="org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+									<arg value="-metadataRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-artifactRepository" />
+									<arg value="file:${argeo.p2.repository}" />
+									<arg value="-bundles" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-features" />
+									<arg value="${project.build.directory}/repobase" />
+									<arg value="-compress" />
+									<arg value="-publishArtifacts" />
+								</exec>
+
+							</tasks>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<executable>${argeo.p2.cmd}</executable>
-					<!-- optional -->
-					<workingDirectory>/tmp</workingDirectory>
-					<arguments>
-						<argument>-noSplash</argument>
-						<argument>-application</argument>
-						<argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
-						<argument>-metadataRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-artifactRepository</argument>
-						<argument>file:${argeo.p2.repository}</argument>
-						<argument>-bundles</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-features</argument>
-						<argument>${project.build.directory}</argument>
-						<argument>-compress</argument>
-						<argument>-publishArtifacts</argument>
-					</arguments>
-				</configuration>
 			</plugin>
+			 -->
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk</artifactId>
+			<artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
@@ -174,7 +205,7 @@
 			<properties>
 				<package.version>${project.version}</package.version>
 				<distribution.label>argeo</distribution.label>
-				<distribution.root>/var/argeo/linux/argeo-el/5/argeo/testing/</distribution.root>
+				<distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
 			</properties>
 			<build>
 				<plugins>
@@ -194,7 +225,7 @@
 						<executions>
 							<execution>
 								<id>rpm-sdk</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -291,7 +322,7 @@
 							</execution>
 							<execution>
 								<id>rpm-devel</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -321,7 +352,7 @@
 							</execution>
 							<execution>
 								<id>rpm-demo</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -338,12 +369,11 @@
 												<source>
 													<location>../../demo/site</location>
 													<includes>
-														<include>**</include>
+														<include>org.argeo.*/**</include>
 													</includes>
 													<excludes>
 														<exclude>pom.xml</exclude>
 														<exclude>target</exclude>
-														<exclude>target/*</exclude>
 														<exclude>.svn</exclude>
 														<exclude>**/.svn/**</exclude>
 													</excludes>
@@ -358,18 +388,21 @@
 							</execution>
 						</executions>
 					</plugin>
+<!-- 
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 						<executions>
 							<execution>
 								<id>rpm-copyToRepo</id>
-								<phase>install</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>run</goal>
 								</goals>
 								<configuration>
 									<tasks>
+										<mkdir dir="${distribution.root}/i386" />
+										<mkdir dir="${distribution.root}/x86_64" />
 										<delete verbose="true">
 											<fileset dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" />
 										</delete>
@@ -396,6 +429,7 @@
 							</execution>
 						</executions>
 					</plugin>
+ -->
 				</plugins>
 			</build>