X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Forg.argeo.slc.sdk%2Fpom.xml;h=2e33e26fbee0b14efceb87880db01d69c2555308;hb=f48476cba243066d5797b8073c15d6ab6842eb6a;hp=dda3a3196a9ac0f57a73ce58990a6578ab7f2f91;hpb=adfb2e3c36d698aa095cbb61129e4156725eb699;p=gpl%2Fargeo-slc.git

diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml
index dda3a3196..2e33e26fb 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/org.argeo.slc.sdk/pom.xml
@@ -4,11 +4,11 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.12.2-SNAPSHOT</version>
+		<version>0.13.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>org.argeo.slc.sdk</artifactId>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	<name>SLC SDK</name>
 	<properties>
 		<argeo.p2.cmd>/opt/equinox-p2-agent/eclipse</argeo.p2.cmd>
@@ -45,6 +45,7 @@
 							<goal>pde-sources</goal>
 						</goals>
 						<configuration>
+							<copyArtifacts>true</copyArtifacts>
 						</configuration>
 					</execution>
 					<execution>
@@ -110,57 +111,44 @@
 					</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> <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.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> 
+				<executions> <execution> <id>p2-copyToRepo</id> <phase>deploy</phase> <goals> 
+				<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> </plugin> -->
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk</artifactId>
-			<version>${project.version}</version>
+			<artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
+			<version>${version.slc}</version>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
+
 			<activation>
 				<os>
 					<name>Linux</name>
@@ -169,16 +157,18 @@
 					<exists>/usr/bin/rpmbuild</exists>
 				</file>
 			</activation>
+
 			<properties>
-				<package.version>${project.version}</package.version>
+				<package.version>${version.slc}</package.version>
 				<distribution.label>argeo</distribution.label>
-				<distribution.root>/net/cash/srv/yumrepos/argeo-el/5/argeo-testing/</distribution.root>
+				<distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
 			</properties>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
+						<version>2.1-alpha-1</version>
 						<extensions>true</extensions>
 						<configuration>
 							<version>${package.version}</version>
@@ -192,7 +182,7 @@
 						<executions>
 							<execution>
 								<id>rpm-sdk</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -282,12 +272,14 @@
 									</preremoveScriptlet>
 									<requires>
 										<require>java</require>
+										<!-- For the start/stop scripts -->
+										<require>expect</require>
 									</requires>
 								</configuration>
 							</execution>
 							<execution>
 								<id>rpm-devel</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -310,11 +302,14 @@
 											</sources>
 										</mapping>
 									</mappings>
+									<requires>
+										<require>org.argeo.slc.sdk</require>
+									</requires>
 								</configuration>
 							</execution>
 							<execution>
 								<id>rpm-demo</id>
-								<phase>package</phase>
+								<phase>deploy</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -327,15 +322,15 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<configuration>true</configuration>
 											<sources>
 												<source>
 													<location>../../demo/site</location>
 													<includes>
-														<include>**</include>
+														<include>org.argeo.*/**</include>
 													</includes>
 													<excludes>
-														<exclude>*.pom.xml</exclude>
+														<exclude>pom.xml</exclude>
+														<exclude>target</exclude>
 														<exclude>.svn</exclude>
 														<exclude>**/.svn/**</exclude>
 													</excludes>
@@ -343,48 +338,26 @@
 											</sources>
 										</mapping>
 									</mappings>
+									<requires>
+										<require>org.argeo.slc.sdk</require>
+										<!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
+									</requires>
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-copyToRepo</id>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<delete verbose="true">
-											<fileset dir="${distribution.root}" includes="*/org.argeo.slc.sdk-*.rpm" />
-										</delete>
-										<copy todir="${distribution.root}/x86_64" verbose="true">
-											<fileset dir="target">
-												<include name="rpm/*/RPMS/*/*.rpm" />
-											</fileset>
-											<flattenmapper />
-										</copy>
-										<exec executable="/usr/bin/createrepo">
-											<arg value="${distribution.root}/x86_64" />
-										</exec>
-										<copy todir="${distribution.root}/i386" verbose="true">
-											<fileset dir="target">
-												<include name="rpm/*/RPMS/*/*.rpm" />
-											</fileset>
-											<flattenmapper />
-										</copy>
-										<exec executable="/usr/bin/createrepo">
-											<arg value="${distribution.root}/i386" />
-										</exec>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
+					<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> 
+						<executions> <execution> <id>rpm-copyToRepo</id> <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> 
+						<copy todir="${distribution.root}/x86_64" verbose="true"> <fileset dir="target"> 
+						<include name="rpm/*/RPMS/*/*.rpm" /> </fileset> <flattenmapper /> </copy> 
+						<exec executable="/usr/bin/createrepo"> <arg value="${distribution.root}/x86_64" 
+						/> </exec> <copy todir="${distribution.root}/i386" verbose="true"> <fileset 
+						dir="target"> <include name="rpm/*/RPMS/*/*.rpm" /> </fileset> <flattenmapper 
+						/> </copy> <exec executable="/usr/bin/createrepo"> <arg value="${distribution.root}/i386" 
+						/> </exec> </tasks> </configuration> </execution> </executions> </plugin> -->
 				</plugins>
 			</build>