mirror of
https://github.com/AppleCommander/AppleCommander.git
synced 2024-12-05 18:49:30 +00:00
First draft of morphing AppleCommander to use Gradle instead of Ant.
This commit is contained in:
parent
5d9ac872fd
commit
438e6ec1f0
10
.classpath
10
.classpath
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="test"/>
|
||||
<classpathentry kind="var" path="SWT_JAR"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANT_JAR"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -12,9 +12,12 @@ TODO.local
|
||||
work
|
||||
TestImage.*
|
||||
**/Thumbs.db
|
||||
.settings/org.eclipse.jdt.ui.prefs
|
||||
.settings/org.eclipse.jdt.core.prefs
|
||||
build/ACBuild.properties
|
||||
build/AppleCommander.preferences
|
||||
*.o
|
||||
*.lst
|
||||
.classpath
|
||||
.project
|
||||
.settings
|
||||
.gradle
|
||||
/build/
|
||||
|
22
.project
22
.project
@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>AppleCommander</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>com.ibm.sse.model.structuredbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
@ -1,4 +0,0 @@
|
||||
#Sun Jul 11 09:14:44 CDT 2004
|
||||
eclipse.preferences.version=1
|
||||
encoding//src/com/webcodepro/applecommander/storage/StorageBundle.properties=8859_1
|
||||
encoding//src/com/webcodepro/applecommander/compiler/CompilerBundle.properties=8859_1
|
29
DEVELOPER.md
Normal file
29
DEVELOPER.md
Normal file
@ -0,0 +1,29 @@
|
||||
# Developer Notes
|
||||
|
||||
AppleCommander has switched to using [Gradle](https://gradle.org/) for build and build dependencies.
|
||||
|
||||
## Tests
|
||||
|
||||
> Note that test currently fail due to dependencies on disk images not present in the repository.
|
||||
|
||||
```
|
||||
$ ./gradlew test
|
||||
```
|
||||
|
||||
## Building
|
||||
|
||||
```
|
||||
$ ./gradlew assemble
|
||||
|
||||
BUILD SUCCESSFUL in 2s
|
||||
6 actionable tasks: 6 executed
|
||||
```
|
||||
|
||||
This will create the `build` directory and populate with an uber-jar.
|
||||
|
||||
To launch AppleCommander, use the following:
|
||||
|
||||
* Mac OS X:
|
||||
`java -XstartOnFirstThread -jar build/libs/AppleCommander.jar`
|
||||
|
||||
The build is currently only setup for Mac OS X.
|
@ -1,85 +0,0 @@
|
||||
|
||||
*********************
|
||||
** LINUX **
|
||||
*********************
|
||||
|
||||
See build/build-applecommander-linux-gtk for the script which builds
|
||||
an executable of AppleCommander. The build/build-swt-linux-gtk script
|
||||
builds the SWT swt.so file.
|
||||
|
||||
|
||||
**********************
|
||||
** WINDOWS **
|
||||
**********************
|
||||
|
||||
Building AppleCommander for Windows using MinGW (2.0.3 with GCJ update to 3.3).
|
||||
See build/build-applecommander-mingw for the current script.
|
||||
|
||||
1. Export to the filesystem AppleCommander/src/com directory tree into the build
|
||||
directory.
|
||||
|
||||
2. Using MinGW, date related support classes are not compiled in. This is a known
|
||||
issue and there is a suggested work-around posted here:
|
||||
http://gcc.gnu.org/ml/java/2002-04/msg00180.html
|
||||
Basically, force a reference to the classes which cause the error - the problem
|
||||
lies in classes loaded by reflection, so this forces these classes to be
|
||||
compiled in. The suggested prelude is:
|
||||
// static references to these classes ensure that the linker will include them
|
||||
private static Class c1 = gnu.java.locale.Calendar.class;
|
||||
private static Class c2 = java.util.GregorianCalendar.class;
|
||||
private static Class c3 = gnu.gcj.convert.Input_ASCII.class;
|
||||
private static Class c4 = gnu.gcj.convert.Input_UTF8.class;
|
||||
private static Class c5 = gnu.gcj.convert.Input_8859_1.class;
|
||||
private static Class c6 = gnu.java.locale.LocaleInformation.class;
|
||||
private static Class c7 = gnu.gcj.convert.Output_ASCII.class;
|
||||
Presumably, this is just needed in one class - probably the class which contains
|
||||
the main method. I am currently pasting this into AppleCommander.java itself.
|
||||
A better solution would be to do this automatically...
|
||||
|
||||
3. Place a copy of the AppleCommander JAR file in the build directory - name it
|
||||
AppleCommander.jar.
|
||||
|
||||
4. Copy swt.jar, libswt.a, and swt-win32-*.dll into the build directory.
|
||||
(Check at http://www.thisiscool.com/gcc_mingw.htm and grab a copy.)
|
||||
|
||||
5. Ensure that UPX is on the path. You will need to set this manually.
|
||||
I placed UPX in C:\UPX - so I use the following command:
|
||||
export PATH=$PATH:/c/UPX
|
||||
|
||||
5. Run build-applecommander-mingw script from MinGW in the build directory.
|
||||
|
||||
6. Distribution consists of smallest executable plus the SWT DLL file.
|
||||
|
||||
|
||||
*************************
|
||||
** MISCELLANEOUS NOTES **
|
||||
*************************
|
||||
|
||||
Update #1:
|
||||
GraphicsFilter was reengineered to accomodate GCJ. GCJ is not quite JDK 1.4 compliant
|
||||
and is obviously not a SUN JDK. The image creation and saving responsibility was moved
|
||||
into subclasses of AppleImage. AppleImage itself functions as a factory and tries to
|
||||
instantiate possible AppleImage classes via Reflection - this allows code to be compiled
|
||||
without patching the code. When building with GCJ, the AppleImage classes that do not
|
||||
apply are simply not compiled nor linked into the executable.
|
||||
|
||||
Update #2:
|
||||
Resources can be compiled/attached to a specific Java class. AppleCommander has
|
||||
a number of resources that should be built into the exe class. This simplifies
|
||||
the distribution to be the AppleCommander executable and the SWT support DLL.
|
||||
See the AppleCommander build script for details.
|
||||
|
||||
Update #3:
|
||||
UPX is a very good compression tool for executables. It should be standard practice
|
||||
(and part of the automated build process) to run the final EXE and DLL files through
|
||||
UPX to ensure a small filesize. This has been incorporated into the AppleCommander
|
||||
build script but you may want to review how it is built in as detection can be funky.
|
||||
|
||||
Update #4:
|
||||
There are speed issues with the compiled version of AppleCommander which appear to
|
||||
be releated to GCJ 3.2 but do not show up in GCJ 3.3. The speed issues do not
|
||||
appear to be present when run as a normal Java/SWT application. I am unclear what
|
||||
the issue was, but the current assumption is that a bug or optimization to GCJ 3.3
|
||||
was introduced. Additional note - this version of GCJ 3.3 also is packaged with
|
||||
SWT 2052 which is a few point releases higher than other versions of SWT, so it also
|
||||
may be SWT releated.
|
4
TODO
4
TODO
@ -2,7 +2,9 @@ THINGS TO DO
|
||||
============
|
||||
This is the internal list of items that need to be done.
|
||||
|
||||
-- 1.3.5 --
|
||||
-- 1.3.5 --
|
||||
* Migration to GitHub
|
||||
* Update SWT libraries
|
||||
|
||||
--- FUTURE ---
|
||||
o Add binaries to repository to simplify AC development and builds
|
||||
|
34
build.gradle
Normal file
34
build.gradle
Normal file
@ -0,0 +1,34 @@
|
||||
|
||||
// Apply the java plugin to add support for Java
|
||||
apply plugin: 'java'
|
||||
|
||||
// Apply the application plugin to add support for building an application
|
||||
apply plugin: 'application'
|
||||
|
||||
// Define the main class for the application
|
||||
mainClassName = 'com.webcodepro.applecommander.ui.AppleCommander'
|
||||
|
||||
// In this section you declare where to find the dependencies of your project
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven {
|
||||
url "http://maven-eclipse.github.io/maven"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64:$swtVersion"
|
||||
|
||||
compileOnly "org.apache.ant:ant:$antVersion"
|
||||
|
||||
testCompile "junit:junit:$junitVersion"
|
||||
}
|
||||
|
||||
jar {
|
||||
manifest {
|
||||
attributes 'Main-Class': "$mainClassName"
|
||||
}
|
||||
doFirst {
|
||||
from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
|
||||
}
|
||||
}
|
5
gradle.properties
Normal file
5
gradle.properties
Normal file
@ -0,0 +1,5 @@
|
||||
|
||||
swtVersion = 4.6.1
|
||||
junitVersion = 4.12
|
||||
antVersion = 1.8.2
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
5
gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
|
172
gradlew
vendored
Executable file
172
gradlew
vendored
Executable file
@ -0,0 +1,172 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
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.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
NONSTOP* )
|
||||
nonstop=true
|
||||
;;
|
||||
esac
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=$(save "$@")
|
||||
|
||||
# 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"
|
||||
|
||||
# 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" "$@"
|
84
gradlew.bat
vendored
Normal file
84
gradlew.bat
vendored
Normal file
@ -0,0 +1,84 @@
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@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=
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
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
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
@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%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
18
init.gradle
Normal file
18
init.gradle
Normal file
@ -0,0 +1,18 @@
|
||||
/*
|
||||
* This settings file was generated by the Gradle 'init' task.
|
||||
*
|
||||
* The settings file is used to specify which projects to include in your build.
|
||||
* In a single project build this file can be empty or even removed.
|
||||
*
|
||||
* Detailed information about configuring a multi-project build in Gradle can be found
|
||||
* in the user guide at https://docs.gradle.org/4.3.1/userguide/multi_project_builds.html
|
||||
*/
|
||||
|
||||
/*
|
||||
// To declare projects as part of a multi-project build use the 'include' method
|
||||
include 'shared'
|
||||
include 'api'
|
||||
include 'services:webservice'
|
||||
*/
|
||||
|
||||
rootProject.name = 'AppleCommander'
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user