[java-idp-jetty-base] 11/11: WIP
Rod Widdowson
rdw at steadingsoftware.com
Fri Nov 3 13:03:20 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=d76739da6891ddf7c421aa8dc3ac8676e67ade7b
commit d76739da6891ddf7c421aa8dc3ac8676e67ade7b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Nov 1 14:04:53 2023 +0000
WIP
---
.gitignore | 1 +
{src/main/wix => installer}/pom.xml | 4 ++--
installer/src/main/assembly/zip.xml | 19 +++++++++++++++++++
{src => installer/src}/main/wix/.gitignore | 1 +
{src => installer/src}/main/wix/Dialog.bmp | Bin
{src => installer/src}/main/wix/Jetty-Delete.wxs | 0
{src => installer/src}/main/wix/Jetty-Gui.wxs | 0
{src => installer/src}/main/wix/Jetty-InstallDlg.wxs | 0
{src => installer/src}/main/wix/Jetty-Main.wxs | 0
{src => installer/src}/main/wix/Jetty-Procrun.wxs | 0
{src => installer/src}/main/wix/Jetty-User.wxs | 0
{src => installer/src}/main/wix/TopBanner.bmp | Bin
{src => installer/src}/main/wix/license.rtf | 0
{src => installer/src}/main/wix/nuget.config | 0
.../src}/main/wix/scripts/jetty_script.vbs | 0
{src => installer/src}/main/wix/wix.vcxproj | 8 +++++---
16 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 55222fa..e95f56d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@
.DS_store
# Simulated Subversion default ignores end here
/target
+/installer/target
/test-output
.settings
.classpath
diff --git a/src/main/wix/pom.xml b/installer/pom.xml
similarity index 98%
rename from src/main/wix/pom.xml
rename to installer/pom.xml
index 8bd8048..5456177 100644
--- a/src/main/wix/pom.xml
+++ b/installer/pom.xml
@@ -126,7 +126,7 @@
<executable>dotnet</executable>
<arguments>
<argument>clean</argument>
- <argument>wix.vcxproj</argument>
+ <argument>src/main/wix/wix.vcxproj</argument>
</arguments>
</configuration>
</execution>
@@ -141,7 +141,7 @@
<executable>dotnet</executable>
<arguments>
<argument>build</argument>
- <argument>wix.vcxproj</argument>
+ <argument>src/main/wix/wix.vcxproj</argument>
<argument>/p:JettyVersion=${jetty.version}</argument>
</arguments>
</configuration>
diff --git a/installer/src/main/assembly/zip.xml b/installer/src/main/assembly/zip.xml
new file mode 100644
index 0000000..29e7a4f
--- /dev/null
+++ b/installer/src/main/assembly/zip.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+ <id>zip</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>obj/Debug</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>wix.msi</include>
+ </includes>
+ <lineEnding>windows</lineEnding>
+ </fileSet>
+ </fileSets>
+ <includeBaseDirectory>false</includeBaseDirectory>
+</assembly>
diff --git a/src/main/wix/.gitignore b/installer/src/main/wix/.gitignore
similarity index 84%
rename from src/main/wix/.gitignore
rename to installer/src/main/wix/.gitignore
index ead7edb..3744f7d 100644
--- a/src/main/wix/.gitignore
+++ b/installer/src/main/wix/.gitignore
@@ -7,4 +7,5 @@
*.wixpdb
/bin
/obj
+/wixobj
.wix
\ No newline at end of file
diff --git a/src/main/wix/Dialog.bmp b/installer/src/main/wix/Dialog.bmp
similarity index 100%
rename from src/main/wix/Dialog.bmp
rename to installer/src/main/wix/Dialog.bmp
diff --git a/src/main/wix/Jetty-Delete.wxs b/installer/src/main/wix/Jetty-Delete.wxs
similarity index 100%
rename from src/main/wix/Jetty-Delete.wxs
rename to installer/src/main/wix/Jetty-Delete.wxs
diff --git a/src/main/wix/Jetty-Gui.wxs b/installer/src/main/wix/Jetty-Gui.wxs
similarity index 100%
rename from src/main/wix/Jetty-Gui.wxs
rename to installer/src/main/wix/Jetty-Gui.wxs
diff --git a/src/main/wix/Jetty-InstallDlg.wxs b/installer/src/main/wix/Jetty-InstallDlg.wxs
similarity index 100%
rename from src/main/wix/Jetty-InstallDlg.wxs
rename to installer/src/main/wix/Jetty-InstallDlg.wxs
diff --git a/src/main/wix/Jetty-Main.wxs b/installer/src/main/wix/Jetty-Main.wxs
similarity index 100%
rename from src/main/wix/Jetty-Main.wxs
rename to installer/src/main/wix/Jetty-Main.wxs
diff --git a/src/main/wix/Jetty-Procrun.wxs b/installer/src/main/wix/Jetty-Procrun.wxs
similarity index 100%
rename from src/main/wix/Jetty-Procrun.wxs
rename to installer/src/main/wix/Jetty-Procrun.wxs
diff --git a/src/main/wix/Jetty-User.wxs b/installer/src/main/wix/Jetty-User.wxs
similarity index 100%
rename from src/main/wix/Jetty-User.wxs
rename to installer/src/main/wix/Jetty-User.wxs
diff --git a/src/main/wix/TopBanner.bmp b/installer/src/main/wix/TopBanner.bmp
similarity index 100%
rename from src/main/wix/TopBanner.bmp
rename to installer/src/main/wix/TopBanner.bmp
diff --git a/src/main/wix/license.rtf b/installer/src/main/wix/license.rtf
similarity index 100%
rename from src/main/wix/license.rtf
rename to installer/src/main/wix/license.rtf
diff --git a/src/main/wix/nuget.config b/installer/src/main/wix/nuget.config
similarity index 100%
rename from src/main/wix/nuget.config
rename to installer/src/main/wix/nuget.config
diff --git a/src/main/wix/scripts/jetty_script.vbs b/installer/src/main/wix/scripts/jetty_script.vbs
similarity index 100%
rename from src/main/wix/scripts/jetty_script.vbs
rename to installer/src/main/wix/scripts/jetty_script.vbs
diff --git a/src/main/wix/wix.vcxproj b/installer/src/main/wix/wix.vcxproj
similarity index 83%
rename from src/main/wix/wix.vcxproj
rename to installer/src/main/wix/wix.vcxproj
index 3c48a4f..e694375 100644
--- a/src/main/wix/wix.vcxproj
+++ b/installer/src/main/wix/wix.vcxproj
@@ -6,13 +6,15 @@
<PackageReference Include="WixToolset.Heat" Version="4.0.2" />
</ItemGroup>
<PropertyGroup>
+ <AssemblyName>Flibby</AssemblyName>
+ <IntermediateOutputPath>wixobj</IntermediateOutputPath>
<JettyVersion>unspecified</JettyVersion>
<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\jetty-base\jetty-base</JettyBaseUnpackDir>
+ <JettyUnpackDir>..\..\..\target\jetty\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