id 'eclipse'
id "com.diffplug.gradle.spotless" version "3.28.0"
id 'com.github.johnrengelman.shadow' version '4.0.3'
- id 'com.install4j.gradle' version '8.0.4'
+ id 'com.install4j.gradle' version '8.0.10'
id 'com.dorongold.task-tree' version '1.5' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree
id 'com.palantir.git-version' version '0.12.3'
}
}
}
- // remove the "Uninstall Old Jalview (optional)" symlink from DMG for non-release DS_Stores
- if (! (CHANNEL == "RELEASE" || CHANNEL == "TEST-RELEASE" ) ) {
- def symlink = install4jConfigXml.'**'.topLevelFiles.symlink.find { sl -> sl.'@name' == "Uninstall Old Jalview (optional).app" }
- symlink.parent().remove(symlink)
- }
-
// write install4j file
install4jConfFile.text = XmlUtil.serialize(install4jConfigXml)
}
'JALVIEW_APPLICATION_NAME': install4jApplicationName,
'JALVIEW_DIR': "../..",
'OSX_KEYSTORE': OSX_KEYSTORE,
+ 'OSX_APPLEID': OSX_APPLEID,
+ 'OSX_ALTOOLPASS': OSX_ALTOOLPASS,
'JSIGN_SH': JSIGN_SH,
'JRE_DIR': getdown_app_dir_java,
'INSTALLER_TEMPLATE_VERSION': install4jTemplateVersion,
if (install4j_faster.equals("true") || CHANNEL.startsWith("LOCAL")) {
faster = true
disableSigning = true
+ disableNotarization = true
}
if (OSX_KEYPASS) {
macKeystorePassword = OSX_KEYPASS
+ }
+
+ if (OSX_ALTOOLPASS) {
+ appleIdPassword = OSX_ALTOOLPASS
+ disableNotarization = false
+ } else {
+ disableNotarization = true
}
doFirst {
println("Using projectFile "+projectFile)
+ if (!disableNotarization) { println("Will notarize OSX App DMG") }
}
+ verbose=true
inputs.dir(getdownWebsiteDir)
inputs.file(install4jConfFile)
OSX_KEYSTORE =
OSX_KEYPASS =
JSIGN_SH = echo
+OSX_APPLEID =
+OSX_ALTOOLPASS =
CHANNEL=LOCAL
getdown_channel_base = https://www.jalview.org/getdown
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleAllowMixedLocalizations</key>
- <true/>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>applet</string>
- <key>CFBundleIconFile</key>
- <string>applet</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.ScriptEditor.id.Uninstall-Old-Jalview</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Uninstall Old Jalview</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>aplt</string>
- <key>LSMinimumSystemVersionByArchitecture</key>
- <dict>
- <key>x86_64</key>
- <string>10.6</string>
- </dict>
- <key>LSRequiresCarbon</key>
- <true/>
- <key>NSAppleEventsUsageDescription</key>
- <string>This script needs to control other applications to run.</string>
- <key>NSAppleMusicUsageDescription</key>
- <string>This script needs access to your music to run.</string>
- <key>NSCalendarsUsageDescription</key>
- <string>This script needs access to your calendars to run.</string>
- <key>NSCameraUsageDescription</key>
- <string>This script needs access to your camera to run.</string>
- <key>NSContactsUsageDescription</key>
- <string>This script needs access to your contacts to run.</string>
- <key>NSHomeKitUsageDescription</key>
- <string>This script needs access to your HomeKit Home to run.</string>
- <key>NSMicrophoneUsageDescription</key>
- <string>This script needs access to your microphone to run.</string>
- <key>NSPhotoLibraryUsageDescription</key>
- <string>This script needs access to your photos to run.</string>
- <key>NSRemindersUsageDescription</key>
- <string>This script needs access to your reminders to run.</string>
- <key>NSSiriUsageDescription</key>
- <string>This script needs access to Siri to run.</string>
- <key>NSSystemAdministrationUsageDescription</key>
- <string>This script needs access to administer this system to run.</string>
- <key>WindowState</key>
- <dict>
- <key>bundleDividerCollapsed</key>
- <true/>
- <key>bundlePositionOfDivider</key>
- <real>0.0</real>
- <key>dividerCollapsed</key>
- <true/>
- <key>eventLogLevel</key>
- <integer>2</integer>
- <key>name</key>
- <string>ScriptWindowState</string>
- <key>positionOfDivider</key>
- <real>421</real>
- <key>savedFrame</key>
- <string>272 342 1754 910 0 0 3360 1867 </string>
- <key>selectedTab</key>
- <string>result</string>
- </dict>
-</dict>
-</plist>
+++ /dev/null
-APPLaplt
\ No newline at end of file
+++ /dev/null
-{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500
-{\fonttbl}
-{\colortbl;\red255\green255\blue255;}
-{\*\expandedcolortbl;;}
-}
\ No newline at end of file
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>files</key>
- <dict>
- <key>Resources/Scripts/main.scpt</key>
- <data>
- KEuZnZPFR5wgwG/qEhXMd5yBoi4=
- </data>
- <key>Resources/applet.icns</key>
- <data>
- vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
- </data>
- <key>Resources/applet.rsrc</key>
- <data>
- oLbJze+WI6mK9fT14HFV6EwFoEI=
- </data>
- <key>Resources/description.rtfd/TXT.rtf</key>
- <data>
- JdCHmFsejhMRQNi2CzUAg7xM/6Q=
- </data>
- </dict>
- <key>files2</key>
- <dict>
- <key>Resources/Scripts/main.scpt</key>
- <dict>
- <key>hash</key>
- <data>
- KEuZnZPFR5wgwG/qEhXMd5yBoi4=
- </data>
- <key>hash2</key>
- <data>
- Y+OMztx129elZ3oX0uhaiMMNU87xhkEPVzSuhF528t0=
- </data>
- </dict>
- <key>Resources/applet.icns</key>
- <dict>
- <key>hash</key>
- <data>
- vIRz6m6+ZxDNfi4iTsXj5rdcZUA=
- </data>
- <key>hash2</key>
- <data>
- D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc=
- </data>
- </dict>
- <key>Resources/applet.rsrc</key>
- <dict>
- <key>hash</key>
- <data>
- oLbJze+WI6mK9fT14HFV6EwFoEI=
- </data>
- <key>hash2</key>
- <data>
- 6bi/D/GzKmLhXbbC8+OLEX9+44Au0XOyGRd+kfw6uzA=
- </data>
- </dict>
- <key>Resources/description.rtfd/TXT.rtf</key>
- <dict>
- <key>hash</key>
- <data>
- JdCHmFsejhMRQNi2CzUAg7xM/6Q=
- </data>
- <key>hash2</key>
- <data>
- e8RCmynIiyJGwHTnWQowZeGP0OUnjjA6SQTvIzP7Hxs=
- </data>
- </dict>
- </dict>
- <key>rules</key>
- <dict>
- <key>^Resources/</key>
- <true/>
- <key>^Resources/.*\.lproj/</key>
- <dict>
- <key>optional</key>
- <true/>
- <key>weight</key>
- <real>1000</real>
- </dict>
- <key>^Resources/.*\.lproj/locversion.plist$</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>1100</real>
- </dict>
- <key>^Resources/Base\.lproj/</key>
- <dict>
- <key>weight</key>
- <real>1010</real>
- </dict>
- <key>^version.plist$</key>
- <true/>
- </dict>
- <key>rules2</key>
- <dict>
- <key>.*\.dSYM($|/)</key>
- <dict>
- <key>weight</key>
- <real>11</real>
- </dict>
- <key>^(.*/)?\.DS_Store$</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>2000</real>
- </dict>
- <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
- <dict>
- <key>nested</key>
- <true/>
- <key>weight</key>
- <real>10</real>
- </dict>
- <key>^.*</key>
- <true/>
- <key>^Info\.plist$</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>20</real>
- </dict>
- <key>^PkgInfo$</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>20</real>
- </dict>
- <key>^Resources/</key>
- <dict>
- <key>weight</key>
- <real>20</real>
- </dict>
- <key>^Resources/.*\.lproj/</key>
- <dict>
- <key>optional</key>
- <true/>
- <key>weight</key>
- <real>1000</real>
- </dict>
- <key>^Resources/.*\.lproj/locversion.plist$</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>1100</real>
- </dict>
- <key>^Resources/Base\.lproj/</key>
- <dict>
- <key>weight</key>
- <real>1010</real>
- </dict>
- <key>^[^/]+$</key>
- <dict>
- <key>nested</key>
- <true/>
- <key>weight</key>
- <real>10</real>
- </dict>
- <key>^embedded\.provisionprofile$</key>
- <dict>
- <key>weight</key>
- <real>20</real>
- </dict>
- <key>^version\.plist$</key>
- <dict>
- <key>weight</key>
- <real>20</real>
- </dict>
- </dict>
-</dict>
-</plist>
<?xml version="1.0" encoding="UTF-8"?>
-<install4j version="8.0.5" transformSequenceNumber="8">
+<install4j version="8.0.10" transformSequenceNumber="8">
<directoryPresets config="../.." />
<application name="${compiler:JALVIEW_APPLICATION_NAME}" applicationId="${compiler:WINDOWS_APPLICATION_ID}" mediaDir="${compiler:BUILD_DIR}" lzmaCompression="true" shortName="${compiler:INTERNAL_ID}" publisher="University of Dundee" publisherWeb="https://www.jalview.org/" version="${compiler:JALVIEW_VERSION}" allPathsRelative="true" macVolumeId="5aac4968c304f65" javaMinVersion="${compiler:JAVA_MIN_VERSION}" javaMaxVersion="9999999999${compiler:JAVA_MAX_VERSION}" allowBetaVM="true" jdkMode="jdk" jdkName="JDK 11.0">
<searchSequence>
<variable name="JALVIEW_DIR" value="../.." />
<variable name="BUILD_DIR" value="${compiler:JALVIEW_DIR}/build/install4j" />
<variable name="OSX_KEYSTORE" />
+ <variable name="OSX_APPLEID" />
<variable name="JSIGN_SH" value="echo" />
<variable name="JRE_DIR" value="jre" description="The folder under the app folder that the JRE will be either copied or unpacked into" />
<variable name="INSTALLER_TEMPLATE_VERSION" value="DEVELOPMENT_default" />
<variable name="BUNDLE_ID" value="org.jalview.jalview-desktop" />
<variable name="INTERNAL_ID" value="Jalview" />
<variable name="WINDOWS_APPLICATION_ID" value="6595-2347-1923-0725" />
- <variable name="MACOS_DMG_DS_STORE" value="DS_Store" />
+ <variable name="MACOS_DMG_DS_STORE" value="jalview_dmg_DS_Store" />
<variable name="MACOS_DMG_BG_IMAGE" />
<variable name="INSTALLER_NAME" value="Jalview Installer" />
<variable name="INSTALL4J_UTILS_DIR" value="utils/install4j" />
<variable name="PNG_ICON_FILE" value="utils/channels/release/images/jalview_logo.png" />
<variable name="BACKGROUND" value="utils/channels/release/images/jalview_logo_background_fade-640x480.png" />
</variables>
- <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" />
+ <codeSigning macEnabled="true" macPkcs12File="${compiler:OSX_KEYSTORE}" macNotarize="true" appleId="${compiler:OSX_APPLEID}">
+ <macAdditionalBinaries>
+ <entry>*.dylib</entry>
+ <entry>*.so</entry>
+ <entry>*.jnilib</entry>
+ <entry>unpack200</entry>
+ <entry>tnameserv</entry>
+ <entry>servertool</entry>
+ <entry>rmiregistry</entry>
+ <entry>rmid</entry>
+ <entry>policytool</entry>
+ <entry>pack200</entry>
+ <entry>orbd</entry>
+ <entry>keytool</entry>
+ <entry>jjs</entry>
+ <entry>java</entry>
+ <entry>jspawnhelper</entry>
+ <entry>libfreetype.dylib.6</entry>
+ <entry>applet</entry>
+ </macAdditionalBinaries>
+ </codeSigning>
</application>
<files defaultUninstallMode="2">
<filesets>
<fileset name="Mac OS X JRE" id="880" />
<fileset name="Windows JRE" id="882" />
<fileset name="Jalview application" id="1873" />
- <fileset name="MacOS Old Jalview Uninstaller" id="2105" />
</filesets>
<roots>
<root id="735" fileset="734" />
<root id="881" fileset="880" />
<root id="883" fileset="882" />
<root id="1874" fileset="1873" />
- <root id="2106" fileset="2105" />
</roots>
<mountPoints>
<mountPoint id="454" />
<mountPoint id="884" root="881" />
<mountPoint id="885" root="883" />
<mountPoint id="1875" root="1874" />
- <mountPoint id="2107" root="2106" />
</mountPoints>
<entries>
<dirEntry mountPoint="454" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_FILES_DIR}/${compiler:JAVA_VERSION}" uninstallMode="2" overrideOverwriteMode="true" overrideUninstallMode="true" subDirectory="files" />
<dirEntry mountPoint="884" file="${compiler:MACOS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
<dirEntry mountPoint="885" file="${compiler:WINDOWS_JAVA_VM_DIR}" fileMode="755" overrideFileMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:JRE_DIR}" />
<dirEntry mountPoint="1875" file="${compiler:JALVIEW_DIR}/${compiler:GETDOWN_WEBSITE_DIR}/${compiler:JAVA_VERSION}/${compiler:GETDOWN_DIST_DIR}" overwriteMode="1" uninstallMode="2" overrideFileMode="true" overrideOverwriteMode="true" overrideUninstallMode="true" entryMode="subdir" subDirectory="${compiler:GETDOWN_DIST_DIR}" overrideDirMode="true" />
- <dirEntry mountPoint="2107" file="Uninstall Old Jalview.app" fileMode="755" overrideFileMode="true" entryMode="subdir" subDirectory="Uninstall Old Jalview.app" overrideDirMode="true" />
</entries>
<components>
<component name="jalview_getdown" id="1031">
<entry filesetId="1873" />
</include>
</component>
- <component name="macos_old_jalview_uninstaller" id="2110">
- <include>
- <entry filesetId="2105" />
- </include>
- </component>
</components>
</files>
<launchers>
<component id="1156" />
<component id="1276" />
<component id="1881" />
- <component id="2110" />
</excludedComponents>
<exclude>
<entry defaultFileset="true" />
<file name=".DS_Store" file="${compiler:JALVIEW_DIR}/${compiler:MACOS_DMG_DS_STORE}" />
<file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-File.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-File.icns" />
<file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-Launch.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-Launch.icns" />
- <symlink name="Uninstall Old Jalview (optional).app" target="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/app/Uninstall Old Jalview.app" />
</topLevelFiles>
</macosArchive>
<unixInstaller name="Linux x64 Shell Installer" id="1595" mediaFileName="${compiler:UNIX_APPLICATION_FOLDER}-${compiler:JALVIEW_VERSION}-linux_x64-java_${compiler:JAVA_INTEGER_VERSION}" installDir="${compiler:UNIX_APPLICATION_FOLDER}" customInstallBaseDir="~/opt/">
<component id="1156" />
<component id="1276" />
<component id="1881" />
- <component id="2110" />
</excludedComponents>
<exclude>
<entry defaultFileset="true" />
<component id="1156" />
<component id="1276" />
<component id="1881" />
- <component id="2110" />
</excludedComponents>
<exclude>
<entry defaultFileset="true" />
<component id="1156" />
<component id="1276" />
<component id="1881" />
- <component id="2110" />
</excludedComponents>
<exclude>
<entry defaultFileset="true" />
git://source.jalview.org / jalview.git / commitdiff