X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=0716ae9b8eb68af8f34a100468dfb61053179acc;hb=07df1587079d0e87b9913464e453cd585cf4b0f1;hp=adaf54d556636c26391aac0f03c82b59985c0e2c;hpb=f4451c149977fac5112c685b57accb635997399a;p=jalview.git

diff --git a/build.gradle b/build.gradle
index adaf54d..0716ae9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ ext {
   getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
   getdownLauncher = jalviewDir + '/' + getdown_launcher
-  getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+  getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
   getdownLib1 = jalviewDir + '/' + getdown_lib1
   def getdownChannel = getdown_channel_name
   if (getdown_channel_name.equals("COMMIT")) {
@@ -700,6 +700,8 @@ task getdownWebsite() {
       }
     }
 
+    // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
+    /*
     if (JAVA_VERSION.equals("11")) {
       def j11libFiles = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"]).getFiles()
       j11libFiles.sort().each{f ->
@@ -711,8 +713,10 @@ task getdownWebsite() {
         }
       }
     }
+    */
 
-    getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
+    //moved getdown_launcher into dist
+    //getdownTextString += "code = " + packageDir + '/' + file(getdownLauncher).getName() + "\n"
     getdownTextString += "class = " + mainClass + "\n"
 
     def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
@@ -725,22 +729,12 @@ task getdownWebsite() {
 
     copy {
       from getdownLauncher
-      into project.ext.getdownWebsiteDir
-    }
-
-    copy {
-      from getdownLauncher
-      into project.ext.getdownFilesDir
-    }
-
-    copy {
-      from getdownLib1
-      into project.ext.getdownFilesDir
+      into project.ext.getdownFilesDir + '/' + packageDir
     }
 
     copy {
       from getdownLib1
-      into project.ext.getdownWebsiteDir
+      into project.ext.getdownFilesDir + '/' + packageDir
     }
 
     copy {
@@ -811,7 +805,7 @@ task copyInstall4jTemplate(type: Copy) {
     include install4jTemplate
     rename (install4jTemplate, install4jConfFile)
     filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_VERSION])
-    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['JAVA_VERSION': JAVA_VERSION, 'VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
   }
   into install4jDir
   inputs.files("$install4jDir/$install4jTemplate")