Merge branch 'bug/JAL-3962_awt_dll_problem' into develop

diff --git a/utils/download_jres.sh b/utils/download_jres.sh
index 8029e82..26442ea 100755 (executable)
--- a/utils/download_jres.sh
+++ b/utils/download_jres.sh
@@ -103,6 +103,7 @@ for FEATURE_VERSION in 8 11 17; do
             # make symbolic link with _ instead of - for install4j9
             NEWNAME=${NAME//-/_}
             echo "Linking from ${NEWNAME}.${EXT} for install4j9"
+            [ -e "${ARCHIVEDIR}/${NEWNAME}.${EXT}" ] && $RM "${ARCHIVEDIR}/${NEWNAME}.${EXT}"
             ln -s "${NAME}.${EXT}" "${ARCHIVEDIR}/${NEWNAME}.${EXT}"
             ;;
           *)

diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j
index 79f99bf..6b07bfc 100644 (file)
--- a/utils/install4j/install4j9_template.install4j
+++ b/utils/install4j/install4j9_template.install4j
@@ -160,6 +160,10 @@
           <archive location="getdown-launcher.jar" />
           <archive location="${compiler:GETDOWN_INSTALL_DIR}/getdown-launcher.jar" failOnError="false" />
         </classPath>
+        <nativeLibraryDirectories>
+          <directory name="${compiler:JRE_DIR}/bin" />
+          <directory name="${compiler:GETDOWN_DIST_DIR}" />
+        </nativeLibraryDirectories>
       </java>
       <macStaticAssociationActions mode="selected">
         <id>2350</id>