Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Rename SCRCPY_SERVER_JAR to SCRCPY_SERVER_PATH

Browse source 
The server is currently a JAR, but it may ba an APK or a DEX, so the
variable name should not contain the type.

Rename the environment variable, the Meson options and the C
definitions.
This commit is contained in:
Romain Vimont 2018-02-16 15:19:35 +01:00
parent 60f3185185
commit 089378926b
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -34,7 +34,7 @@ build-portable:
[ -d "$(PORTABLE_BUILD_DIR)" ] || ( mkdir "$(PORTABLE_BUILD_DIR)" && \ [ -d "$(PORTABLE_BUILD_DIR)" ] || ( mkdir "$(PORTABLE_BUILD_DIR)" && \
meson "$(PORTABLE_BUILD_DIR)" \ meson "$(PORTABLE_BUILD_DIR)" \
--buildtype release --strip -Db_lto=true \ --buildtype release --strip -Db_lto=true \
-Doverride_server_jar=scrcpy-server.jar ) -Doverride_server_path=scrcpy-server.jar )
ninja -C "$(PORTABLE_BUILD_DIR)" ninja -C "$(PORTABLE_BUILD_DIR)"
release-portable: clean dist-portable-zip sums release-portable: clean dist-portable-zip sums

12
app/meson.build
View file

@ -48,19 +48,19 @@ conf.set_quoted('SCRCPY_VERSION', '0.1')
conf.set_quoted('PREFIX', get_option('prefix')) conf.set_quoted('PREFIX', get_option('prefix'))
# the path of the server, which will be appended to the prefix # the path of the server, which will be appended to the prefix
# ignored if OVERRIDE_SERVER_JAR if defined # ignored if OVERRIDE_SERVER_PATH if defined
# must be consistent with the install_dir in server/meson.build # must be consistent with the install_dir in server/meson.build
conf.set_quoted('PREFIXED_SERVER_JAR', '/share/scrcpy/scrcpy-server.jar') conf.set_quoted('PREFIXED_SERVER_PATH', '/share/scrcpy/scrcpy-server.jar')
# the path of the server to be used "as is" # the path of the server to be used "as is"
# this is useful for building a "portable" version (with the server in the same # this is useful for building a "portable" version (with the server in the same
# directory as the client) # directory as the client)
override_server_jar = get_option('override_server_jar') override_server_path = get_option('override_server_path')
if override_server_jar != '' if override_server_path != ''
conf.set_quoted('OVERRIDE_SERVER_JAR', override_server_jar) conf.set_quoted('OVERRIDE_SERVER_PATH', override_server_path)
else else
# undefine it # undefine it
conf.set('OVERRIDE_SERVER_JAR', false) conf.set('OVERRIDE_SERVER_PATH', false)
endif endif
# the default client TCP port for the "adb reverse" tunnel # the default client TCP port for the "adb reverse" tunnel

10
app/src/server.c
View file

@ -11,16 +11,16 @@
#define SOCKET_NAME "scrcpy" #define SOCKET_NAME "scrcpy"
#ifdef OVERRIDE_SERVER_JAR #ifdef OVERRIDE_SERVER_PATH
# define DEFAULT_SERVER_JAR OVERRIDE_SERVER_JAR # define DEFAULT_SERVER_PATH OVERRIDE_SERVER_PATH
#else #else
# define DEFAULT_SERVER_JAR PREFIX PREFIXED_SERVER_JAR # define DEFAULT_SERVER_PATH PREFIX PREFIXED_SERVER_PATH
#endif #endif
static const char *get_server_path(void) { static const char *get_server_path(void) {
const char *server_path = getenv("SCRCPY_SERVER_JAR"); const char *server_path = getenv("SCRCPY_SERVER_PATH");
if (!server_path) { if (!server_path) {
server_path = DEFAULT_SERVER_JAR; server_path = DEFAULT_SERVER_PATH;
} }
return server_path; return server_path;
} }

2
meson_options.txt
View file

@ -1,5 +1,5 @@
option('build_app', type: 'boolean', value: true, description: 'Build the client') option('build_app', type: 'boolean', value: true, description: 'Build the client')
option('build_server', type: 'boolean', value: true, description: 'Build the server') option('build_server', type: 'boolean', value: true, description: 'Build the server')
option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server') option('prebuilt_server', type: 'string', description: 'Path of the prebuilt server')
option('override_server_jar', type: 'string', description: 'Hardcoded path to find the server at runtime') option('override_server_path', type: 'string', description: 'Hardcoded path to find the server at runtime')
option('skip_frames', type: 'boolean', value: true, description: 'Always display the most recent frame') option('skip_frames', type: 'boolean', value: true, description: 'Always display the most recent frame')

2
run
View file

@ -20,4 +20,4 @@ then
exit 1 exit 1
fi fi
SCRCPY_SERVER_JAR="$BUILDDIR/server/scrcpy-server.jar" "$BUILDDIR/app/scrcpy" "$@" SCRCPY_SERVER_PATH="$BUILDDIR/server/scrcpy-server.jar" "$BUILDDIR/app/scrcpy" "$@"

2
scripts/run-scrcpy.sh
View file

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
SCRCPY_SERVER_JAR="$MESON_BUILD_ROOT/server/scrcpy-server.jar" "$MESON_BUILD_ROOT/app/scrcpy" SCRCPY_SERVER_PATH="$MESON_BUILD_ROOT/server/scrcpy-server.jar" "$MESON_BUILD_ROOT/app/scrcpy"