Fixes #14090: rudder-server-relay fail to build

Normation · Jan 4, 2019 · b74deb4 · b74deb4
1 parent 8526e23
commit b74deb4
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/rudder-webapp/SOURCES/Makefile b/rudder-webapp/SOURCES/Makefile
@@ -110,18 +110,18 @@ maven/bin/mvn:
 rudder.war: maven/bin/mvn rudder-sources endpoint.war
 	maven/bin/mvn -s settings-external.xml --batch-mode org.apache.maven.plugins:maven-dependency-plugin:3.0.0:copy -Dmaven.repo.local=.m2/repository -Dartifact=com.normation.rudder:rudder-web:$$(sed -n '/<parent>/,/<.parent>/s/.*<version>\(.*\)<.version>.*/\1/p' rudder-sources/rudder/pom.xml):war -DoutputDirectory=. && mv rudder-web*.war rudder.war $(NEXUS_IGNORE)
 ifeq (false,$(NRM))
-	cd rudder-sources/rudder            && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
-	mv rudder-sources/rudder/rudder-web/target/rudder-web*.war rudder.war
+	[ ! -f rudder.war ] && cd rudder-sources/rudder            && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
+	[ ! -f rudder.war ] && mv rudder-sources/rudder/rudder-web/target/rudder-web*.war rudder.war
 endif
 
 endpoint.war: maven/bin/mvn rudder-sources
 	maven/bin/mvn -s settings-external.xml --batch-mode org.apache.maven.plugins:maven-dependency-plugin:3.0.0:copy -Dmaven.repo.local=.m2/repository  -Dartifact=com.normation.inventory:inventory-provisioning-web:$$(sed -n '/<parent>/,/<.parent>/s/.*<version>\(.*\)<.version>.*/\1/p' rudder-sources/ldap-inventory/pom.xml):war -DoutputDirectory=. && mv inventory-provisioning-web*.war endpoint.war $(NEXUS_IGNORE)
 ifeq (false,$(NRM))
-	cd rudder-sources/rudder-parent-pom && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
-	cd rudder-sources/rudder-commons    && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
-	cd rudder-sources/scala-ldap        && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
-	cd rudder-sources/ldap-inventory    && maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
-	mv rudder-sources/rudder/rudder-web/target/inventory-provisioning-web*.war endpoint.war
+	[ ! -f endpoint.war ] && cd rudder-sources/rudder-parent-pom && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
+	[ ! -f endpoint.war ] && cd rudder-sources/rudder-commons    && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
+	[ ! -f endpoint.war ] && cd rudder-sources/scala-ldap        && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
+	[ ! -f endpoint.war ] && cd rudder-sources/ldap-inventory    && ../../maven/bin/mvn -s settings-external.xml --batch-mode -Dmaven.repo.local=.m2/repository -Dmaven.test.skip=true -U install
+	[ ! -f endpoint.war ] && mv rudder-sources/rudder/rudder-web/target/inventory-provisioning-web*.war endpoint.war
 endif
 
 rudder-sources.tar.bz2: