From 725f4e6f317abd989a2bad63403745a5c47d6067 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 13 Feb 2012 13:15:04 +0000
Subject: [PATCH] Improve RPM build

git-svn-id: https://svn.argeo.org/slc/trunk@5068 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.backend/pom.xml         | 23 +----
 dep/org.argeo.slc.dep.rap/pom.xml             | 30 ++++---
 dep/org.argeo.slc.dep.rcp/pom.xml             | 20 +++++
 dist/pom.xml                                  |  3 +-
 dist/slc-maven/pom.xml                        | 17 +---
 dist/slc-maven/src/main/scripts/preremove     |  4 -
 dist/slc/pom.xml                              | 83 +++++++++----------
 .../src/main/rpm/var/lib/slc/.m2/settings.xml |  0
 dist/slc/src/main/scripts/preremove-5         |  4 +
 dist/slc/src/main/scripts/preremove-6         |  4 +
 10 files changed, 92 insertions(+), 96 deletions(-)
 delete mode 100644 dist/slc-maven/src/main/scripts/preremove
 rename dist/{slc-maven => slc}/src/main/rpm/var/lib/slc/.m2/settings.xml (100%)

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 6aaa71d47..3c46f14cd 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -197,26 +197,6 @@
 							</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>
@@ -270,6 +250,9 @@
 											</dependency>
 										</mapping>
 									</mappings>
+									<requires>
+										<require>argeo-node-tp</require>
+									</requires>
 								</configuration>
 							</execution>
 						</executions>
diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 6a43fdbd5..0b23f2c5b 100644
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -16,16 +16,6 @@
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<executions>
-					<execution>
-						<id>resolve-pde-sources</id>
-						<goals>
-							<goal>pde-sources</goal>
-						</goals>
-						<phase>generate-resources</phase>
-						<configuration>
-							<copyArtifacts>false</copyArtifacts>
-						</configuration>
-					</execution>
 					<execution>
 						<id>generate-descriptors</id>
 						<goals>
@@ -132,5 +122,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>pdeSources</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>resolve-pde-sources</id>
+								<goals>
+									<goal>pde-sources</goal>
+								</goals>
+								<phase>generate-resources</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rcp/pom.xml b/dep/org.argeo.slc.dep.rcp/pom.xml
index 4bbd58c1f..8705de43f 100644
--- a/dep/org.argeo.slc.dep.rcp/pom.xml
+++ b/dep/org.argeo.slc.dep.rcp/pom.xml
@@ -156,5 +156,25 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>pdeSources</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>resolve-pde-sources</id>
+								<goals>
+									<goal>pde-sources</goal>
+								</goals>
+								<phase>generate-resources</phase>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/dist/pom.xml b/dist/pom.xml
index f8e395022..2f5631587 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -30,7 +30,8 @@
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
+										<copy todir="${rpm.stagingRepository}" verbose="true"
+											failonerror="false">
 											<fileset dir="${project.build.directory}/rpm"
 												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
diff --git a/dist/slc-maven/pom.xml b/dist/slc-maven/pom.xml
index b12644bb5..42d7d13ac 100644
--- a/dist/slc-maven/pom.xml
+++ b/dist/slc-maven/pom.xml
@@ -47,24 +47,9 @@
 												</includes>
 											</dependency>
 										</mapping>
-										<mapping>
-											<directory>/var/lib/slc/.m2</directory>
-											<username>slc</username>
-											<groupname>slc</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>src/main/var/lib/slc/.m2</location>
-												</source>
-											</sources>
-										</mapping>
 									</mappings>
-									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
-									</preremoveScriptlet>
 									<requires>
-										<require>slc</require>
+										<require>slc-libs</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dist/slc-maven/src/main/scripts/preremove b/dist/slc-maven/src/main/scripts/preremove
deleted file mode 100644
index cbeb21191..000000000
--- a/dist/slc-maven/src/main/scripts/preremove
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ $1 = "0" ];then
-	APP=slc
-	rm -rf /var/lib/$APP/.m2/repository
-fi
diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index bf7ea8ce0..3e79303d2 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -10,31 +10,31 @@
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
 	<name>SLC Node (RPM)</name>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>filter-base</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/base</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/base</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<!-- 	<build> -->
+<!-- 		<plugins> -->
+<!-- 			<plugin> -->
+<!-- 				<artifactId>maven-resources-plugin</artifactId> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						<id>filter-base</id> -->
+<!-- 						<phase>process-resources</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>copy-resources</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<outputDirectory>${basedir}/target/base</outputDirectory> -->
+<!-- 							<resources> -->
+<!-- 								<resource> -->
+<!-- 									<directory>src/main/base</directory> -->
+<!-- 									<filtering>true</filtering> -->
+<!-- 								</resource> -->
+<!-- 							</resources> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
+<!-- 		</plugins> -->
+<!-- 	</build> -->
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
@@ -103,6 +103,19 @@
 												</source>
 											</sources>
 										</mapping>
+										<!-- Maven (even if not installed) -->
+										<mapping>
+											<directory>/var/lib/slc/.m2</directory>
+											<username>slc</username>
+											<groupname>slc</groupname>
+											<filemode>600</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/var/lib/slc/.m2</location>
+												</source>
+											</sources>
+										</mapping>
 									</mappings>
 									<preinstallScriptlet>
 										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
@@ -122,26 +135,6 @@
 							</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>
diff --git a/dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml b/dist/slc/src/main/rpm/var/lib/slc/.m2/settings.xml
similarity index 100%
rename from dist/slc-maven/src/main/rpm/var/lib/slc/.m2/settings.xml
rename to dist/slc/src/main/rpm/var/lib/slc/.m2/settings.xml
diff --git a/dist/slc/src/main/scripts/preremove-5 b/dist/slc/src/main/scripts/preremove-5
index e5532dbc5..b842b9cb9 100644
--- a/dist/slc/src/main/scripts/preremove-5
+++ b/dist/slc/src/main/scripts/preremove-5
@@ -2,5 +2,9 @@ if [ $1 = "0" ];then
 	#APP=%{name} => doesn't work
 	APP=slc
 	/sbin/chkconfig --del $APP
+	
+	# Maven
+	rm -rf /var/lib/$APP/.m2/repository
+	
 	#userdel $APP
 fi
diff --git a/dist/slc/src/main/scripts/preremove-6 b/dist/slc/src/main/scripts/preremove-6
index e5532dbc5..b79d26175 100644
--- a/dist/slc/src/main/scripts/preremove-6
+++ b/dist/slc/src/main/scripts/preremove-6
@@ -2,5 +2,9 @@ if [ $1 = "0" ];then
 	#APP=%{name} => doesn't work
 	APP=slc
 	/sbin/chkconfig --del $APP
+
+	# Maven
+	rm -rf /var/lib/$APP/.m2/repository
+
 	#userdel $APP
 fi
-- 
2.39.2