From 9f84c26545753ca3c90d246798d7cedadfde76ab Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 17:27:41 +0200 Subject: [PATCH 01/33] fix image --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1c0d11..8234b0f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ on: jobs: # This workflow contains a single job called "build" setup-sdk: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - name: Cache sdk @@ -83,7 +83,7 @@ jobs: build: # The type of runner that the job will run on needs: setup-sdk - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} @@ -129,7 +129,7 @@ jobs: upload: needs: build - runs-on: ubuntu-18.04 + runs-on: ubuntu22.04 defaults: run: shell: bash From b86e10721bf29e1c4a7c89d8baee6f93caefb9c8 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 17:28:54 +0200 Subject: [PATCH 02/33] fix typo --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8234b0f..7b1d68c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,7 +129,7 @@ jobs: upload: needs: build - runs-on: ubuntu22.04 + runs-on: ubuntu-22.04 defaults: run: shell: bash From 9d77e82b09199cb311eff82dbf6c9d240af193b4 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:39:13 +0200 Subject: [PATCH 03/33] fix pip configparser --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b1d68c..4f8e379 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -108,7 +108,9 @@ jobs: key: ${{ runner.os }}-orix-sdk_ - name: Prepare environment for project - run: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ + run: | + pip install configparser + mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make From 885d76fdbee52dbdb4a108426e2addab5698bad0 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:41:54 +0200 Subject: [PATCH 04/33] fix pip --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f8e379..eed828d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,11 +109,12 @@ jobs: - name: Prepare environment for project run: | - pip install configparser mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project - run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make + run: | + pip install configparser + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make - name: List build directory content run: ls -lR build From 75f75fd1b8bdbb8c62f027a8396ef153b8fac6ab Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:45:33 +0200 Subject: [PATCH 05/33] change image --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eed828d..3b0968b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ on: jobs: # This workflow contains a single job called "build" setup-sdk: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Cache sdk @@ -83,7 +83,7 @@ jobs: build: # The type of runner that the job will run on needs: setup-sdk - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} @@ -132,7 +132,7 @@ jobs: upload: needs: build - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 defaults: run: shell: bash From 39f938d139932000a6e5d926baf7bf6383d5bdcf Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:48:38 +0200 Subject: [PATCH 06/33] fix_cache_key --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b0968b..4c9c481 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_ + key: ${{ runner.os }}-orix-sdk_20_04 - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -105,7 +105,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_ + key: ${{ runner.os }}-orix-sdk_20_04 - name: Prepare environment for project run: | From 202fbd1e4d22e43186997ed833cb21cdb26590d3 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:52:08 +0200 Subject: [PATCH 07/33] test --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c9c481..27e0639 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,9 @@ jobs: - name: Compile project run: | + python -V pip install configparser + pip install ConfigParser CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make - name: List build directory content From 3c822fe6d687336cec8de82c586f44384069a938 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:55:11 +0200 Subject: [PATCH 08/33] change md2hlp to py3 --- docs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile b/docs/Makefile index a3e4e46..acc4989 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -18,7 +18,7 @@ VERBOSE ?= 0 # Définition des outils # -MD2HLP = $(MD2HLP_PATH)/md2hlp.py +MD2HLP = $(MD2HLP_PATH)/md2hlp.py3 # # Définition des options pour les outils From cfe4fff97293155d97eb06bb4b603ff87033f47e Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:58:00 +0200 Subject: [PATCH 09/33] fix image version --- .github/workflows/main.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 27e0639..4dc4ec4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ on: jobs: # This workflow contains a single job called "build" setup-sdk: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Cache sdk @@ -26,7 +26,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_20_04 + key: ${{ runner.os }}-orix-sdk_22_04 - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -83,7 +83,7 @@ jobs: build: # The type of runner that the job will run on needs: setup-sdk - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} @@ -105,7 +105,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_20_04 + key: ${{ runner.os }}-orix-sdk_22_04 - name: Prepare environment for project run: | @@ -113,9 +113,6 @@ jobs: - name: Compile project run: | - python -V - pip install configparser - pip install ConfigParser CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make - name: List build directory content @@ -134,7 +131,7 @@ jobs: upload: needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 defaults: run: shell: bash From 8050639a5417d9c1a412bdc8aa2be9695c972fc3 Mon Sep 17 00:00:00 2001 From: jedeoric Date: Wed, 24 May 2023 22:59:20 +0200 Subject: [PATCH 10/33] add github_action_badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a30f81b..3e32d23 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![build](https://github.com/orix-software/untar/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/orix-software/untar/actions/workflows/main.yml) + # Description Untar utility for Orix From 660ec3a0cd0a06938634194f4b0b88e7e541b187 Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 10 Nov 2025 23:37:18 +0100 Subject: [PATCH 11/33] fix/version_and_remove_BUFEDT --- .github/workflows/main.yml | 28 +++++++++++++++------------- VERSION | 2 +- docs/untar.md | 3 ++- src/cmnd/version.s | 2 +- src/untar.s | 16 +++++++++------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4dc4ec4..fb02f6c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,37 +14,39 @@ on: jobs: # This workflow contains a single job called "build" setup-sdk: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Cache sdk id: cache-sdk - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | cc65/**/* orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_22_04 + bpm/**/* + oricutron/**/* + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: cc65/cc65 path: cc65 - name: Checkout orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: assinie/orix-sdk path: orix-sdk - name: Checkout md2hlp if: steps.cache-sdk.outputs.cache-hit != 'true' - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: assinie/md2hlp path: md2hlp @@ -83,13 +85,13 @@ jobs: build: # The type of runner that the job will run on needs: setup-sdk - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set job variables id: job_vars @@ -98,14 +100,14 @@ jobs: echo "::set-output name=REPO_NAME::${GITHUB_REPOSITORY##*/}" - name: Install sdk - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | cc65/**/* orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk_22_04 + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Prepare environment for project run: | @@ -119,7 +121,7 @@ jobs: run: ls -lR build - name: Upload Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ steps.job_vars.outputs.REPO_NAME }} path: | @@ -131,7 +133,7 @@ jobs: upload: needs: build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash @@ -157,7 +159,7 @@ jobs: # On pourrait faire l'extraction directement à la racine si VERSION est dans l'artifact - name: Download Artifact id: download - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ needs.build.outputs.repo_name }} path: artifact diff --git a/VERSION b/VERSION index 7a6125d..3a18665 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2022.2 +2025.4 diff --git a/docs/untar.md b/docs/untar.md index 66cfb8c..dadc270 100644 --- a/docs/untar.md +++ b/docs/untar.md @@ -10,7 +10,8 @@ + untar -tf /home/test.tar ## DESCRIPTION -**untar** list and extract files in a TAR archive +**untar** list and extract files in a TAR archive. +**untar** manages only tar built with gnu format (from 'tar -c --format=gnu') ## OPTIONS * -h ^Bshow this help message and exit diff --git a/src/cmnd/version.s b/src/cmnd/version.s index fc88533..9cf2298 100644 --- a/src/cmnd/version.s +++ b/src/cmnd/version.s @@ -56,7 +56,7 @@ ; - prints ;---------------------------------------------------------------------- .proc cmnd_version - prints "untar version 1.0 - 2022.2\r\n" + prints "untar version 1.0 - 2025.4\r\n" rts .endproc diff --git a/src/untar.s b/src/untar.s index 9d0a719..fb631cc 100644 --- a/src/untar.s +++ b/src/untar.s @@ -130,6 +130,9 @@ typedef .struct st_header unsigned char xtrk unsigned char psec + ; For XMAINARGS + unsigned short cbp_bkp + unsigned char argc ;---------------------------------------------------------------------- ; Variables @@ -169,15 +172,12 @@ typedef .struct st_header ; contient normalement des données sauvegardées par init qui est dans le segment "ONCE" ; init: ; rts + + startup: jsr zerobss - ; XMAINARGS - ; .byte $00, $2c - - ; sta argv - ; sty argv+1 - ; stx argc + ; FIXME initmainargs cbp_bkp, argc, 1 lda #BUFEDT @@ -204,6 +204,7 @@ typedef .struct st_header adc cbp+1 jsr _main + ;FIXME mfree(cbp_bkp) rts .proc zerobss @@ -241,7 +242,7 @@ typedef .struct st_header L4: rts - rts + ; rts .endproc .segment "ONCE" @@ -319,6 +320,7 @@ MODULE , , startup jsr ermes end: crlf + rts .endproc From 4d23151f486672c0467da0d332a1b1d45484a9ec Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 10 Nov 2025 23:50:31 +0100 Subject: [PATCH 12/33] add reloc for untar --- make.sh | 38 ++++++++++++++++++++++++++++++++++++++ src/Makefile | 6 ++++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 make.sh diff --git a/make.sh b/make.sh new file mode 100644 index 0000000..99036d0 --- /dev/null +++ b/make.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# CC65_HOME=.. +# DEBUG=yes + +SDK_PATH="../orix-sdk" +PROGNAME="$(basename `pwd`)" + +make configure && make clean + +START_ADDR=0x0800 make +err=$? + +if [ $err -eq 0 ] +then + mv build/bin/${PROGNAME} build/bin/${PROGNAME}-0800 + + START_ADDR=0x0900 make + err=$? + + if [ $err -eq 0 ] + then + mv build/bin/${PROGNAME} build/bin/${PROGNAME}-0900 + + python3 ${SDK_PATH}/bin/relocbin.py3 -2 -o build/bin/${PROGNAME} build/bin/${PROGNAME}-0800 build/bin/${PROGNAME}-0900 + err=$? + + if [ $err -eq 0 ] + then + if [ "$DEBUG" = "" ] + then + rm build/bin/${PROGNAME}-0800 build/bin/${PROGNAME}-0900 + fi + fi + fi +fi + +exit $err diff --git a/src/Makefile b/src/Makefile index 4d6d017..93ebee9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -23,6 +23,8 @@ VERBOSE ?= 0 # TARGET = telestrat +START_ADDR ?= 0x0900 + # # Définition des outils # @@ -45,11 +47,11 @@ endif ifeq ($(DEBUG),yes) ASFLAGS = -t $(TARGET) -I ../ -I $(BUILD_PATH) -I $(SDK_PATH)/macros -I $(SDK_PATH)/include -I $(SHELL_PATH) -I $(KERNEL_PATH) -D VERBOSE_LEVEL=$(VERBOSE) --auto-import --list-bytes 0 -l $(@:.o=.lst) --debug-info - LDFLAGS = -t $(TARGET) -Ln $(@).ca.sym -m $(@).map --lib-path $(LIB_PATH) + LDFLAGS = -t $(TARGET) -Ln $(@).ca.sym -m $(@).map --lib-path $(LIB_PATH) --start-addr $(START_ADDR) # LDFLAGS = -C "$(LD65_CFG)" -Ln $(BUILD_PATH)/$(PROJECT).ca.sym -m $(BUILD_PATH)/$(PROJECT).map --lib-path $(LIB_PATH) else ASFLAGS = -t $(TARGET) -I ../ -I $(BUILD_PATH) -I $(SDK_PATH)/macros -I $(SDK_PATH)/include -I $(SHELL_PATH) -I $(KERNEL_PATH) -D VERBOSE_LEVEL=$(VERBOSE) --auto-import - LDFLAGS = -t $(TARGET) --lib-path $(LIB_PATH) + LDFLAGS = -t $(TARGET) --lib-path $(LIB_PATH) --start-addr $(START_ADDR) # LDFLAGS = -C "$(LD65_CFG)" --lib-path $(LIB_PATH) endif From 8c866726badba53351599a5b3153db027059246e Mon Sep 17 00:00:00 2001 From: jede Date: Mon, 10 Nov 2025 23:57:53 +0100 Subject: [PATCH 13/33] untar does not use now BUFEDT --- .github/workflows/main.yml | 3 +-- make.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb02f6c..36df548 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -114,8 +114,7 @@ jobs: mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project - run: | - CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make + run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh - name: List build directory content run: ls -lR build diff --git a/make.sh b/make.sh index 99036d0..1a7f438 100644 --- a/make.sh +++ b/make.sh @@ -3,6 +3,7 @@ # CC65_HOME=.. # DEBUG=yes + SDK_PATH="../orix-sdk" PROGNAME="$(basename `pwd`)" From 4176e7318789ff1ad817eacedd69182d17310d64 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 00:01:37 +0100 Subject: [PATCH 14/33] fix args --- src/untar.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/untar.s b/src/untar.s index fb631cc..424857e 100644 --- a/src/untar.s +++ b/src/untar.s @@ -177,12 +177,12 @@ typedef .struct st_header startup: jsr zerobss - ; FIXME initmainargs cbp_bkp, argc, 1 + initmainargs cbp_bkp, argc, 1 - lda #BUFEDT - sta cbp - sty cbp+1 + lda cbp_bkp + sta cbp + lda cbp_bkp+1 + sta cbp+1 ; Saute le nom de la commande ldy #$00 @@ -204,7 +204,7 @@ typedef .struct st_header adc cbp+1 jsr _main - ;FIXME mfree(cbp_bkp) + mfree(cbp_bkp) rts .proc zerobss From bc0579fbf4238dda41c0e421dec13a033e5272d6 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 00:03:08 +0100 Subject: [PATCH 15/33] fix test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36df548..23dd230 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: orix-software/**/* bpm/**/* oricutron/**/* - key: ${{ secrets.CACHE_ID }}-orix-sdk + key: ${{ runner.os }}-orix-sdk - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -107,7 +107,7 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ secrets.CACHE_ID }}-orix-sdk + key: ${{ runner.os }}-orix-sdk - name: Prepare environment for project run: | From 05f1541aaa5bada8d7b6eef05fd8f9279356135b Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 00:14:45 +0100 Subject: [PATCH 16/33] fix action --- .github/workflows/main.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23dd230..193a463 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,6 +4,7 @@ name: build on: # Triggers the workflow on push event only for all branches push: + branches: [ main, master, develop ] # branches: [ main, master ] #pull_request: # branches: [ main, master ] @@ -28,7 +29,7 @@ jobs: orix-software/**/* bpm/**/* oricutron/**/* - key: ${{ runner.os }}-orix-sdk + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Checkout cc65 if: steps.cache-sdk.outputs.cache-hit != 'true' @@ -70,6 +71,14 @@ jobs: echo "src/include" >> .git/info/sparse-checkout git checkout + - name: Prepare environment for oricutron + if: steps.cache-sdk.outputs.cache-hit != 'true' + run: | + sudo apt-get update && sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev + git clone https://github.com/pete-gordon/oricutron.git + cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE} + echo Timeout oricutron : ${secret}.TMOUT_ORICUTRON + - name: Compile orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' working-directory: orix-sdk @@ -107,7 +116,8 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* - key: ${{ runner.os }}-orix-sdk + oricutron/**/* + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Prepare environment for project run: | From fea880c4e1d04ca4bee04f08883aad6bdb9db930 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 11:28:37 +0100 Subject: [PATCH 17/33] fix test --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 193a463..e1a537a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: # Triggers the workflow on push event only for all branches push: branches: [ main, master, develop ] - # branches: [ main, master ] + #pull_request: # branches: [ main, master ] @@ -53,7 +53,7 @@ jobs: path: md2hlp - name: Compilation CC65 - if: steps.cache-sdk.outputs.cache-hit != 'true' + #if: steps.cache-sdk.outputs.cache-hit != 'true' run: make -C cc65 >/dev/null - name: Prepare environment for orix-sdk From b2416b7dcc0e7710adaea4a3129423d91507bcfd Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 11:30:52 +0100 Subject: [PATCH 18/33] fix/test --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1a537a..93f4e86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ name: build on: # Triggers the workflow on push event only for all branches push: - branches: [ main, master, develop ] + # branches: [ main, master, develop ] #pull_request: # branches: [ main, master ] From d86d9747c04c426fdc00b14651db4bc6a7a71d33 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 11:34:55 +0100 Subject: [PATCH 19/33] fix --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 93f4e86..808a995 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,7 +53,7 @@ jobs: path: md2hlp - name: Compilation CC65 - #if: steps.cache-sdk.outputs.cache-hit != 'true' + if: steps.cache-sdk.outputs.cache-hit != 'true' run: make -C cc65 >/dev/null - name: Prepare environment for orix-sdk From 5734c5ea3ffad392fb83ecc1910338b64326ec13 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 11:40:06 +0100 Subject: [PATCH 20/33] fix --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 808a995..04e4e34 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -121,6 +121,7 @@ jobs: - name: Prepare environment for project run: | + ls -l mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ - name: Compile project From 272df771340332c4dad5e50bb76da39b08b53562 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 21:01:01 +0100 Subject: [PATCH 21/33] fix test --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04e4e34..ea230b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -117,7 +117,8 @@ jobs: md2hlp/**/* orix-software/**/* oricutron/**/* - key: ${{ secrets.CACHE_ID }}-orix-sdk + + key: 11112025-orix-sdk - name: Prepare environment for project run: | @@ -131,7 +132,7 @@ jobs: run: ls -lR build - name: Upload Artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: ${{ steps.job_vars.outputs.REPO_NAME }} path: | From c1dc834deee8ca0f647be9fa19fb598edf2654d2 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 21:02:19 +0100 Subject: [PATCH 22/33] fix/test --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ea230b2..d2f4e44 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Cache sdk id: cache-sdk - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | cc65/**/* @@ -109,7 +109,7 @@ jobs: echo "::set-output name=REPO_NAME::${GITHUB_REPOSITORY##*/}" - name: Install sdk - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | cc65/**/* @@ -117,7 +117,6 @@ jobs: md2hlp/**/* orix-software/**/* oricutron/**/* - key: 11112025-orix-sdk - name: Prepare environment for project From fafd3b334541bf25aede35c2289402d09d141499 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 21:04:36 +0100 Subject: [PATCH 23/33] fix/test --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2f4e44..d5564f2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -116,8 +116,9 @@ jobs: orix-sdk/**/* md2hlp/**/* orix-software/**/* + bpm/**/* oricutron/**/* - key: 11112025-orix-sdk + key: ${{ secrets.CACHE_ID }}-orix-sdk - name: Prepare environment for project run: | From 8244a30e43efa72cc9aa3cc0aacb24e77dc7cc04 Mon Sep 17 00:00:00 2001 From: jede Date: Tue, 11 Nov 2025 21:06:53 +0100 Subject: [PATCH 24/33] fix/make.sh rights --- make.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 make.sh diff --git a/make.sh b/make.sh old mode 100644 new mode 100755 From a1720f9b13fb5cf9c03ff3dc461eafc443afa711 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 22:36:25 +0100 Subject: [PATCH 25/33] add bpm --- .github/workflows/main.yml | 19 ++++++++++++++++--- make.sh | 17 ++++------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d5564f2..cb0d55a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,13 @@ jobs: repository: cc65/cc65 path: cc65 + - name: Checkout bpm + if: steps.cache-sdk.outputs.cache-hit != 'true' + uses: actions/checkout@v3 + with: + repository: orix-software/bpm + path: bpm + - name: Checkout orix-sdk if: steps.cache-sdk.outputs.cache-hit != 'true' uses: actions/checkout@v3 @@ -98,6 +105,7 @@ jobs: outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} + bpm_found: ${{ steps.bpm_upload.outputs.BPM_FOUND }} steps: - uses: actions/checkout@v3 @@ -122,11 +130,16 @@ jobs: - name: Prepare environment for project run: | - ls -l - mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ + mkdir ~/bin + cd bpm && pip install -r requirements.txt && cd .. + mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../ - name: Compile project - run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh + run: | + if [ -f "bpm.tml" ]; then + chmod 755 ../bpm/src/bpm + bpm --force-update --replace-for-new-project -V + CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh - name: List build directory content run: ls -lR build diff --git a/make.sh b/make.sh index 1a7f438..b88b728 100755 --- a/make.sh +++ b/make.sh @@ -3,37 +3,28 @@ # CC65_HOME=.. # DEBUG=yes - SDK_PATH="../orix-sdk" PROGNAME="$(basename `pwd`)" make configure && make clean START_ADDR=0x0800 make -err=$? -if [ $err -eq 0 ] +if [ $? -eq 0 ] then mv build/bin/${PROGNAME} build/bin/${PROGNAME}-0800 START_ADDR=0x0900 make - err=$? - if [ $err -eq 0 ] + if [ $? -eq 0 ] then mv build/bin/${PROGNAME} build/bin/${PROGNAME}-0900 python3 ${SDK_PATH}/bin/relocbin.py3 -2 -o build/bin/${PROGNAME} build/bin/${PROGNAME}-0800 build/bin/${PROGNAME}-0900 - err=$? - if [ $err -eq 0 ] + if [ $? -eq 0 ] then - if [ "$DEBUG" = "" ] - then - rm build/bin/${PROGNAME}-0800 build/bin/${PROGNAME}-0900 - fi + rm build/bin/${PROGNAME}-0800 build/bin/${PROGNAME}-0900 fi fi fi - -exit $err From 3c7b0019857dd0726b667d6c1a96976b6d585522 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 23:09:15 +0100 Subject: [PATCH 26/33] fix fi main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb0d55a..7b27fc8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,7 @@ jobs: if [ -f "bpm.tml" ]; then chmod 755 ../bpm/src/bpm bpm --force-update --replace-for-new-project -V + fi CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh - name: List build directory content From 474ef77478e12ddd2be328efd13a826e4c9eae88 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 23:18:09 +0100 Subject: [PATCH 27/33] upload with bpm --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b27fc8..0c39caf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -189,12 +189,12 @@ jobs: name: ${{ needs.build.outputs.repo_name }} path: artifact - - name: Make archive - working-directory: ${{steps.download.outputs.download-path}} - run: tar -zcvf $GITHUB_WORKSPACE/$ARCHIVE_NAME * - - - name: Upload to oric + - name: Upload if bpm + id: bpm_upload run: | - if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then VERSION="$version"; else VERSION=alpha ; fi - curl -X POST --data-binary "@${ARCHIVE_NAME}" "https://cdn.oric.org/publish.php?hash=$hash&path=/home/oricoujr/www/ftp/orix/dists/$VERSION/tgz/6502/${ARCHIVE_NAME}" - + if [ -f "bpm.tml" ]; then + export BPM_PUBLISH_KEY=$hash + export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin + if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi + echo "BPM_FOUND=True" >> $GITHUB_OUTPUT + fi From 171e07437ef4954eb076d53f8025f7981e99b040 Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 23:20:18 +0100 Subject: [PATCH 28/33] fix/bug --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c39caf..ee76cae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -197,4 +197,6 @@ jobs: export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi echo "BPM_FOUND=True" >> $GITHUB_OUTPUT + else + echo "bpm.tml not found, skipping bpm upload" fi From d4a484ebb47758b2442c3afb9bd2757c9b4e8d5f Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 23:28:24 +0100 Subject: [PATCH 29/33] fix/bpm_upload --- .github/workflows/main.yml | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ee76cae..b3e38a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -156,39 +156,6 @@ jobs: - name: Post compilation run: mv ../cc65 . && mv ../orix-software . && mv ../orix-sdk . && mv ../md2hlp . - upload: - needs: build - runs-on: ubuntu-24.04 - defaults: - run: - shell: bash - env: - hash: ${{ secrets.HASH }} - version: ${{ needs.build.outputs.version }} - repo_name: ${{ needs.build.outputs.repo_name }} - - steps: - - name: Get branch name - if: github.event_name != 'pull_request' - run: echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV - # run: echo "::set-env name=BRANCH_NAME::$(echo ${GITHUB_REF##*/})" - - - name: Get branch name on pull request - if: github.event_name == 'pull_request' - run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> GITHUB_ENV - #run: echo "::set-env name=BRANCH_NAME::$(echo ${GITHUB_HEAD_REF})" - - - name: Get archive name - run: echo "ARCHIVE_NAME=${repo_name}.tgz" >> $GITHUB_ENV - - # On pourrait faire l'extraction directement à la racine si VERSION est dans l'artifact - - name: Download Artifact - id: download - uses: actions/download-artifact@v4 - with: - name: ${{ needs.build.outputs.repo_name }} - path: artifact - - name: Upload if bpm id: bpm_upload run: | @@ -200,3 +167,4 @@ jobs: else echo "bpm.tml not found, skipping bpm upload" fi + From f9117d84c9f62be20436a0ed49b777e58947230c Mon Sep 17 00:00:00 2001 From: jede Date: Thu, 13 Nov 2025 23:30:10 +0100 Subject: [PATCH 30/33] add debug --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b3e38a9..247da73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,6 +159,7 @@ jobs: - name: Upload if bpm id: bpm_upload run: | + ls -l if [ -f "bpm.tml" ]; then export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin From c4e2b60512d0cdedd60e9e0b53638437e7d4222e Mon Sep 17 00:00:00 2001 From: jede Date: Fri, 14 Nov 2025 00:13:43 +0100 Subject: [PATCH 31/33] add bpm.tml --- bpm.tml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 bpm.tml diff --git a/bpm.tml b/bpm.tml new file mode 100644 index 0000000..4b6992d --- /dev/null +++ b/bpm.tml @@ -0,0 +1,34 @@ +[package] +name = "untar" +version = "2025.4" +authors = [ "Assinie",] +license = "" +edition = "2025" +cpu = "6502" +readme = "" +repository = "https://github.com/orix-software/untar" +documentation = "" +description = "Provide untar" +homepage = "" +buildfolder = "build" +packagetype = "tgz" +codetype = "bin" +templatecode = "" +pathsrc = "src" +oricutron_replace_autoboot_run = "True" +asm_bin_tpl_version = "2024.4" +asm_rom_tpl_version = "2024.4" +orixsdk_version = "2023.3.0" +default_github_action_version = "2025.2" +default_generatedoc_version = "2025.4" +orix_minimal_kernel_version = "2022.3" +orix_run_pre_script = "" +md2hlp = "yes" +enable_build = "False" +enable_publish = "True" + +[dependencies] + +[dynamiclibs] + +[srcfolders] From a08466cdda355f99c9ac6f28193bba4edaad5db0 Mon Sep 17 00:00:00 2001 From: jede Date: Fri, 14 Nov 2025 00:20:30 +0100 Subject: [PATCH 32/33] fix path bpm --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 247da73..bd49d30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -138,6 +138,8 @@ jobs: run: | if [ -f "bpm.tml" ]; then chmod 755 ../bpm/src/bpm + echo "../bpm/src/bpm" >> $GITHUB_PATH + export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin bpm --force-update --replace-for-new-project -V fi CC65_HOME=${GITHUB_WORKSPACE}/../cc65 ./make.sh From 97e4de4a0d1e4c35665361d42ea9df0acb31ab78 Mon Sep 17 00:00:00 2001 From: jede Date: Fri, 14 Nov 2025 22:21:47 +0100 Subject: [PATCH 33/33] fix bpm --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bd49d30..fdae5d7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -102,6 +102,8 @@ jobs: # The type of runner that the job will run on needs: setup-sdk runs-on: ubuntu-24.04 + env: + hash: ${{ secrets.HASH }} outputs: version: ${{ steps.job_vars.outputs.VERSION }} repo_name: ${{ steps.job_vars.outputs.REPO_NAME }} @@ -166,7 +168,6 @@ jobs: export BPM_PUBLISH_KEY=$hash export PATH=$PATH:../bpm/src/:${GITHUB_WORKSPACE}/../cc65/bin if [ "$BRANCH_NAME" = "master" -o "$BRANCH_NAME" = "main" ]; then bpm --force-update -V;--force-update publish --official; else bpm publish --alpha; fi - echo "BPM_FOUND=True" >> $GITHUB_OUTPUT else echo "bpm.tml not found, skipping bpm upload" fi