← all fixtures

shellscript-genymobile-scrcpy-add-two-flags

ShellScript View before/after files on GitHub Upstream commit Genymobile-scrcpy.git@c0e2e27 server/build_without_gradle.sh
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–64 unchanged (64 lines)
65do
66 CLASSES+=("${src%.java}.class")
67done
68
69echo "Compiling java sources..."
70cd ../java
71javac -bootclasspath "$ANDROID_JAR" \
72 -cp "$LAMBDA_JAR:$GEN_DIR" \
73 -d "$CLASSES_DIR" \
74 -source 1.8 -target 1.8 \
75 ${SRC[@]}
76
77echo "Dexing..."
…lines 78–107 unchanged (30 lines)

After

…lines 1–64 unchanged (64 lines)
65do
66 CLASSES+=("${src%.java}.class")
67done
68
69echo "Compiling java sources..."
70cd ../java
71javac -encoding UTF-8 -bootclasspath "$ANDROID_JAR" \
72 -cp "$LAMBDA_JAR:$GEN_DIR" \
73 -d "$CLASSES_DIR" \
74 -source 1.8 -target 1.8 \
75 ${SRC[@]}
76
77echo "Dexing..."
…lines 78–107 unchanged (30 lines)

Before

program
comment "#!/usr/bin/env bash"
comment "#"
comment "# This script generates the scrcpy binary \"manually\" (withou"...
comment "#"
comment "# Adapt Android platform and build tools versions (via ANDRO"...
comment "# ANDROID_BUILD_TOOLS environment variables)."
comment "#"
comment "# Then execute:"
comment "#"
comment "# BUILD_DIR=my_build_dir ./build_without_gradle.sh"
command
command_name
word "set"
word "-e"
variable_assignment
variable_name "SCRCPY_DEBUG"
= "="
word "false"
variable_assignment
variable_name "SCRCPY_VERSION_NAME"
= "="
word "2.7"
variable_assignment
variable_name "PLATFORM"
= "="
expansion
${ "${"
variable_name "ANDROID_PLATFORM"
:- ":-"
word "35"
} "}"
variable_assignment
variable_name "BUILD_TOOLS"
= "="
expansion
${ "${"
variable_name "ANDROID_BUILD_TOOLS"
:- ":-"
word "35.0.0"
} "}"
variable_assignment
variable_name "BUILD_TOOLS_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_HOME"
string_content "/build-tools/"
simple_expansion
$ "$"
variable_name "BUILD_TOOLS"
" "\""
variable_assignment
variable_name "BUILD_DIR"
= "="
string
" "\""
command_substitution
$( "$("
command
command_name
word "realpath"
expansion
${ "${"
variable_name "BUILD_DIR"
:- ":-"
word "build_manual"
} "}"
) ")"
" "\""
variable_assignment
variable_name "CLASSES_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/classes"
" "\""
variable_assignment
variable_name "GEN_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/gen"
" "\""
variable_assignment
variable_name "SERVER_DIR"
= "="
command_substitution
$( "$("
command
command_name
word "dirname"
string
" "\""
simple_expansion
$ "$"
variable_name "0"
" "\""
) ")"
variable_assignment
variable_name "SERVER_BINARY"
= "="
word "scrcpy-server"
variable_assignment
variable_name "ANDROID_JAR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_HOME"
string_content "/platforms/android-"
simple_expansion
$ "$"
variable_name "PLATFORM"
string_content "/android.jar"
" "\""
variable_assignment
variable_name "LAMBDA_JAR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/core-lambda-stubs.jar"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Platform: android-"
simple_expansion
$ "$"
variable_name "PLATFORM"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Build-tools: "
simple_expansion
$ "$"
variable_name "BUILD_TOOLS"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Build dir: "
simple_expansion
$ "$"
variable_name "BUILD_DIR"
" "\""
command (+27 nodes collapsed)
command
command_name
word "mkdir"
word "-p"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
command
command_name
word "mkdir"
word "-p"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
string_content "/com/genymobile/scrcpy"
" "\""
ERROR
< "<"
redirected_statement
command
file_redirect
< "<"
word "EOF"
command_name
word "cat"
file_redirect
> ">"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
string_content "/com/genymobile/scrcpy/BuildConfig.java"
" "\""
command
command_name
word "package"
word "com.genymobile.scrcpy"
; ";"
command
command_name
word "public"
word "final"
word "class"
word "BuildConfig"
word "{"
command
command_name
word "public"
word "static"
word "final"
word "boolean"
word "DEBUG"
word "="
simple_expansion
$ "$"
variable_name "SCRCPY_DEBUG"
; ";"
command
command_name
word "public"
word "static"
word "final"
word "String"
word "VERSION_NAME"
word "="
string
" "\""
simple_expansion
$ "$"
variable_name "SCRCPY_VERSION_NAME"
" "\""
; ";"
command
command_name
word "}"
command
command_name
word "EOF"
command
command_name
word "echo"
string
" "\""
string_content "Generating java from aidl..."
" "\""
command
command_name
word "cd"
string
" "\""
simple_expansion
$ "$"
variable_name "SERVER_DIR"
string_content "/src/main/aidl"
" "\""
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/view/IRotationWatcher.aidl"
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/content/IOnPrimaryClipChangedListener.aidl"
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/view/IDisplayFoldListener.aidl"
variable_assignment
variable_name "SRC"
= "="
array
( "("
word "com/genymobile/scrcpy/*.java"
word "com/genymobile/scrcpy/audio/*.java"
word "com/genymobile/scrcpy/control/*.java"
word "com/genymobile/scrcpy/device/*.java"
word "com/genymobile/scrcpy/util/*.java"
word "com/genymobile/scrcpy/video/*.java"
word "com/genymobile/scrcpy/wrappers/*.java"
) ")"
variable_assignment
variable_name "CLASSES"
= "="
array
( "("
) ")"
for_statement (+34 nodes collapsed)
command
command_name
word "echo"
string
" "\""
string_content "Compiling java sources..."
" "\""
command
command_name
word "cd"
word "../java"
command
command_name
word "javac"
word "-bootclasspath"
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_JAR"
" "\""
word "-cp"
string
" "\""
simple_expansion
$ "$"
variable_name "LAMBDA_JAR"
string_content ":"
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-d"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
word "-source"
word "1.8"
word "-target"
word "1.8"
expansion
${ "${"
subscript
variable_name "SRC"
[ "["
word "@"
] "]"
} "}"
command
command_name
word "echo"
string
" "\""
string_content "Dexing..."
" "\""
command
command_name
word "cd"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
if_statement (+130 nodes collapsed)
command
command_name
word "rm"
word "-rf"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Server generated in "
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/"
simple_expansion
$ "$"
variable_name "SERVER_BINARY"
" "\""

After

program
comment "#!/usr/bin/env bash"
comment "#"
comment "# This script generates the scrcpy binary \"manually\" (withou"...
comment "#"
comment "# Adapt Android platform and build tools versions (via ANDRO"...
comment "# ANDROID_BUILD_TOOLS environment variables)."
comment "#"
comment "# Then execute:"
comment "#"
comment "# BUILD_DIR=my_build_dir ./build_without_gradle.sh"
command
command_name
word "set"
word "-e"
variable_assignment
variable_name "SCRCPY_DEBUG"
= "="
word "false"
variable_assignment
variable_name "SCRCPY_VERSION_NAME"
= "="
word "2.7"
variable_assignment
variable_name "PLATFORM"
= "="
expansion
${ "${"
variable_name "ANDROID_PLATFORM"
:- ":-"
word "35"
} "}"
variable_assignment
variable_name "BUILD_TOOLS"
= "="
expansion
${ "${"
variable_name "ANDROID_BUILD_TOOLS"
:- ":-"
word "35.0.0"
} "}"
variable_assignment
variable_name "BUILD_TOOLS_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_HOME"
string_content "/build-tools/"
simple_expansion
$ "$"
variable_name "BUILD_TOOLS"
" "\""
variable_assignment
variable_name "BUILD_DIR"
= "="
string
" "\""
command_substitution
$( "$("
command
command_name
word "realpath"
expansion
${ "${"
variable_name "BUILD_DIR"
:- ":-"
word "build_manual"
} "}"
) ")"
" "\""
variable_assignment
variable_name "CLASSES_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/classes"
" "\""
variable_assignment
variable_name "GEN_DIR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/gen"
" "\""
variable_assignment
variable_name "SERVER_DIR"
= "="
command_substitution
$( "$("
command
command_name
word "dirname"
string
" "\""
simple_expansion
$ "$"
variable_name "0"
" "\""
) ")"
variable_assignment
variable_name "SERVER_BINARY"
= "="
word "scrcpy-server"
variable_assignment
variable_name "ANDROID_JAR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_HOME"
string_content "/platforms/android-"
simple_expansion
$ "$"
variable_name "PLATFORM"
string_content "/android.jar"
" "\""
variable_assignment
variable_name "LAMBDA_JAR"
= "="
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/core-lambda-stubs.jar"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Platform: android-"
simple_expansion
$ "$"
variable_name "PLATFORM"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Build-tools: "
simple_expansion
$ "$"
variable_name "BUILD_TOOLS"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Build dir: "
simple_expansion
$ "$"
variable_name "BUILD_DIR"
" "\""
command (+27 nodes collapsed)
command
command_name
word "mkdir"
word "-p"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
command
command_name
word "mkdir"
word "-p"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
string_content "/com/genymobile/scrcpy"
" "\""
ERROR
< "<"
redirected_statement
command
file_redirect
< "<"
word "EOF"
command_name
word "cat"
file_redirect
> ">"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
string_content "/com/genymobile/scrcpy/BuildConfig.java"
" "\""
command
command_name
word "package"
word "com.genymobile.scrcpy"
; ";"
command
command_name
word "public"
word "final"
word "class"
word "BuildConfig"
word "{"
command
command_name
word "public"
word "static"
word "final"
word "boolean"
word "DEBUG"
word "="
simple_expansion
$ "$"
variable_name "SCRCPY_DEBUG"
; ";"
command
command_name
word "public"
word "static"
word "final"
word "String"
word "VERSION_NAME"
word "="
string
" "\""
simple_expansion
$ "$"
variable_name "SCRCPY_VERSION_NAME"
" "\""
; ";"
command
command_name
word "}"
command
command_name
word "EOF"
command
command_name
word "echo"
string
" "\""
string_content "Generating java from aidl..."
" "\""
command
command_name
word "cd"
string
" "\""
simple_expansion
$ "$"
variable_name "SERVER_DIR"
string_content "/src/main/aidl"
" "\""
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/view/IRotationWatcher.aidl"
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/content/IOnPrimaryClipChangedListener.aidl"
command
command_name
string
" "\""
simple_expansion
$ "$"
variable_name "BUILD_TOOLS_DIR"
string_content "/aidl"
" "\""
concatenation
word "-o"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-I."
word "android/view/IDisplayFoldListener.aidl"
variable_assignment
variable_name "SRC"
= "="
array
( "("
word "com/genymobile/scrcpy/*.java"
word "com/genymobile/scrcpy/audio/*.java"
word "com/genymobile/scrcpy/control/*.java"
word "com/genymobile/scrcpy/device/*.java"
word "com/genymobile/scrcpy/util/*.java"
word "com/genymobile/scrcpy/video/*.java"
word "com/genymobile/scrcpy/wrappers/*.java"
) ")"
variable_assignment
variable_name "CLASSES"
= "="
array
( "("
) ")"
for_statement (+34 nodes collapsed)
command
command_name
word "echo"
string
" "\""
string_content "Compiling java sources..."
" "\""
command
command_name
word "cd"
word "../java"
command
command_name
word "javac"
word "-encoding"
word "UTF-8"
word "-bootclasspath"
string
" "\""
simple_expansion
$ "$"
variable_name "ANDROID_JAR"
" "\""
word "-cp"
string
" "\""
simple_expansion
$ "$"
variable_name "LAMBDA_JAR"
string_content ":"
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
word "-d"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
word "-source"
word "1.8"
word "-target"
word "1.8"
expansion
${ "${"
subscript
variable_name "SRC"
[ "["
word "@"
] "]"
} "}"
command
command_name
word "echo"
string
" "\""
string_content "Dexing..."
" "\""
command
command_name
word "cd"
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
if_statement (+130 nodes collapsed)
command
command_name
word "rm"
word "-rf"
string
" "\""
simple_expansion
$ "$"
variable_name "GEN_DIR"
" "\""
string
" "\""
simple_expansion
$ "$"
variable_name "CLASSES_DIR"
" "\""
command
command_name
word "echo"
string
" "\""
string_content "Server generated in "
simple_expansion
$ "$"
variable_name "BUILD_DIR"
string_content "/"
simple_expansion
$ "$"
variable_name "SERVER_BINARY"
" "\""