Apple-2-Tools/AppleCommander
1
0
Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2024-12-26 03:33:00 +00:00
Code Issues Projects Releases Wiki Activity

First round of updates. Leaving publication for later. #51

Browse Source
This commit is contained in:
Rob Greene 2020-11-24 19:34:01 -06:00
parent 0a2c2fd435
commit b78253175d
5 changed files with 84 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
build.gradle
View File

@ -42,7 +42,7 @@ test {
throw new Exception('Unknown OS') throw new Exception('Unknown OS')
} }
dependencies { dependencies {
compile "$swtDependency" implementation "$swtDependency"
} }
testLogging { testLogging {
exceptionFormat = 'full' exceptionFormat = 'full'
@ -57,14 +57,14 @@ tasks.withType(Jar) {
manifest { manifest {
attributes 'Main-Class': 'com.webcodepro.applecommander.ui.AppleCommander' attributes 'Main-Class': 'com.webcodepro.applecommander.ui.AppleCommander'
attributes 'Implementation-Title': 'AppleCommander', attributes 'Implementation-Title': 'AppleCommander',
'Implementation-Version': version 'Implementation-Version': archiveVersion
} }
from('LICENSE') from('LICENSE')
doFirst { doFirst {
// Jar files with an appendix are standalone applications and need to have ShrinkIt included. // Jar files with an appendix are standalone applications and need to have ShrinkIt included.
if (appendix) { if (archiveAppendix) {
from { from {
configurations.runtime.collect { configurations.runtimeClasspath.collect {
it.name.startsWith('ShrinkItArchive') || it.name.startsWith('applesingle-api') || it.name.startsWith('ShrinkItArchive') || it.name.startsWith('applesingle-api') ||
it.name.startsWith('bastools-api') || it.name.startsWith('commons-csv') || it.name.startsWith('bastools-api') || it.name.startsWith('commons-csv') ||
it.name.startsWith('gson') it.name.startsWith('gson')
@ -76,21 +76,21 @@ tasks.withType(Jar) {
} }
dependencies { dependencies {
compile "net.sf.applecommander:ShrinkItArchive:$shkVersion" implementation "net.sf.applecommander:ShrinkItArchive:$shkVersion"
compile "net.sf.applecommander:applesingle-api:$asVersion" implementation "net.sf.applecommander:applesingle-api:$asVersion"
compile "net.sf.applecommander:bastools-api:$btVersion" implementation "net.sf.applecommander:bastools-api:$btVersion"
compile "org.apache.commons:commons-csv:$commonsCsvVersion" implementation "org.apache.commons:commons-csv:$commonsCsvVersion"
compile "com.google.code.gson:gson:$gsonVersion" implementation "com.google.code.gson:gson:$gsonVersion"
compileOnly "org.apache.ant:ant:$antVersion" compileOnly "org.apache.ant:ant:$antVersion"
testCompile "junit:junit:$junitVersion" testImplementation "junit:junit:$junitVersion"
testCompile "org.apache.commons:commons-lang3:$commonsLang3Version" testImplementation "org.apache.commons:commons-lang3:$commonsLang3Version"
} }
task mavenJar(type: Jar) { task mavenJar(type: Jar) {
dependencies { dependencies {
// Just to pass the compile step; these classes are stripped out below. // Just to pass the compile step; these classes are stripped out below.
compile "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion" implementation "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion"
} }
from(sourceSets.main.output) { from(sourceSets.main.output) {
include 'com/webcodepro/applecommander/**' include 'com/webcodepro/applecommander/**'
@ -102,9 +102,9 @@ task mavenJar(type: Jar) {
task acJar(type: Jar) { task acJar(type: Jar) {
dependencies { dependencies {
// Just to pass the compile step; these classes are stripped out below. // Just to pass the compile step; these classes are stripped out below.
compile "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion" implementation "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion"
} }
appendix 'ac' archiveAppendix = 'ac'
manifest { manifest {
attributes 'Main-Class' : 'com.webcodepro.applecommander.ui.ac' attributes 'Main-Class' : 'com.webcodepro.applecommander.ui.ac'
} }
@ -117,54 +117,54 @@ task acJar(type: Jar) {
} }
task linuxJar(type: Jar) { task linuxJar(type: Jar) {
dependencies { dependencies {
compile "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:$swtVersion" implementation "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:$swtVersion"
} }
appendix 'linux64-gtk' archiveAppendix = 'linux64-gtk'
from(sourceSets.main.output) { from(sourceSets.main.output) {
include 'com/webcodepro/**' include 'com/webcodepro/**'
} }
doFirst { doFirst {
// Pick and include just the Linux JAR contents // Pick and include just the Linux JAR contents
from { configurations.runtime.collect { it.name.contains('.linux.x86_64-') ? zipTree(it) : 'fake' } } from { configurations.runtimeClasspath.collect { it.name.contains('.linux.x86_64-') ? zipTree(it) : 'fake' } }
} }
} }
task piJar(type: Jar) { task piJar(type: Jar) {
dependencies { dependencies {
compile "org.eclipse.swt:org.eclipse.swt.gtk.linux.arm:$piswtVersion" implementation "org.eclipse.swt:org.eclipse.swt.gtk.linux.arm:$piswtVersion"
} }
appendix 'linuxarm-gtk' archiveAppendix = 'linuxarm-gtk'
from(sourceSets.main.output) { from(sourceSets.main.output) {
include 'com/webcodepro/**' include 'com/webcodepro/**'
} }
doFirst { doFirst {
// Pick and include just the Linux JAR contents // Pick and include just the Linux JAR contents
from { configurations.runtime.collect { it.name.contains('.linux.arm-') ? zipTree(it) : 'fake' } } from { configurations.runtimeClasspath.collect { it.name.contains('.linux.arm-') ? zipTree(it) : 'fake' } }
} }
} }
task macosxJar(type: Jar) { task macosxJar(type: Jar) {
dependencies { dependencies {
compile "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion" implementation "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion"
} }
appendix 'macosx' archiveAppendix = 'macosx'
from(sourceSets.main.output) { from(sourceSets.main.output) {
include 'com/webcodepro/**' include 'com/webcodepro/**'
} }
doFirst { doFirst {
// Pick and include just the Mac OS X JAR contents // Pick and include just the Mac OS X JAR contents
from { configurations.runtime.collect { it.name.contains('.macosx.') ? zipTree(it) : 'fake' } } from { configurations.runtimeClasspath.collect { it.name.contains('.macosx.') ? zipTree(it) : 'fake' } }
} }
} }
task windowsJar(type: Jar) { task windowsJar(type: Jar) {
dependencies { dependencies {
compile "org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64:$swtVersion" implementation "org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64:$swtVersion"
} }
appendix 'win64' archiveAppendix = 'win64'
from(sourceSets.main.output) { from(sourceSets.main.output) {
include 'com/webcodepro/**' include 'com/webcodepro/**'
} }
doFirst { doFirst {
// Pick and include just the Windows SWT JAR contents // Pick and include just the Windows SWT JAR contents
from { configurations.runtime.collect { it.name.contains('.win32.') ? zipTree(it) : 'fake' } } from { configurations.runtimeClasspath.collect { it.name.contains('.win32.') ? zipTree(it) : 'fake' } }
} }
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip

53
gradlew vendored
View File

@ -1,5 +1,21 @@
#!/usr/bin/env sh #!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
############################################################################## ##############################################################################
## ##
## Gradle start up script for UN*X ## Gradle start up script for UN*X
@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS="" DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
@ -66,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM. # Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@ -109,10 +126,11 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi fi
# For Cygwin, switch paths to Windows format before running java # For Cygwin or MSYS, switch paths to Windows format before running java
if $cygwin ; then if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"` JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
@ -138,19 +156,19 @@ if $cygwin ; then
else else
eval `echo args$i`="\"$arg\"" eval `echo args$i`="\"$arg\""
fi fi
i=$((i+1)) i=`expr $i + 1`
done done
case $i in case $i in
(0) set -- ;; 0) set -- ;;
(1) set -- "$args0" ;; 1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;; 2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;; 3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;; 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
@ -159,14 +177,9 @@ save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }
APP_ARGS=$(save "$@") APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

43
gradlew.bat vendored
View File

@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS= set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init if "%ERRORLEVEL%" == "0" goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto init if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail goto fail
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell