Change which JREs are included in different ZIP distributions for Win…

…dows

- zip-win: only 64 bit JRE (in "jre" folder)
- dir-word-addin: 64 bit JRE in "jre" folder and 32 bit JRE in "jre32"
  folder

The 64 bit JRE is the default. The "jre" folder is automatically found
by the launch script, the "jre32" folder isn't. The 32 bit JRE can
optionally be used in order to get access to 32 bit TTS voices.

src/main/assembly/components/jre-win32.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<component>
+  <fileSets>
+    <fileSet>
+      <directory>target/maven-jlink/classifiers/jre-win32</directory>
+      <outputDirectory>jre</outputDirectory>
+    </fileSet>
+  </fileSets>
+</component>

src/main/assembly/components/jre-win.xml → src/main/assembly/components/jre-win64+32.xml

@@ -2,14 +2,12 @@
 <component>
   <fileSets>
     <fileSet>
-      <directory>target/maven-jlink/classifiers/jre-win32</directory>
-      <outputDirectory>jre32</outputDirectory>
+      <directory>target/maven-jlink/classifiers/jre-win64</directory>
+      <outputDirectory>jre</outputDirectory>
     </fileSet>
     <fileSet>
-      <directory>target/maven-jlink/classifiers/jre-win64</directory>
-      <outputDirectory>jre64</outputDirectory>
+      <directory>target/maven-jlink/classifiers/jre-win32</directory>
+      <outputDirectory>jre32</outputDirectory>
     </fileSet>
   </fileSets>
 </component>
-
-

src/main/assembly/components/jre-win64.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<component>
+  <fileSets>
+    <fileSet>
+      <directory>target/maven-jlink/classifiers/jre-win64</directory>
+      <outputDirectory>jre</outputDirectory>
+    </fileSet>
+  </fileSets>
+</component>

src/main/assembly/dist-win.xml

@@ -13,6 +13,6 @@
       <componentDescriptor>src/main/assembly/components/jars-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/cli-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/updater-win.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/jre-win.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/jre-win64.xml</componentDescriptor>
   </componentDescriptors>
 </assembly>

src/main/assembly/dist-word-addin.xml

@@ -11,6 +11,6 @@
       <componentDescriptor>src/main/assembly/components/jars.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/jars-win.xml</componentDescriptor>
       <componentDescriptor>src/main/assembly/components/simple-api.xml</componentDescriptor>
-      <componentDescriptor>src/main/assembly/components/jre-win.xml</componentDescriptor>
+      <componentDescriptor>src/main/assembly/components/jre-win64+32.xml</componentDescriptor>
   </componentDescriptors>
 </assembly>