X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=osgi%2Fdist%2Fosgi-boot%2Fpom.xml;h=6924f56737ad295402d6ffec81e7b5dd7ef568fc;hb=d0b8ffbd1f6628fdefcdf02dbe42fc26884f4a9d;hp=ffb38c60aaf3bfcbf214b80e81a28b54fee5cdae;hpb=87a5c6c8c109097c8be2412f5a10df2de3a6e0c0;p=lgpl%2Fargeo-commons.git

diff --git a/osgi/dist/osgi-boot/pom.xml b/osgi/dist/osgi-boot/pom.xml
index ffb38c60a..6924f5673 100644
--- a/osgi/dist/osgi-boot/pom.xml
+++ b/osgi/dist/osgi-boot/pom.xml
@@ -1,9 +1,8 @@
-<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.commons.osgi</groupId>
-		<version>0.3.4-SNAPSHOT</version>
+		<version>1.1.2-SNAPSHOT</version>
 		<artifactId>dist</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -30,102 +29,161 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>rpm-maven-plugin</artifactId>
-				<version>2.1-alpha-1</version>
-				<extensions>true</extensions>
-				<configuration>
-					<version>${project.version}</version>
-					<release>r${buildNumber}.argeo</release>
-					<copyright>2011 Argeo</copyright>
-					<distribution>argeo</distribution>
-					<packager>mbaudier@argeo.org</packager>
-					<group>Applications/System</group>
-					<prefix>/usr</prefix>
-				</configuration>
-				<executions>
-					<execution>
-						<id>rpm-sdk</id>
-						<phase>package</phase>
-						<goals>
-							<goal>attached-rpm</goal>
-						</goals>
-						<configuration>
-							<mappings>
-								<mapping>
-									<directory>/etc/osgiboot</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>644</filemode>
-									<configuration>true</configuration>
-									<sources>
-										<source>
-											<location>src/main/rpm/etc/osgiboot</location>
-											<includes>
-												<include>*</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/usr/sbin</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>755</filemode>
-									<sources>
-										<source>
-											<location>src/main/rpm/usr/sbin</location>
-											<includes>
-												<include>*</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-								<mapping>
-									<directory>/usr/share/osgiboot/lib</directory>
-									<username>root</username>
-									<groupname>root</groupname>
-									<filemode>644</filemode>
-									<directoryIncluded>false</directoryIncluded>
-									<sources>
-										<source>
-											<location>${project.build.directory}/lib</location>
-											<includes>
-												<include>*.jar</include>
-											</includes>
-										</source>
-									</sources>
-								</mapping>
-							</mappings>
-							<!-- 
-							<postinstallScriptlet>
-								<scriptFile>src/main/scripts/postinstall</scriptFile>
-							</postinstallScriptlet>
-							<preremoveScriptlet>
-								<scriptFile>src/main/scripts/preremove</scriptFile>
-							</preremoveScriptlet>
-							<postremoveScriptlet>
-								<scriptFile>src/main/scripts/postremove</scriptFile>
-							</postremoveScriptlet>
-							 -->
-							<requires>
-										<require>java</require>
-								<!-- For the start/stop scripts 
-								<require>telnet</require>
-								<require>expect</require>-->
-							</requires>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.commons.osgi</groupId>
 			<artifactId>org.argeo.osgi.boot</artifactId>
-			<version>0.3.4-SNAPSHOT</version>
+			<version>1.1.2-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
+	<profiles>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-osgi-boot</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>osgi-boot</name>
+									<copyright>2011 Argeo</copyright>
+									<mappings>
+										<mapping>
+											<directory>/etc/osgiboot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<configuration>noreplace</configuration>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/osgiboot</location>
+													<includes>
+														<include>*-settings.sh</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/etc/osgiboot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/osgiboot</location>
+													<includes>
+														<include>*-functions.sh</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/usr/sbin</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>755</filemode>
+											<sources>
+												<source>
+													<location>src/main/rpm/usr/sbin</location>
+												</source>
+											</sources>
+										</mapping>
+										<mapping>
+											<directory>/usr/share/osgi/boot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib</location>
+													<includes>
+														<include>org.argeo.osgi.boot.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>osgi-boot-equinox</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>install</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<copy todir="${rpm.stagingRepository}" verbose="true">
+											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+											<flattenmapper />
+										</copy>
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-osgi-boot-equinox</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>osgi-boot-equinox</name>
+									<projversion>${version.argeo-distribution}</projversion>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi/boot</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib</location>
+													<includes>
+														<include>org.eclipse.osgi.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>