[java-idp-jetty-base] branch dev/IDP-2147 updated: GEN-330 Build Windows installers in our standard flow
Rod Widdowson
rdw at steadingsoftware.com
Mon Oct 9 10:34:57 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2147
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=209ef88232955e1b68281525c68eb0ee70b7fc4f
The following commit(s) were added to refs/heads/dev/IDP-2147 by this push:
new 209ef88 GEN-330 Build Windows installers in our standard flow
209ef88 is described below
commit 209ef88232955e1b68281525c68eb0ee70b7fc4f
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 9 11:22:34 2023 +0100
GEN-330 Build Windows installers in our standard flow
https://shibboleth.atlassian.net/browse/GEN-330
OS Specific ness
---
src/main/wix/pom.xml | 268 ++++++++++++++++++++++++++-------------------------
1 file changed, 139 insertions(+), 129 deletions(-)
diff --git a/src/main/wix/pom.xml b/src/main/wix/pom.xml
index 01becc9..8bd8048 100644
--- a/src/main/wix/pom.xml
+++ b/src/main/wix/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -34,132 +34,142 @@
<maven-dist-enforcer-data.version>1.0.14</maven-dist-enforcer-data.version>
</properties>
- <!-- Do we need to describe our dependencies. We really only just feed the maven-dependency-plugin -->
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <!-- Unpack procrun -->
- <execution>
- <id>unpack-procrun</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${procrun.groupId}</groupId>
- <artifactId>${procrun.artifactId}</artifactId>
- <version>${procrun.version}</version>
- <classifier>${procrun.classifier}</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/procrun/</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <!-- Unpack Jetty -->
- <execution>
- <id>unpack-jetty</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${jetty.groupId}</groupId>
- <artifactId>jetty-home</artifactId>
- <version>${jetty.version}</version>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/jetty/</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <!-- unpack jetty-base -->
- <execution>
- <id>unpack-jetty-base</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${jetty-base.groupId}</groupId>
- <artifactId>${jetty-base.artifactId}</artifactId>
- <version>${jetty-base.version}</version>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/jetty-base</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>3.1.0</version>
- <!-- clean -->
- <executions>
- <execution>
- <id>clean</id>
- <phase>clean</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>msbuild</executable>
- <executable>dotnet</executable>
- <arguments>
- <argument>clean</argument>
- <argument>wix.vcxproj</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>msbuild</executable>
- <executable>dotnet</executable>
- <arguments>
- <argument>build</argument>
- <argument>wix.vcxproj</argument>
- <argument>/p:JettyVersion=${jetty.version}</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- copy built output to final location -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>move-msi-to-target</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy file="obj/Debug/wix.msi" tofile="${project.build.directory}/${project.build.finalName}.msi"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <profiles>
+ <profile>
+ <id>build-msi</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <!-- Unpack procrun -->
+ <execution>
+ <id>unpack-procrun</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${procrun.groupId}</groupId>
+ <artifactId>${procrun.artifactId}</artifactId>
+ <version>${procrun.version}</version>
+ <classifier>${procrun.classifier}</classifier>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/procrun/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <!-- Unpack Jetty -->
+ <execution>
+ <id>unpack-jetty</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${jetty.groupId}</groupId>
+ <artifactId>jetty-home</artifactId>
+ <version>${jetty.version}</version>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/jetty/</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <!-- unpack jetty-base -->
+ <execution>
+ <id>unpack-jetty-base</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${jetty-base.groupId}</groupId>
+ <artifactId>${jetty-base.artifactId}</artifactId>
+ <version>${jetty-base.version}</version>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/jetty-base</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>3.1.0</version>
+ <!-- clean -->
+ <executions>
+ <execution>
+ <id>clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>msbuild</executable>
+ <executable>dotnet</executable>
+ <arguments>
+ <argument>clean</argument>
+ <argument>wix.vcxproj</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>msbuild</executable>
+ <executable>dotnet</executable>
+ <arguments>
+ <argument>build</argument>
+ <argument>wix.vcxproj</argument>
+ <argument>/p:JettyVersion=${jetty.version}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- copy built output to final location -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>move-msi-to-target</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <copy file="obj/Debug/wix.msi" tofile="${project.build.directory}/${project.build.finalName}.msi"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list