feat: better start
This commit is contained in:
@@ -26,7 +26,7 @@ remove-passwd:
|
||||
.PHONY: apt-install
|
||||
apt-install:
|
||||
sudo apt update
|
||||
sudo apt install -y weston seatd kitty git libglfw3-dev libgl-dev libasound2-dev libv4l-dev python3-pip python3-smbus i2c-tools
|
||||
sudo apt install -y weston seatd git libglfw3-dev libgl-dev libasound2-dev libv4l-dev python3-pip python3-smbus i2c-tools
|
||||
|
||||
.PHONY: pip-install
|
||||
pip-install:
|
||||
@@ -54,17 +54,13 @@ clean:
|
||||
.PHONY: build
|
||||
build: $(BUILD_DIR)/$(TARGET)
|
||||
|
||||
.PHONY: run
|
||||
run: $(BUILD_DIR)/$(TARGET)
|
||||
.PHONY: start-fg
|
||||
start-fg: $(BUILD_DIR)/$(TARGET)
|
||||
@$(BUILD_DIR)/$(TARGET) $(RUN_ARGS) 2>&1 | tee -ai $(PROJECT_DIR)/forge.log 2>&1 > /dev/null
|
||||
|
||||
.PHONY: start-bg
|
||||
start-bg:
|
||||
@python3 $(PROJECT_DIR)/__main__.py 2>&1 | tee -ai $(PROJECT_DIR)/python.log 2>&1 > /dev/null &
|
||||
|
||||
.PHONY: start-fg
|
||||
start-fg:
|
||||
@/usr/bin/weston --shell=kiosk-shell.so --xwayland --log=$(PROJECT_DIR)/weston.log -- kitty --hold make --silent --no-print-directory -C $(PROJECT_DIR) run 2>&1 > /dev/null
|
||||
|
||||
.PHONY: start
|
||||
start: start-bg start-fg
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
export PROJECT_DIR=/opt/forge-invar
|
||||
export SCREEN_HEIGHT=576
|
||||
|
||||
ln -fs $PROJECT_DIR/system/hdmi/weston.ini $HOME/.config/weston.ini
|
||||
export SCREEN_HEIGHT=480
|
||||
|
||||
rm -rf $PROJECT_DIR/*.log
|
||||
touch $PROJECT_DIR/*
|
||||
make -C /opt/forge-invar --silent --no-print-directory start
|
||||
|
||||
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/hdmi/weston.ini --log=$PROJECT_DIR/weston.log \
|
||||
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
export PROJECT_DIR=/opt/forge-invar
|
||||
export SCREEN_HEIGHT=480
|
||||
|
||||
ln -fs $PROJECT_DIR/system/ntsc/weston.ini $HOME/.config/weston.ini
|
||||
|
||||
rm -rf $PROJECT_DIR/*.log
|
||||
touch $PROJECT_DIR/*
|
||||
make -C /opt/forge-invar --silent --no-print-directory start
|
||||
|
||||
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/nstc/weston.ini --log=$PROJECT_DIR/weston.log \
|
||||
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
|
||||
|
||||
+3
-3
@@ -3,8 +3,8 @@
|
||||
export PROJECT_DIR=/opt/forge-invar
|
||||
export SCREEN_HEIGHT=576
|
||||
|
||||
ln -fs $PROJECT_DIR/system/pal/weston.ini $HOME/.config/weston.ini
|
||||
|
||||
rm -rf $PROJECT_DIR/*.log
|
||||
touch $PROJECT_DIR/*
|
||||
make -C /opt/forge-invar --silent --no-print-directory start
|
||||
|
||||
weston --shell=kiosk-shell.so --xwayland --config=$PROJECT_DIR/system/pal/weston.ini --log=$PROJECT_DIR/weston.log \
|
||||
-- make --silent --directory=$PROJECT_DIR start 2>&1 > /dev/null
|
||||
|
||||
Reference in New Issue
Block a user