Add "make run"

To run the app during development, add a recipe "run" to the Makefile.
This commit is contained in:
Romain Vimont 2018-02-04 12:17:34 +01:00
parent 1ac37c4291
commit 82ee55845c
2 changed files with 29 additions and 5 deletions

View file

@ -1,4 +1,4 @@
.PHONY: default release clean build-app build-server dist dist-zip sums test .PHONY: default release clean build build-app build-server run dist dist-zip sums test
GRADLE ?= ./gradlew GRADLE ?= ./gradlew
@ -25,7 +25,12 @@ build-app:
build-server: build-server:
$(GRADLE) assembleRelease $(GRADLE) assembleRelease
dist: build-server build-app build: build-app build-server
run:
SCRCPY_SERVER_JAR=server/build/outputs/apk/release/server-release-unsigned.apk $(APP_BUILD_DIR)/scrcpy $(ARGS)
dist: build
mkdir -p "$(DIST)/$(TARGET_DIR)" mkdir -p "$(DIST)/$(TARGET_DIR)"
# no need to sign the APK, we dont "install" it, this is in fact a simple jar # no need to sign the APK, we dont "install" it, this is in fact a simple jar
cp server/build/outputs/apk/release/server-release-unsigned.apk "$(DIST)/$(TARGET_DIR)/scrcpy-server.jar" cp server/build/outputs/apk/release/server-release-unsigned.apk "$(DIST)/$(TARGET_DIR)/scrcpy-server.jar"

View file

@ -83,7 +83,7 @@ from the `PATH`:
export PATH="$JAVA_HOME/bin:$PATH" export PATH="$JAVA_HOME/bin:$PATH"
### Generate ### Build
Make sure your `ANDROID_HOME` variable is set to your Android SDK directory: Make sure your `ANDROID_HOME` variable is set to your Android SDK directory:
@ -91,9 +91,17 @@ Make sure your `ANDROID_HOME` variable is set to your Android SDK directory:
From the project root directory, execute: From the project root directory, execute:
make release make build
This will generate the application in `dist/scrcpy/`. To run the build:
make run
It is also pass arguments to `scrcpy` via `make`:
make run ARGS="-p 1234"
The purpose of this command is to execute `scrcpy` during the development.
### Test ### Test
@ -107,6 +115,15 @@ The server-side tests require JUnit 4:
sudo apt install junit4 sudo apt install junit4
### Generate a release
From the project root directory, execute:
make release
This will generate the application in `dist/scrcpy/`.
## Run ## Run
Plug a device, and from `dist/scrcpy/`, execute: Plug a device, and from `dist/scrcpy/`, execute:
@ -120,3 +137,5 @@ If several devices are listed in `adb devices`, you must specify the _serial_:
To change the default port (useful to launch several `scrcpy` simultaneously): To change the default port (useful to launch several `scrcpy` simultaneously):
./scrcpy -p 1234 ./scrcpy -p 1234
Other options are available, check `scrcpy --help`.