From 39570646dfd01d469049b551b59b6ef64b1dbaa6 Mon Sep 17 00:00:00 2001 From: Ostap Date: Sat, 13 Apr 2013 22:10:55 +0300 Subject: [PATCH 1/6] fixed #1361: added android command-line support --- app/src/processing/app/Commander.java | 33 ++ .../processing/mode/android/AndroidBuild.java | 3 +- .../processing/mode/android/AndroidSDK.java | 2 + .../processing/mode/android/Commander.java | 335 ++++++++++++++++++ build/linux/processing-android | 118 ++++++ build/linux/processing-cli | 118 ++++++ 6 files changed, 608 insertions(+), 1 deletion(-) create mode 100644 app/src/processing/app/Commander.java create mode 100644 app/src/processing/mode/android/Commander.java create mode 100755 build/linux/processing-android create mode 100755 build/linux/processing-cli diff --git a/app/src/processing/app/Commander.java b/app/src/processing/app/Commander.java new file mode 100644 index 0000000000..89ef31ff36 --- /dev/null +++ b/app/src/processing/app/Commander.java @@ -0,0 +1,33 @@ +package processing.app; + +import java.io.PrintStream; +import java.lang.reflect.Method; + +public class Commander { + + public static void main(String[] args) throws Exception { + if (args.length <= 1) { + printHelp(System.out); + } + + Class commander = Class.forName("processing.mode." + args[0] + ".Commander"); + Method entryPoint = commander.getMethod("main", String[].class); + + String[] newArgs = new String[args.length - 1]; + System.arraycopy(args, 1, newArgs, 0, newArgs.length); + + entryPoint.invoke(null, (Object) newArgs); + } + + private static void printHelp(PrintStream out) { + out.println("Command line front-end for Processing."); + out.println("First argument is the mode, which should be launched."); + out.println(); + out.println("ONLY 'java' and 'android' modes are supported."); + out.println(); + out.println("Usage: "); + out.println("./processing-cli java --sketch=..."); + out.println("./processing-cli android --sketch=..."); + out.println(); + } +} diff --git a/app/src/processing/mode/android/AndroidBuild.java b/app/src/processing/mode/android/AndroidBuild.java index 297b456a41..18d3f5f866 100644 --- a/app/src/processing/mode/android/AndroidBuild.java +++ b/app/src/processing/mode/android/AndroidBuild.java @@ -67,6 +67,7 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) { * @throws IOException */ public File build(String target) throws IOException, SketchException { + System.out.println("ANDROID BUILD!"); this.target = target; File folder = createProject(); if (folder != null) { @@ -496,7 +497,7 @@ void antBuildProblems(String outPile, String errPile) throws SketchException { String getPathForAPK() { - String suffix = target.equals("release") ? "unsigned" : "debug"; + String suffix = target.equals("release") ? "release-unsigned" : "debug"; String apkName = "bin/" + sketch.getName() + "-" + suffix + ".apk"; final File apkFile = new File(tmpFolder, apkName); if (!apkFile.exists()) { diff --git a/app/src/processing/mode/android/AndroidSDK.java b/app/src/processing/mode/android/AndroidSDK.java index 76563b30a7..d3395aa5c3 100644 --- a/app/src/processing/mode/android/AndroidSDK.java +++ b/app/src/processing/mode/android/AndroidSDK.java @@ -7,6 +7,7 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; import javax.swing.JFileChooser; @@ -315,6 +316,7 @@ public static ProcessResult runADB(final String... cmd) PApplet.println(adbCmd); } // try { + System.out.println("EXECUTING ADB: "+Arrays.toString(adbCmd)); ProcessResult adbResult = new ProcessHelper(adbCmd).execute(); // Ignore messages about starting up an adb daemon String out = adbResult.getStdout(); diff --git a/app/src/processing/mode/android/Commander.java b/app/src/processing/mode/android/Commander.java new file mode 100644 index 0000000000..6472f88f50 --- /dev/null +++ b/app/src/processing/mode/android/Commander.java @@ -0,0 +1,335 @@ +/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */ + +/* + Part of the Processing project - http://processing.org + + Copyright (c) 2008-12 Ben Fry and Casey Reas + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +package processing.mode.android; + +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.io.UnsupportedEncodingException; +import java.util.Arrays; + +import processing.app.Base; +import processing.app.Preferences; +import processing.app.RunnerListener; +import processing.app.Sketch; +import processing.app.SketchException; +import processing.app.contrib.ModeContribution; + +/** + * Class to handle running Android mode of Processing from the command line. + * + * @author ostap.andrusiv + */ +public class Commander implements RunnerListener { + static final String helpArg = "--help"; + static final String buildArg = "--build"; + static final String runArg = "--run"; + static final String runArg_DEVICE = "d"; + static final String runArg_EMULATOR = "e"; + static final String targetArg = "--target"; + static final String targetArg_DEBUG = "debug"; + static final String targetArg_RELEASE = "release"; + static final String sketchArg = "--sketch="; + static final String forceArg = "--force"; + static final String outputArg = "--output="; + static final String exportApplicationArg = "--export"; + + static final int HELP = -1; + static final int BUILD = 1; + static final int RUN = 2; + static final int EXPORT = 4; + + private AndroidMode androidMode = null; + + private int task = HELP; + + private Sketch sketch; + private PrintStream systemOut; + private PrintStream systemErr; + + private String sketchPath = null; + private File sketchFolder = null; + private String pdePath = null; // path to the .pde file + + private String outputPath = null; + private File outputFolder = null; + + private boolean force = false; // replace that no good output folder + private String device = runArg_DEVICE; + private String target = targetArg_DEBUG; + + static public void main(String[] args) { + // Do this early so that error messages go to the console + Base.setCommandLine(); + // init the platform so that prefs and other native code is ready to go + Base.initPlatform(); + // make sure a full JDK is installed + Base.initRequirements(); + + // launch command line handler + Commander commander = new Commander(args); + commander.execute(); + } + + public Commander(String[] args) { + System.out.println("WOOOHOOOO ANDROOOOOOOOOOID CLI BUILD!"); + System.out.println(Arrays.toString(args)); + // Turns out the output goes as MacRoman or something else useless. + // http://code.google.com/p/processing/issues/detail?id=1418 + try { + systemOut = new PrintStream(System.out, true, "UTF-8"); + systemErr = new PrintStream(System.err, true, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + System.exit(1); + } + + parseArgs(args); + + initValues(); + } + + private void parseArgs(String[] args) { + for (String arg : args) { + if (arg.length() == 0) { + // ignore it, just the crappy shell script + } else if (arg.equals(helpArg)) { + // mode already set to HELP + } else if (arg.startsWith(targetArg)) { + target = extractValue(arg, targetArg, targetArg_DEBUG); + } else if (arg.equals(buildArg)) { + task = BUILD; + } else if (arg.startsWith(runArg)) { + task = RUN; + device = extractValue(arg, runArg, runArg_DEVICE); + } else if (arg.equals(exportApplicationArg)) { + task = EXPORT; + } else if (arg.startsWith(sketchArg)) { + sketchPath = arg.substring(sketchArg.length()); + sketchFolder = new File(sketchPath); + checkOrQuit(sketchFolder.exists(), sketchFolder + " does not exist.", false); + + File pdeFile = new File(sketchFolder, sketchFolder.getName() + ".pde"); + checkOrQuit(pdeFile.exists(), "Not a valid sketch folder. " + pdeFile + " does not exist.", true); + + pdePath = pdeFile.getAbsolutePath(); + } else if (arg.startsWith(outputArg)) { + outputPath = arg.substring(outputArg.length()); + } else if (arg.equals(forceArg)) { + force = true; + } else { + complainAndQuit("I don't know anything about " + arg + ".", true); + } + } + } + + /** + * 
+   * extractValue("--target=release", "--target", "debug") ==> "release"
+   * extractValue("--target=",        "--target", "debug") ==> ""
+   * extractValue("--target",         "--target", "debug") ==> "debug"
+   *
+ * + * @param arg + * @param template + * @param def + * @return + */ + private static String extractValue(String arg, String template, String def) { + String result = def; + String withEq = arg.substring(template.length()); + if (withEq.startsWith("=")) { + result = withEq.substring(1); + } + return result; + } + + private void initValues() { + checkOrQuit(outputPath != null, "An output path must be specified.", true); + outputFolder = new File(outputPath); + if (outputFolder.exists()) { + if (force) { + Base.removeDir(outputFolder); + } else { + complainAndQuit("The output folder already exists. " + "Use --force to remove it.", false); + } + } + + Preferences.init(); + Base.locateSketchbookFolder(); + + checkOrQuit(sketchPath != null, "No sketch path specified.", true); + checkOrQuit(!outputPath.equals(sketchPath), "The sketch path and output path cannot be identical.", false); + + androidMode = (AndroidMode) ModeContribution.load(null, Base.getContentFile("modes/android"), + "processing.mode.android.AndroidMode").getMode(); + androidMode.checkSDK(null); + } + + private void execute() { + if (processing.app.Base.DEBUG) { + systemOut.println("Build status: "); + systemOut.println("Sketch: " + sketchPath); + systemOut.println("Output: " + outputPath); + systemOut.println("Force: " + force); + systemOut.println("Target: " + target); + systemOut.println("==== Task ===="); + systemOut.println("--build: " + (task == BUILD)); + systemOut.println("--run: " + (task == RUN)); + systemOut.println("--export: " + (task == EXPORT)); + systemOut.println(); + } + if (task == HELP) { + printCommandLine(systemOut); + System.exit(0); + } + + checkOrQuit(outputFolder.mkdirs(), "Could not create the output folder.", false); + + boolean success = false; + + try { + sketch = new Sketch(pdePath, androidMode); + if (task == BUILD || task == RUN) { + AndroidBuild build = new AndroidBuild(sketch, androidMode); + build.build(target); + + if (task == RUN) { + AndroidRunner runner = new AndroidRunner(build, this); + runner.launch(runArg_EMULATOR.equals(device) ? + Devices.getInstance().getEmulator() : + Devices.getInstance().getHardware()); + } + + success = true; + + } else if (task == EXPORT) { + AndroidBuild build = new AndroidBuild(sketch, androidMode); + build.exportProject(); + + success = true; + } + + if (!success) { // error already printed + System.exit(1); + } + + systemOut.println("Finished."); + System.exit(0); + } catch (SketchException re) { + statusError(re); + + } catch (IOException e) { + e.printStackTrace(); + System.exit(1); + } + } + + public void statusNotice(String message) { + systemErr.println(message); + } + + public void statusError(String message) { + systemErr.println(message); + } + + public void statusError(Exception exception) { + if (exception instanceof SketchException) { + SketchException re = (SketchException) exception; + + int codeIndex = re.getCodeIndex(); + if (codeIndex != -1) { + // format the runner exception like emacs + // blah.java:2:10:2:13: Syntax Error: This is a big error message + String filename = sketch.getCode(codeIndex).getFileName(); + int line = re.getCodeLine() + 1; + int column = re.getCodeColumn() + 1; + // if (column == -1) column = 0; + // TODO if column not specified, should just select the whole line. + systemErr.println(filename + ":" + line + ":" + column + ":" + line + ":" + column + ":" + " " + + re.getMessage()); + + } else { // no line number, pass the trace along to the user + exception.printStackTrace(); + } + } else { + exception.printStackTrace(); + } + } + + private void checkOrQuit(boolean condition, String lastWords, boolean schoolEmFirst) { + if (!condition) { + complainAndQuit(lastWords, schoolEmFirst); + } + } + + void complainAndQuit(String lastWords, boolean schoolEmFirst) { + if (schoolEmFirst) { + printCommandLine(systemErr); + } + systemErr.println(lastWords); + System.exit(1); + } + + static void printCommandLine(PrintStream out) { + out.println(); + out.println("Command line edition for Processing " + Base.VERSION_NAME + " (Android Mode)"); + out.println(); + out.println("--help Show this help text. Congratulations."); + out.println(); + out.println("--sketch= Specify the sketch folder (required)"); + out.println("--output= Specify the output folder (required and"); + out.println(" cannot be the same as the sketch folder.)"); + out.println(); + out.println("--force The sketch will not build if the output"); + out.println(" folder already exists, because the contents"); + out.println(" will be replaced. This option erases the"); + out.println(" folder first. Use with extreme caution!"); + out.println(); + out.println("--target= \"debug\" or \"release\" target."); + out.println(" \"debug\" by default."); + out.println("--build Preprocess and compile a sketch into .apk file."); + out.println("--run= Preprocess, compile, and run a sketch on device"); + out.println(" or emulator. Device will be used by default."); + out.println(); + out.println("--export Export an application."); + out.println(); + } + + @Override + public void startIndeterminate() { + } + + @Override + public void stopIndeterminate() { + } + + @Override + public void statusHalt() { + } + + @Override + public boolean isHalted() { + return false; + } +} \ No newline at end of file diff --git a/build/linux/processing-android b/build/linux/processing-android new file mode 100755 index 0000000000..ea3885a0bf --- /dev/null +++ b/build/linux/processing-android @@ -0,0 +1,118 @@ +#!/bin/sh + +# This script runs Processing, using the JDK in the Processing +# installation directory if possible. + +# If no JDK was installed with Processing then the script tries to use +# the preferred Java version of the machine, i.e. what is executed +# by the "java" console command. This must be a Sun JDK (for details, see +# http://processing.org/reference/environment/platforms.html#java). + +# In order to run Processing with an already installed JDK that is *not* +# the preferred Java version of the machine, create a symlink named "java" +# in the Processing installation directory that points to the JDK home +# directory. + +# Thanks to Ferdinand Kasper for this build script. [fry] + + +# JARs required from JDK (anywhere in/below the JDK home directory) +JDKLIBS="rt.jar tools.jar" + +# Set this to non-zero for logging +LOGGING=5 + +# Logs name and value of a variable to stdout if LOGGING is non-zero. +# Expects the variable name as parameter $1. +log() { + if [ $LOGGING -ne 0 ]; then + eval echo $1=\$$1 + fi +} + + +# Locates JDKLIBS in a directory and its subdirectories and saves their +# absolute paths as list to JDKCP. Expects the directory as parameter $1. +# Sets SUCCESS to 1 if all libraries were found, to 0 otherwise. +make_jdkcp() { + # Back out of JRE directory if apparently located inside a JDK + if [ -f "$1/../bin/java" ]; then + DIR="$1/.." + else + DIR="$1" + fi + log DIR + + JDKCP= + SUCCESS=1 + + # Locate JDKLIBS + for L in $JDKLIBS; do + # Locate only the first library with a matching name + LIB=`find "$DIR" -name $L 2>/dev/null | head -n 1` + log L + log LIB + + # Library found? + if [ -n "$LIB" ]; then + JDKCP="$JDKCP"${JDKCP:+:}"$LIB" + else + SUCCESS=0 + fi + done + + log JDKCP +} + + +# Get absolute path of directory where this script is located +APPDIR=`readlink -f "$0"` +log APPDIR +APPDIR=`dirname "$APPDIR"` +log APPDIR + +# Try using a local JDK from the same directory as this script +JDKDIR=`readlink -f "$APPDIR/java"` +make_jdkcp "$JDKDIR" +log SUCCESS + +# Local JDK found? +if [ $SUCCESS -ne 1 ]; then + # No, try using the preferred system JRE/JDK (if any) + JDKDIR=`which java` && JDKDIR=`readlink -e "$JDKDIR"` && JDKDIR=`dirname "$JDKDIR"`/.. + make_jdkcp "$JDKDIR" + log SUCCESS +fi + +# Add all required JARs to CLASSPATH +CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$JDKCP" +for LIB in "$APPDIR"/lib/*.jar; do + CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" +done +for LIB in "$APPDIR"/core/library/*.jar; do + CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" +done +export CLASSPATH +log CLASSPATH + +# Make all JDK binaries available in PATH +export PATH="$JDKDIR/bin":"$PATH" +log PATH + +# Start Processing in the same directory as this script +#if [ "$1" ]; then +# SKETCH=`readlink -f $1` +#else +# SKETCH= +#fi +cd "$APPDIR" + +current_name=`basename $0` +cmd_name='processing-android' + +if [ $current_name = $cmd_name ] +then + java processing.mode.android.Commander "$@" +else + java processing.app.Base "$SKETCH" & +fi diff --git a/build/linux/processing-cli b/build/linux/processing-cli new file mode 100755 index 0000000000..775fe812e3 --- /dev/null +++ b/build/linux/processing-cli @@ -0,0 +1,118 @@ +#!/bin/sh + +# This script runs Processing, using the JDK in the Processing +# installation directory if possible. + +# If no JDK was installed with Processing then the script tries to use +# the preferred Java version of the machine, i.e. what is executed +# by the "java" console command. This must be a Sun JDK (for details, see +# http://processing.org/reference/environment/platforms.html#java). + +# In order to run Processing with an already installed JDK that is *not* +# the preferred Java version of the machine, create a symlink named "java" +# in the Processing installation directory that points to the JDK home +# directory. + +# Thanks to Ferdinand Kasper for this build script. [fry] + + +# JARs required from JDK (anywhere in/below the JDK home directory) +JDKLIBS="rt.jar tools.jar" + +# Set this to non-zero for logging +LOGGING=5 + +# Logs name and value of a variable to stdout if LOGGING is non-zero. +# Expects the variable name as parameter $1. +log() { + if [ $LOGGING -ne 0 ]; then + eval echo $1=\$$1 + fi +} + + +# Locates JDKLIBS in a directory and its subdirectories and saves their +# absolute paths as list to JDKCP. Expects the directory as parameter $1. +# Sets SUCCESS to 1 if all libraries were found, to 0 otherwise. +make_jdkcp() { + # Back out of JRE directory if apparently located inside a JDK + if [ -f "$1/../bin/java" ]; then + DIR="$1/.." + else + DIR="$1" + fi + log DIR + + JDKCP= + SUCCESS=1 + + # Locate JDKLIBS + for L in $JDKLIBS; do + # Locate only the first library with a matching name + LIB=`find "$DIR" -name $L 2>/dev/null | head -n 1` + log L + log LIB + + # Library found? + if [ -n "$LIB" ]; then + JDKCP="$JDKCP"${JDKCP:+:}"$LIB" + else + SUCCESS=0 + fi + done + + log JDKCP +} + + +# Get absolute path of directory where this script is located +APPDIR=`readlink -f "$0"` +log APPDIR +APPDIR=`dirname "$APPDIR"` +log APPDIR + +# Try using a local JDK from the same directory as this script +JDKDIR=`readlink -f "$APPDIR/java"` +make_jdkcp "$JDKDIR" +log SUCCESS + +# Local JDK found? +if [ $SUCCESS -ne 1 ]; then + # No, try using the preferred system JRE/JDK (if any) + JDKDIR=`which java` && JDKDIR=`readlink -e "$JDKDIR"` && JDKDIR=`dirname "$JDKDIR"`/.. + make_jdkcp "$JDKDIR" + log SUCCESS +fi + +# Add all required JARs to CLASSPATH +CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$JDKCP" +for LIB in "$APPDIR"/lib/*.jar; do + CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" +done +for LIB in "$APPDIR"/core/library/*.jar; do + CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" +done +export CLASSPATH +log CLASSPATH + +# Make all JDK binaries available in PATH +export PATH="$JDKDIR/bin":"$PATH" +log PATH + +# Start Processing in the same directory as this script +#if [ "$1" ]; then +# SKETCH=`readlink -f $1` +#else +# SKETCH= +#fi +cd "$APPDIR" + +current_name=`basename $0` +cmd_name='processing-cli' + +if [ $current_name = $cmd_name ] +then + java processing.app.Commander "$@" +else + java processing.app.Base "$SKETCH" & +fi From 879424e235324763d68b3b2fd1e0c55676f8c524 Mon Sep 17 00:00:00 2001 From: Ostap Date: Sat, 13 Apr 2013 22:25:14 +0300 Subject: [PATCH 2/6] fixed #1361 android command-line --- .../processing/mode/android/Commander.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/processing/mode/android/Commander.java b/app/src/processing/mode/android/Commander.java index 6472f88f50..8f45048db8 100644 --- a/app/src/processing/mode/android/Commander.java +++ b/app/src/processing/mode/android/Commander.java @@ -37,7 +37,7 @@ /** * Class to handle running Android mode of Processing from the command line. - * + * * @author ostap.andrusiv */ public class Commander implements RunnerListener { @@ -92,8 +92,9 @@ static public void main(String[] args) { } public Commander(String[] args) { - System.out.println("WOOOHOOOO ANDROOOOOOOOOOID CLI BUILD!"); - System.out.println(Arrays.toString(args)); + if (processing.app.Base.DEBUG) { + System.out.println(Arrays.toString(args)); + } // Turns out the output goes as MacRoman or something else useless. // http://code.google.com/p/processing/issues/detail?id=1418 try { @@ -149,7 +150,7 @@ private void parseArgs(String[] args) { * extractValue("--target=", "--target", "debug") ==> "" * extractValue("--target", "--target", "debug") ==> "debug" * - * + * * @param arg * @param template * @param def @@ -198,7 +199,8 @@ private void execute() { systemOut.println("--run: " + (task == RUN)); systemOut.println("--export: " + (task == EXPORT)); systemOut.println(); - } + } + if (task == HELP) { printCommandLine(systemOut); System.exit(0); @@ -216,24 +218,24 @@ private void execute() { if (task == RUN) { AndroidRunner runner = new AndroidRunner(build, this); - runner.launch(runArg_EMULATOR.equals(device) ? - Devices.getInstance().getEmulator() : + runner.launch(runArg_EMULATOR.equals(device) ? + Devices.getInstance().getEmulator() : Devices.getInstance().getHardware()); } success = true; - + } else if (task == EXPORT) { AndroidBuild build = new AndroidBuild(sketch, androidMode); build.exportProject(); - + success = true; } - + if (!success) { // error already printed System.exit(1); } - + systemOut.println("Finished."); System.exit(0); } catch (SketchException re) { @@ -332,4 +334,4 @@ public void statusHalt() { public boolean isHalted() { return false; } -} \ No newline at end of file +} From 3c7484843685979a3f3cbf7a402130a3513a3ce2 Mon Sep 17 00:00:00 2001 From: Ostap Date: Sat, 13 Apr 2013 22:34:15 +0300 Subject: [PATCH 3/6] fixed #1361 removed debug info --- app/src/processing/mode/android/AndroidBuild.java | 3 +-- app/src/processing/mode/android/AndroidSDK.java | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/processing/mode/android/AndroidBuild.java b/app/src/processing/mode/android/AndroidBuild.java index 18d3f5f866..b9e4abbee6 100644 --- a/app/src/processing/mode/android/AndroidBuild.java +++ b/app/src/processing/mode/android/AndroidBuild.java @@ -67,7 +67,6 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) { * @throws IOException */ public File build(String target) throws IOException, SketchException { - System.out.println("ANDROID BUILD!"); this.target = target; File folder = createProject(); if (folder != null) { @@ -802,4 +801,4 @@ public void cleanup() { //rm(tempBuildFolder); tmpFolder.deleteOnExit(); } -} \ No newline at end of file +} diff --git a/app/src/processing/mode/android/AndroidSDK.java b/app/src/processing/mode/android/AndroidSDK.java index d3395aa5c3..76563b30a7 100644 --- a/app/src/processing/mode/android/AndroidSDK.java +++ b/app/src/processing/mode/android/AndroidSDK.java @@ -7,7 +7,6 @@ import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Arrays; import java.util.Date; import javax.swing.JFileChooser; @@ -316,7 +315,6 @@ public static ProcessResult runADB(final String... cmd) PApplet.println(adbCmd); } // try { - System.out.println("EXECUTING ADB: "+Arrays.toString(adbCmd)); ProcessResult adbResult = new ProcessHelper(adbCmd).execute(); // Ignore messages about starting up an adb daemon String out = adbResult.getStdout(); From c572cf266d82ba788683be2a22ba4a06a2eef7ae Mon Sep 17 00:00:00 2001 From: Ostap Date: Sat, 13 Apr 2013 22:42:01 +0300 Subject: [PATCH 4/6] fixed #1361 updated sources --- app/src/processing/app/Commander.java | 1 + build/linux/processing-android | 2 +- build/linux/processing-cli | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/Commander.java b/app/src/processing/app/Commander.java index 89ef31ff36..9437c38b81 100644 --- a/app/src/processing/app/Commander.java +++ b/app/src/processing/app/Commander.java @@ -8,6 +8,7 @@ public class Commander { public static void main(String[] args) throws Exception { if (args.length <= 1) { printHelp(System.out); + return; } Class commander = Class.forName("processing.mode." + args[0] + ".Commander"); diff --git a/build/linux/processing-android b/build/linux/processing-android index ea3885a0bf..652610bfa6 100755 --- a/build/linux/processing-android +++ b/build/linux/processing-android @@ -20,7 +20,7 @@ JDKLIBS="rt.jar tools.jar" # Set this to non-zero for logging -LOGGING=5 +LOGGING=0 # Logs name and value of a variable to stdout if LOGGING is non-zero. # Expects the variable name as parameter $1. diff --git a/build/linux/processing-cli b/build/linux/processing-cli index 775fe812e3..ebba19fd9c 100755 --- a/build/linux/processing-cli +++ b/build/linux/processing-cli @@ -20,7 +20,7 @@ JDKLIBS="rt.jar tools.jar" # Set this to non-zero for logging -LOGGING=5 +LOGGING=0 # Logs name and value of a variable to stdout if LOGGING is non-zero. # Expects the variable name as parameter $1. From bddbea53a8ecf81da022c7d19aa20b159c02b72e Mon Sep 17 00:00:00 2001 From: Ostap Andrusiv Date: Sat, 20 Apr 2013 21:34:41 +0300 Subject: [PATCH 5/6] issue #1361: removed general cli files --- app/src/processing/app/Commander.java | 34 -------- build/linux/processing-android | 29 +++---- build/linux/processing-cli | 118 -------------------------- 3 files changed, 14 insertions(+), 167 deletions(-) delete mode 100644 app/src/processing/app/Commander.java delete mode 100755 build/linux/processing-cli diff --git a/app/src/processing/app/Commander.java b/app/src/processing/app/Commander.java deleted file mode 100644 index 9437c38b81..0000000000 --- a/app/src/processing/app/Commander.java +++ /dev/null @@ -1,34 +0,0 @@ -package processing.app; - -import java.io.PrintStream; -import java.lang.reflect.Method; - -public class Commander { - - public static void main(String[] args) throws Exception { - if (args.length <= 1) { - printHelp(System.out); - return; - } - - Class commander = Class.forName("processing.mode." + args[0] + ".Commander"); - Method entryPoint = commander.getMethod("main", String[].class); - - String[] newArgs = new String[args.length - 1]; - System.arraycopy(args, 1, newArgs, 0, newArgs.length); - - entryPoint.invoke(null, (Object) newArgs); - } - - private static void printHelp(PrintStream out) { - out.println("Command line front-end for Processing."); - out.println("First argument is the mode, which should be launched."); - out.println(); - out.println("ONLY 'java' and 'android' modes are supported."); - out.println(); - out.println("Usage: "); - out.println("./processing-cli java --sketch=..."); - out.println("./processing-cli android --sketch=..."); - out.println(); - } -} diff --git a/build/linux/processing-android b/build/linux/processing-android index 652610bfa6..5bf102cad4 100755 --- a/build/linux/processing-android +++ b/build/linux/processing-android @@ -1,15 +1,15 @@ #!/bin/sh -# This script runs Processing, using the JDK in the Processing +# This script runs Processing, using the JDK in the Processing # installation directory if possible. -# If no JDK was installed with Processing then the script tries to use -# the preferred Java version of the machine, i.e. what is executed +# If no JDK was installed with Processing then the script tries to use +# the preferred Java version of the machine, i.e. what is executed # by the "java" console command. This must be a Sun JDK (for details, see # http://processing.org/reference/environment/platforms.html#java). -# In order to run Processing with an already installed JDK that is *not* -# the preferred Java version of the machine, create a symlink named "java" +# In order to run Processing with an already installed JDK that is *not* +# the preferred Java version of the machine, create a symlink named "java" # in the Processing installation directory that points to the JDK home # directory. @@ -67,7 +67,6 @@ make_jdkcp() { # Get absolute path of directory where this script is located APPDIR=`readlink -f "$0"` -log APPDIR APPDIR=`dirname "$APPDIR"` log APPDIR @@ -99,14 +98,6 @@ log CLASSPATH export PATH="$JDKDIR/bin":"$PATH" log PATH -# Start Processing in the same directory as this script -#if [ "$1" ]; then -# SKETCH=`readlink -f $1` -#else -# SKETCH= -#fi -cd "$APPDIR" - current_name=`basename $0` cmd_name='processing-android' @@ -114,5 +105,13 @@ if [ $current_name = $cmd_name ] then java processing.mode.android.Commander "$@" else - java processing.app.Base "$SKETCH" & + # Start Processing in the same directory as this script + if [ "$1" ]; then + SKETCH=`readlink -f $1` + else + SKETCH= + fi + cd "$APPDIR" + + java processing.app.Base "$SKETCH" & fi diff --git a/build/linux/processing-cli b/build/linux/processing-cli deleted file mode 100755 index ebba19fd9c..0000000000 --- a/build/linux/processing-cli +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# This script runs Processing, using the JDK in the Processing -# installation directory if possible. - -# If no JDK was installed with Processing then the script tries to use -# the preferred Java version of the machine, i.e. what is executed -# by the "java" console command. This must be a Sun JDK (for details, see -# http://processing.org/reference/environment/platforms.html#java). - -# In order to run Processing with an already installed JDK that is *not* -# the preferred Java version of the machine, create a symlink named "java" -# in the Processing installation directory that points to the JDK home -# directory. - -# Thanks to Ferdinand Kasper for this build script. [fry] - - -# JARs required from JDK (anywhere in/below the JDK home directory) -JDKLIBS="rt.jar tools.jar" - -# Set this to non-zero for logging -LOGGING=0 - -# Logs name and value of a variable to stdout if LOGGING is non-zero. -# Expects the variable name as parameter $1. -log() { - if [ $LOGGING -ne 0 ]; then - eval echo $1=\$$1 - fi -} - - -# Locates JDKLIBS in a directory and its subdirectories and saves their -# absolute paths as list to JDKCP. Expects the directory as parameter $1. -# Sets SUCCESS to 1 if all libraries were found, to 0 otherwise. -make_jdkcp() { - # Back out of JRE directory if apparently located inside a JDK - if [ -f "$1/../bin/java" ]; then - DIR="$1/.." - else - DIR="$1" - fi - log DIR - - JDKCP= - SUCCESS=1 - - # Locate JDKLIBS - for L in $JDKLIBS; do - # Locate only the first library with a matching name - LIB=`find "$DIR" -name $L 2>/dev/null | head -n 1` - log L - log LIB - - # Library found? - if [ -n "$LIB" ]; then - JDKCP="$JDKCP"${JDKCP:+:}"$LIB" - else - SUCCESS=0 - fi - done - - log JDKCP -} - - -# Get absolute path of directory where this script is located -APPDIR=`readlink -f "$0"` -log APPDIR -APPDIR=`dirname "$APPDIR"` -log APPDIR - -# Try using a local JDK from the same directory as this script -JDKDIR=`readlink -f "$APPDIR/java"` -make_jdkcp "$JDKDIR" -log SUCCESS - -# Local JDK found? -if [ $SUCCESS -ne 1 ]; then - # No, try using the preferred system JRE/JDK (if any) - JDKDIR=`which java` && JDKDIR=`readlink -e "$JDKDIR"` && JDKDIR=`dirname "$JDKDIR"`/.. - make_jdkcp "$JDKDIR" - log SUCCESS -fi - -# Add all required JARs to CLASSPATH -CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$JDKCP" -for LIB in "$APPDIR"/lib/*.jar; do - CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" -done -for LIB in "$APPDIR"/core/library/*.jar; do - CLASSPATH="$CLASSPATH"${CLASSPATH:+:}"$LIB" -done -export CLASSPATH -log CLASSPATH - -# Make all JDK binaries available in PATH -export PATH="$JDKDIR/bin":"$PATH" -log PATH - -# Start Processing in the same directory as this script -#if [ "$1" ]; then -# SKETCH=`readlink -f $1` -#else -# SKETCH= -#fi -cd "$APPDIR" - -current_name=`basename $0` -cmd_name='processing-cli' - -if [ $current_name = $cmd_name ] -then - java processing.app.Commander "$@" -else - java processing.app.Base "$SKETCH" & -fi From 75edd719f0e4c10f6e2896264b297eb095ca9106 Mon Sep 17 00:00:00 2001 From: Ostap Andrusiv Date: Sun, 21 Apr 2013 00:43:24 +0300 Subject: [PATCH 6/6] updated files due to new file structure --- {app => android}/src/processing/mode/android/Commander.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {app => android}/src/processing/mode/android/Commander.java (100%) diff --git a/app/src/processing/mode/android/Commander.java b/android/src/processing/mode/android/Commander.java similarity index 100% rename from app/src/processing/mode/android/Commander.java rename to android/src/processing/mode/android/Commander.java