JAL-3130 moved resources/install4j to utils/install4j

diff --git a/gradle.properties b/gradle.properties
index 15d1e1d..c794c66 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -52,7 +52,7 @@ getdown_launcher = getdown/lib/getdown-launcher.jar
 getdown_core = getdown/lib/getdown-core-1.8.3-SNAPSHOT.jar
 getdown_base_txt = getdown/files/getdown.txt
 getdown_txt_title = Jalview
-getdown_txt_appbase = http://www.compbio.dundee.ac.ukhttp://www.jalview.org/getdown/jalview/DEV
+getdown_txt_appbase = http://www.jalview.org/getdown/jalview/DEV
 getdown_txt_allow_offline = true
 getdown_txt_jvmmempc = 95
 getdown_txt_strict_comments = true
@@ -88,6 +88,6 @@ Linux_JRE11 = OpenJDK11-jre_x64_linux_hotspot_11_28/jdk-11+28-jre
 j11libDir = j11lib
 j11modules = com.sun.istack.runtime,com.sun.xml.bind,com.sun.xml.fastinfoset,com.sun.xml.streambuffer,com.sun.xml.txw2,com.sun.xml.ws.policy,java.activation,java.annotation,java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.management.rmi,java.naming,java.prefs,java.rmi,java.scripting,java.security.sasl,java.sql,java.xml,java.xml.bind,java.xml.soap,java.xml.ws,javax.jws,jdk.httpserver,jdk.jsobject,jdk.unsupported,jdk.xml.dom,org.jvnet.mimepull,org.jvnet.staxex,javax.servlet.api,java.ws.rs
 
-install4jResourceDir = resources/install4j
+install4jResourceDir = utils/install4j
 install4jConf = jalview_getdown.install4j
 install4jBuildDir = build/install4j

diff --git a/resources/install4j/DS_Store b/utils/install4j/DS_Store
similarity index 100%
rename from resources/install4j/DS_Store
rename to utils/install4j/DS_Store

diff --git a/resources/install4j/jalview_dmg_background.png b/utils/install4j/jalview_dmg_background.png
similarity index 100%
rename from resources/install4j/jalview_dmg_background.png
rename to utils/install4j/jalview_dmg_background.png

diff --git a/resources/install4j/jalview_dmg_background1.png b/utils/install4j/jalview_dmg_background1.png
similarity index 100%
rename from resources/install4j/jalview_dmg_background1.png
rename to utils/install4j/jalview_dmg_background1.png

diff --git a/resources/install4j/jalview_dmg_background1.xcf b/utils/install4j/jalview_dmg_background1.xcf
similarity index 100%
rename from resources/install4j/jalview_dmg_background1.xcf
rename to utils/install4j/jalview_dmg_background1.xcf

diff --git a/resources/install4j/jalview_dmg_background2.png b/utils/install4j/jalview_dmg_background2.png
similarity index 100%
rename from resources/install4j/jalview_dmg_background2.png
rename to utils/install4j/jalview_dmg_background2.png

diff --git a/resources/install4j/jalview_dmg_background3.png b/utils/install4j/jalview_dmg_background3.png
similarity index 100%
rename from resources/install4j/jalview_dmg_background3.png
rename to utils/install4j/jalview_dmg_background3.png

diff --git a/resources/install4j/jalview_getdown.install4j b/utils/install4j/jalview_getdown.install4j
similarity index 99%
rename from resources/install4j/jalview_getdown.install4j
rename to utils/install4j/jalview_getdown.install4j
index fed85e9..dca129b 100644 (file)
--- a/resources/install4j/jalview_getdown.install4j
+++ b/utils/install4j/jalview_getdown.install4j
@@ -1695,8 +1695,8 @@ return console.askYesNo(message, true);
       </autoUpdate>
       <topLevelFiles>
         <symlink name="&quot; &quot;" target="/Applications" />
-        <file name=".background/jalview_dmg_background.png" file="../../resources/install4j/jalview_dmg_background.png" />
-        <file name=".DS_Store" file="../../resources/install4j/DS_Store" />
+        <file name=".background/jalview_dmg_background.png" file="./jalview_dmg_background.png" />
+        <file name=".DS_Store" file="./DS_Store" />
         <symlink name="Jalview.app/Contents/Resources/app/java_vm" target="../jre.bundle/Contents/Home" />
       </topLevelFiles>
     </macosArchive>