diff options
| author | Francois Aïssaoui | 2015-04-15 11:44:09 +0000 |
|---|---|---|
| committer | Francois Aïssaoui | 2015-04-15 11:44:09 +0000 |
| commit | 1d0f45c6d96f24309eb400dd7adce137f7787f34 (patch) | |
| tree | cf78c1df4de476518dcc8d222fbb5a5bc6ee68a4 | |
| parent | 6c6c2c22c1e0e026c5b9a0dc1ea11167908b4ffd (diff) | |
| download | org.eclipse.om2m-1d0f45c6d96f24309eb400dd7adce137f7787f34.tar.gz org.eclipse.om2m-1d0f45c6d96f24309eb400dd7adce137f7787f34.tar.xz org.eclipse.om2m-1d0f45c6d96f24309eb400dd7adce137f7787f34.zip | |
[BUGFIX] Copy of scripts in products with command line maven
Fixed: #464626
Change-Id: I20be7540c130eec78b396f08b83938242530b0d3
Signed-off-by: Francois Aïssaoui <aissaoui@laas.fr>
| -rw-r--r-- | org.eclipse.om2m.site.gscl/pom.xml | 30 | ||||
| -rw-r--r-- | org.eclipse.om2m.site.nscl/pom.xml | 30 |
2 files changed, 34 insertions, 26 deletions
diff --git a/org.eclipse.om2m.site.gscl/pom.xml b/org.eclipse.om2m.site.gscl/pom.xml index f2225ebf..1258d9e2 100644 --- a/org.eclipse.om2m.site.gscl/pom.xml +++ b/org.eclipse.om2m.site.gscl/pom.xml @@ -46,29 +46,33 @@ </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
- <id>copy-resources</id>
- <phase>validate</phase>
+ <phase>install</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/gscl/${osgi.os}/${osgi.ws}/${osgi.arch}</outputDirectory>
- <resources>
- <resource>
- <directory>scripts</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <tasks>
+ <echo>Copying scripts into ${om2m.productType} product</echo>
+ <copy file="${om2m.scriptsLocation}/start.sh" tofile="${om2m.pathToCopy}/start.sh"/>
+ <copy file="${om2m.scriptsLocation}/start.bat" tofile="${om2m.pathToCopy}/start.bat"/>
+ </tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
+ <properties>
+ <om2m.pathToCopy>${basedir}/target/products/${om2m.productType}/${osgi.os}/${osgi.ws}/${osgi.arch}</om2m.pathToCopy>
+ <om2m.scriptsLocation>${basedir}/scripts</om2m.scriptsLocation>
+ <om2m.productType>gscl</om2m.productType>
+ </properties>
</project>
diff --git a/org.eclipse.om2m.site.nscl/pom.xml b/org.eclipse.om2m.site.nscl/pom.xml index 8be848c6..119e90f3 100644 --- a/org.eclipse.om2m.site.nscl/pom.xml +++ b/org.eclipse.om2m.site.nscl/pom.xml @@ -45,29 +45,33 @@ </execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<executions>
<execution>
- <id>copy-resources</id>
- <phase>validate</phase>
+ <phase>install</phase>
<goals>
- <goal>copy-resources</goal>
+ <goal>run</goal>
</goals>
<configuration>
- <outputDirectory>${basedir}/target/products/nscl/${osgi.os}/${osgi.ws}/${osgi.arch}</outputDirectory>
- <resources>
- <resource>
- <directory>scripts</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
+ <tasks>
+ <echo>Copying scripts into ${om2m.productType} product</echo>
+ <copy file="${om2m.scriptsLocation}/start.sh" tofile="${om2m.pathToCopy}/start.sh"/>
+ <copy file="${om2m.scriptsLocation}/start.bat" tofile="${om2m.pathToCopy}/start.bat"/>
+ </tasks>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
+ <properties>
+ <om2m.pathToCopy>${basedir}/target/products/${om2m.productType}/${osgi.os}/${osgi.ws}/${osgi.arch}</om2m.pathToCopy>
+ <om2m.scriptsLocation>${basedir}/scripts</om2m.scriptsLocation>
+ <om2m.productType>nscl</om2m.productType>
+ </properties>
</project>
|