Skip to content

Commit

Permalink
Issue jawi#187: add separate profiles for Windows;
Browse files Browse the repository at this point in the history 
- windows specific parts can now be activated by adding
  `-P windowsPlatform` to the maven command.
  • Loading branch information
Jan Willem Janssen committed Jul 29, 2013
1 parent 75f816d commit e9b5601
Show file tree
Hide file tree
Showing 4 changed files with 257 additions and 157 deletions.
132 changes: 87 additions & 45 deletions ols.distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
<artifactId>org.apache.felix.configadmin</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>looks</artifactId>
Expand Down Expand Up @@ -67,11 +67,11 @@
<artifactId>client</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols.client</groupId>
<artifactId>client.project</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols.client</groupId>
<artifactId>client.project</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>logging</artifactId>
Expand All @@ -82,11 +82,11 @@
<artifactId>service.acquisition</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>service.io</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>service.io</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>service.taskexecution</artifactId>
Expand All @@ -97,11 +97,11 @@
<artifactId>lib.mydoggy</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>util</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>util</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols</groupId>
<artifactId>test.util</artifactId>
Expand Down Expand Up @@ -177,11 +177,11 @@
<artifactId>serialconsole</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols.tool</groupId>
<artifactId>linedecoder</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols.tool</groupId>
<artifactId>linedecoder</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>nl.lxtreme.ols.export</groupId>
<artifactId>image</artifactId>
Expand Down Expand Up @@ -245,26 +245,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/assembly/api-assembly.xml</descriptor>
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
<finalName>ols-${ols.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
Expand Down Expand Up @@ -295,4 +275,66 @@
</resource>
</resources>
</build>
<profiles>
<profile>
<id>windowsPlatform</id>
<activation>
<os>
<family>windows</family>
</os>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/assembly/assemblyWin.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
<finalName>ols-${ols.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>${basedir}/src/main/assembly/api-assembly.xml</descriptor>
<descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
<finalName>ols-${ols.version}</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
1 change: 0 additions & 1 deletion ols.distribution/src/main/assembly/assembly.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<id>full</id>
<formats>
<format>dir</format>
<format>zip</format>
<format>tar.gz</format>
</formats>
<dependencySets>
Expand Down
117 changes: 117 additions & 0 deletions ols.distribution/src/main/assembly/assemblyWin.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>full</id>
<formats>
<format>zip</format>
</formats>
<dependencySets>
<dependencySet>
<!-- exclude the (non-existing) project artifacts of *this* project. -->
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>bin</outputDirectory>
<includes>
<include>org.apache.felix:org.apache.felix.main</include>
<include>org.apache.felix:org.apache.felix.fileinstall</include>
<include>org.apache.felix:org.apache.felix.configadmin</include>
<include>com.jgoodies:looks</include>
<include>nl.lxtreme.ols:runner</include>
</includes>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
</dependencySet>

<dependencySet>
<!-- exclude the (non-existing) project artifacts of *this* project. -->
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>plugins</outputDirectory>
<includes>
<include>org.osgi:org.osgi.compendium</include>
<include>org.apache.felix:org.apache.felix.log</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.felix:org.apache.felix.dependencymanager</include>
<include>nl.lxtreme.ols:lib.mydoggy</include>
<include>nl.lxtreme.ols:api</include>
<include>nl.lxtreme.ols:client</include>
<include>nl.lxtreme.ols.client:client.project</include>
<include>nl.lxtreme.ols:logging</include>
<include>nl.lxtreme.ols:service.acquisition</include>
<include>nl.lxtreme.ols:service.io</include>
<include>nl.lxtreme.ols:service.taskexecution</include>
<include>nl.lxtreme.ols:util</include>
<include>nl.lxtreme.ols:org.rxtx</include>
<include>nl.lxtreme.ols.device:test</include>
<include>nl.lxtreme.ols.device:generic</include>
<include>nl.lxtreme.ols.device:logicsniffer</include>
<include>nl.lxtreme.ols.tool:1wire</include>
<include>nl.lxtreme.ols.tool:asm45</include>
<include>nl.lxtreme.ols.tool:base</include>
<include>nl.lxtreme.ols.tool:i2c</include>
<include>nl.lxtreme.ols.tool:jtag</include>
<include>nl.lxtreme.ols.tool:spi</include>
<include>nl.lxtreme.ols.tool:state</include>
<include>nl.lxtreme.ols.tool:uart</include>
<include>nl.lxtreme.ols.tool:dmx512</include>
<include>nl.lxtreme.ols.tool:linedecoder</include>
<include>nl.lxtreme.ols.tool:serialconsole</include>
<include>nl.lxtreme.ols.export:image</include>
<include>nl.lxtreme.ols.export:vcd</include>
<include>nl.lxtreme.ols.export:csv</include>
</includes>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
</dependencySet>
</dependencySets>

<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/config</directory>
<outputDirectory>plugins</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>*.cfg</include>
</includes>
<lineEnding>unix</lineEnding>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/doc</directory>
<outputDirectory>doc</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**</include>
</includes>
<lineEnding>dos</lineEnding>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>AUTHOR</include>
<include>README</include>
<include>LICENSE</include>
<include>CHANGELOG</include>
<include>run.bat</include>
</includes>
<lineEnding>dos</lineEnding>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>run.sh</include>
</includes>
<lineEnding>unix</lineEnding>
<directoryMode>0755</directoryMode>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
</assembly>
Loading

0 comments on commit e9b5601

Please sign in to comment.