~mrms/tarum

4ad2ec96ba15cde69c5c0279757a45c944155d11 — Marek Maškarinec 9 months ago 14fbfd0
Update UmBox
4 files changed, 18 insertions(+), 21 deletions(-)

M .build.yml
M .gitignore
M Makefile
R pak.json => box.json
M .build.yml => .build.yml +13 -16
@@ 1,28 1,25 @@
image: debian/bullseye
packages:
- python3
- python3-pip
- curl
- mingw-w64
- unzip
secrets:
- 1f9f8058-774e-4765-83d4-548a138a1c05
sources:
- https://git.sr.ht/~mrms/tarum
- https://git.sr.ht/~mrms/pak
environment:
  project: tar
secrets:
- 1f9f8058-774e-4765-83d4-548a138a1c05
shell: false
    NAME: tarum
tasks:
- setup: |
    cd pak
    python3 -m pip install -r requirements.txt
    ./setup.py install --user
    curl https://mrms.cz/dl/up/umbox_portable.zip -O
    unzip umbox_portable.zip
- build: |
    cd tarum
    python3 -m pak update
    python3 -m pak build
    cd $NAME
    ../umbox_portable/umbox update
    ../umbox_portable/umbox build
- deploy: |
    cd tarum
    cd $NAME
    set +x
    python3 -m pak upload -t `cat ../.secret` pak.tar
    python3 -m pak upload -t `cat ../.secret` pak.json
    ../umbox_portable/umbox upload `cat ../.secret` box.tar
    ../umbox_portable/umbox upload `cat ../.secret` box.json
    set -x

M .gitignore => .gitignore +1 -1
@@ 1,4 1,4 @@
*.umi
pak/
umbox/
extracted
test.tar

M Makefile => Makefile +4 -4
@@ 1,18 1,18 @@

CROSS_CC=x86_64-w64-mingw32-gcc
NAME=tar
UMKA=./pak/umka/linux/umka
UMKA=./umbox/umka/linux/umka
CFLAGS= \
	-Wall \
	-Wno-unused-label \
	-Wno-pointer-to-int-cast \
	-Wno-unused-result \
	-Ipak/umka/ \
	-Iumbox/umka/ \
	-I. \
	-Imicrotar/src/ \
	-fPIC \
	-g
LDFLAGS=pak/umka/linux/libumka_static.a
LDFLAGS=umbox/umka/linux/libumka_static.a

.PHONY: all
all: build


@@ 23,7 23,7 @@ all: build

%_windows.umi: %.c Makefile
	@echo CC $@
	@$(CROSS_CC) -shared $(CFLAGS) -o $@ $< microtar/src/microtar.c -Lpak/umka/windows -lumka
	@$(CROSS_CC) -shared $(CFLAGS) -o $@ $< microtar/src/microtar.c -Lumbox/umka/windows -lumka

.PHONY: build
build: $(NAME)_windows.umi $(NAME)_linux.umi

R pak.json => box.json +0 -0