[java-idp-jetty-base] 18/23: GEN-330 Build Windows installers in our standard flow
Rod Widdowson
rdw at steadingsoftware.com
Sat Jun 22 14:09:32 UTC 2024
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/IDP-2285
in repository java-idp-jetty-base.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=9e108820668ce1151ff13aff2ff4ad9ff67039a8
commit 9e108820668ce1151ff13aff2ff4ad9ff67039a8
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Nov 3 16:22:11 2023 +0000
GEN-330 Build Windows installers in our standard flow
https://shibboleth.atlassian.net/browse/GEN-330
Soup-to-nuts build of jetty base msi installer in maven
---
.gitignore | 4 ++
src/main/wix/.gitignore | 3 +-
src/main/wix/pom.xml | 175 -----------------------------------------------
src/main/wix/wix.vcxproj | 6 +-
4 files changed, 9 insertions(+), 179 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0056eeb..b493be2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,8 @@
.settings
.classpath
.project
+<<<<<<< HEAD
/bin/
+=======
+
+>>>>>>> dc72902 (GEN-330 Build Windows installers in our standard flow)
diff --git a/src/main/wix/.gitignore b/src/main/wix/.gitignore
index ead7edb..53d13f9 100644
--- a/src/main/wix/.gitignore
+++ b/src/main/wix/.gitignore
@@ -7,4 +7,5 @@
*.wixpdb
/bin
/obj
-.wix
\ No newline at end of file
+/wixobj
+.wix
diff --git a/src/main/wix/pom.xml b/src/main/wix/pom.xml
deleted file mode 100644
index 8bd8048..0000000
--- a/src/main/wix/pom.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>net.shibboleth</groupId>
- <artifactId>parent</artifactId>
- <version>17.0.2-SNAPSHOT</version>
- </parent>
-
- <name>Windows Installer for jetty base</name>
- <description>
- A SAML Identity Provider and CAS login service implementation
- with robust extensibility to other protocols.
- </description>
-
- <groupId>net.shibboleth.idp</groupId>
- <artifactId>idp-jetty-base-installer</artifactId>
- <packaging>pom</packaging>
- <version>11.0.17-WINDOWS-SNAPSHOT</version>
-
- <properties>
- <procrun.groupId>commons-daemon</procrun.groupId>
- <procrun.artifactId>commons-daemon</procrun.artifactId>
- <procrun.version>1.3.4</procrun.version>
- <procrun.classifier>bin-windows</procrun.classifier>
- <jetty-base.groupId>net.shibboleth.idp</jetty-base.groupId>
- <jetty-base.artifactId>idp-jetty-base</jetty-base.artifactId>
- <jetty-base.version>11.0.16-WINDOWS</jetty-base.version>
- <jetty.version>11.0.16</jetty.version>
- <maven-dist-enforcer-data.version>1.0.14</maven-dist-enforcer-data.version>
- </properties>
-
- <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>
diff --git a/src/main/wix/wix.vcxproj b/src/main/wix/wix.vcxproj
index 3c48a4f..5c9c681 100644
--- a/src/main/wix/wix.vcxproj
+++ b/src/main/wix/wix.vcxproj
@@ -10,9 +10,9 @@
<InstallerPlatform>x64</InstallerPlatform>
<HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
<HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
- <JettyBaseUnpackDir>target\jetty-base\jetty-base</JettyBaseUnpackDir>
- <JettyUnpackDir>target\jetty\jetty-home-$(JettyVersion)</JettyUnpackDir>
- <ProcrunUnpackDir>target\procrun</ProcrunUnpackDir>
+ <JettyBaseUnpackDir>..\..\..\target\idp-jetty-base</JettyBaseUnpackDir>
+ <JettyUnpackDir>..\..\..\target\jetty-home-$(JettyVersion)</JettyUnpackDir>
+ <ProcrunUnpackDir>..\..\..\target\procrun</ProcrunUnpackDir>
<DefineConstants>ProcrunSrc=$(ProcrunUnpackDir);jettyBaseSrc=$(JettyBaseUnpackDir);jettySrc=$(JettyUnpackDir)</DefineConstants>
<SuppressIces>ICE61</SuppressIces>
</PropertyGroup>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list