Updates from upstream

.dockerignore

@@ -1,21 +1,16 @@
-**
+.vscode
+games
+build
 
-!.git
-!assets/*.png
-!src/*.c
-!src/*.h
-!web/*.js
-!lib/Makefile*
-!cores/Makefile*
-!cores/override
+deps/*
+!deps/GNUmakefile
 
-!main.c
-!index.html
-!settings.json
-!Makefile*
-!package.json
-!package-lock.json
-!server.js
+cores/*
+!cores/GNUmakefile
+!cores/cores.json
+!cores/*.a
 
-!cores/**
-!lib/**
+app/build
+
+ui/node_modules
+ui/build

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/workflows/main.yml

@@ -0,0 +1,43 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: namaneo/junie
+
+  upload:
+    needs: docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract binaries
+        run: docker run --rm -v `pwd`/build:/build namaneo/junie cp -R /junie /build
+      - name: Upload Pages artifacts
+        uses: actions/upload-pages-artifact@v1
+        with:
+          path: build/junie/
+
+  deploy:
+    needs: upload
+    runs-on: ubuntu-latest
+    permissions:
+      pages: write
+      id-token: write
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.gitignore

@@ -1,15 +1,19 @@
-# Editor files
-.vscode
-node_modules
-
-# Build files
-*.a
-*.o
-include
-tmp
-bin
-dist
-
-# Core files
-system
-games
+/.vscode
+/games
+/data
+/build
+
+deps/*/
+deps/*.a
+cores/*/
+cores/*.a
+
+app/build
+app/sources/*.o
+
+app/include/res_inputs.h
+
+ui/build
+ui/node_modules
+ui/development.key
+ui/development.cert

Dockerfile

@@ -1,32 +1,36 @@
-FROM debian AS build
+# Build
+FROM node AS build
 
-WORKDIR /app
-
-ENV HOME=/app
-ENV TERM=vt100
+WORKDIR /junie
 
 RUN apt update
-RUN apt install -y curl make clang wget git bsdmainutils
+RUN apt install -y jq
+
+ADD GNUmakefile .
+ADD GNUmakefile.common .
 
-RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz
-RUN tar xvf wasi-sdk-12.0-linux.tar.gz
+ADD ./ui/package.json ./ui/package.json
+RUN make prepare
 
-ADD ./ ./
+ADD ./deps ./deps
+RUN make deps
 
-RUN make
+ADD ./cores ./cores
+RUN make cores
 
-FROM alpine AS runtime
+ADD ./app ./app
+RUN make app
 
-WORKDIR /app
+ADD ./ui ./ui
+RUN make ui
 
-RUN apk add nodejs npm
+# Run
+FROM node:alpine AS run
 
-COPY --from=build /app/bin/    ./bin/
-COPY --from=build /app/assets/ ./assets/
+WORKDIR /junie
 
-ADD package.json  ./
-ADD server.js     ./
+RUN npm install --global http-server
 
-RUN npm install
+COPY --from=build /junie/ui/build .
 
-ENTRYPOINT [ "node", "server.js" ]
+CMD http-server . --port ${PORT:-8000} --cors -c-1

GNUmakefile

@@ -0,0 +1,75 @@
+TARGET  := junie
+VERSION := 0.7.1-$(shell date +%s)
+
+ifeq ($(DEBUG), 1)
+BUILD := development
+else
+BUILD := production
+endif
+
+DEPS_DIR  := deps
+CORES_DIR := cores
+APP_DIR   := app
+UI_DIR    := ui
+OUT_DIR   := build
+
+QUIET := > /dev/null 2>&1
+MAKEFLAGS += --no-print-directory
+
+UI_FLAGS := --version $(VERSION)
+ifeq ($(DEBUG), 1)
+UI_FLAGS += --debug
+endif
+ifeq ($(UI_ONLY), 1)
+WATCH_CMD := $(MAKE) -C $(APP_DIR) DEBUG=$(DEBUG)
+else
+UI_FLAGS += --command "$(MAKE) -C ../$(APP_DIR) DEBUG=$(DEBUG)"
+endif
+
+.PHONY: deps cores app ui
+
+# Build
+
+all: clean prepare deps cores app ui
+
+deps:
+	@$(MAKE) -C $(DEPS_DIR)
+
+cores:
+	@$(MAKE) -C $(CORES_DIR)
+
+app:
+	@$(MAKE) -C $(APP_DIR) DEBUG=$(DEBUG)
+
+ui:
+	@echo Building application...
+	@( cd ui && node esbuild.mjs $(UI_FLAGS) $(QUIET) )
+
+# Watch
+
+watch: clean prepare deps cores
+	@$(WATCH_CMD)
+	@( cd ui && node esbuild.mjs --watch $(UI_FLAGS) )
+
+# Common
+
+prepare:
+	@echo Fetching dependencies...
+	@yarn --cwd $(UI_DIR) install $(QUIET)
+
+# Pack
+
+pack: all
+	@echo Packing Junie $(VERSION)...
+	@mkdir $(OUT_DIR)
+	@( cd $(UI_DIR)/$(OUT_DIR) && zip -r ../../$(OUT_DIR)/$(TARGET)-$(VERSION).zip `ls -I games` $(QUIET) )
+
+# Clean
+
+clean:
+	@$(MAKE) -C $(APP_DIR) clean
+	@rm -rf $(OUT_DIR) $(APP_DIR)/$(OUT_DIR) $(UI_DIR)/$(OUT_DIR)
+
+clean-all: clean
+	@$(MAKE) -C $(DEPS_DIR) clean
+	@$(MAKE) -C $(CORES_DIR) clean

GNUmakefile.common

@@ -0,0 +1,26 @@
+WASI_SDK   := $(shell pwd)/../deps/wasi-sdk
+EMSCRIPTEN := $(shell pwd)/../deps/emsdk/upstream/emscripten
+LIBRETRO   := $(shell pwd)/../deps/libretro-common
+
+MAKEFLAGS += --no-print-directory
+QUIET := > /dev/null 2>&1
+
+DEFINES += \
+	--sysroot=$(WASI_SDK)/share/wasi-sysroot \
+	--target=wasm32-wasi-threads -pthread \
+	-I$(EMSCRIPTEN)/cache/sysroot/include/c++/v1 \
+	-I$(EMSCRIPTEN)/cache/sysroot/include/compat \
+	-I$(EMSCRIPTEN)/cache/sysroot/include
+
+ifeq ($(DEBUG), 1)
+DEFINES += -O0 -ferror-limit=0 -DDEBUG
+LDFLAGS += -O0 -g -Wl,--error-limit=0
+else
+DEFINES += -O3
+LDFLAGS += -O3
+endif
+
+CC     := $(WASI_SDK)/bin/clang $(DEFINES)
+CXX    := $(WASI_SDK)/bin/clang++ $(DEFINES)
+AR     := $(WASI_SDK)/bin/ar
+RANLIB := $(WASI_SDK)/bin/ranlib