gwh/x50ng
1
0
Fork 0
forked from Miroirs/x49gp
Code Pull requests Activity

replace pull-firmware.sh with a Makefile; move targets into dist/

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-10-22 13:28:00 +02:00
parent 3b19984aef
commit 4c9be25894
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
10 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -3,11 +3,14 @@
.depend .depend
*.o *.o
*.d *.d
/sdcard
/x49gp
/src/qemu-git/arm-softmmu /src/qemu-git/arm-softmmu
/src/qemu-git/libhw32 /src/qemu-git/libhw32
/src/qemu-git/libhw64 /src/qemu-git/libhw64
/src/qemu-git/config-host.* /src/qemu-git/config-host.*
/src/qemu-git/config-all-devices.mak /src/qemu-git/config-all-devices.mak
/firmware/*.bin /dist/x49gp
/dist/sdcard
/dist/firmware/*.zip
/dist/firmware/hp-arm-models-bootloader/
/dist/firmware/hp4950v215/
/dist/firmware/newrpl/

20
Makefile
View file

@ -37,8 +37,8 @@ X49GP_DEBUG = \
DEBUG = -g # -pg DEBUG = -g # -pg
IMAGE49GP = hp49g+.png IMAGE49GP = dist/hp49g+.png
IMAGE50G = hp50g.png IMAGE50G = dist/hp50g.png
QEMU_DEFINES = -DTARGET_ARM -DX49GP \ QEMU_DEFINES = -DTARGET_ARM -DX49GP \
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
@ -131,7 +131,7 @@ VVFATOBJS = $(SRC_DIR)/block-vvfat.o \
VVFATOBJS += $(QEMU_DIR)/cutils.o VVFATOBJS += $(QEMU_DIR)/cutils.o
TARGET = x49gp TARGET = dist/x49gp
TARGET_ALLCAPS = X49GP TARGET_ALLCAPS = X49GP
all: do-it-all all: do-it-all
@ -150,20 +150,20 @@ install: all $(TARGET).desktop $(TARGET).man
install -D -m 755 $(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET)" install -D -m 755 $(TARGET) "$(DESTDIR)$(INSTALL_BINARY_DIR)/$(TARGET)"
install -D -m 644 $(IMAGE49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE49GP)" install -D -m 644 $(IMAGE49GP) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE49GP)"
install -D -m 644 $(IMAGE50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE50G)" install -D -m 644 $(IMAGE50G) "$(DESTDIR)$(INSTALL_DATA_DIR)/$(IMAGE50G)"
install -D -m 755 pull-firmware.sh "$(DESTDIR)$(INSTALL_DATA_DIR)/pull-firmware.sh" install -D -m 755 dist/firmware "$(DESTDIR)$(INSTALL_DATA_DIR)/firmware"
install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop" install -D -m 644 $(TARGET).desktop "$(DESTDIR)$(INSTALL_MENU_DIR)/$(TARGET).desktop"
install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1" install -D -m 644 $(TARGET).man "$(DESTDIR)$(INSTALL_MAN_DIR)/$(TARGET).1"
$(TARGET).desktop: x49gp.desktop.in $(TARGET).desktop: $(TARGET).desktop.in
perl -p -e "s!TARGET!$(TARGET)!" <x49gp.desktop.in >$@ perl -p -e "s!TARGET!$(TARGET)!" <x49gp.desktop.in >$@
$(TARGET).man: x49gp.man.in $(TARGET).man: $(TARGET).man.in
perl -p -e "s!TARGET_ALLCAPS!$(TARGET_ALLCAPS)!;" -e "s!TARGET!$(TARGET)!" <x49gp.man.in >$@ perl -p -e "s!TARGET_ALLCAPS!$(TARGET_ALLCAPS)!;" -e "s!TARGET!$(TARGET)!" <x49gp.man.in >$@
sdcard: dist/sdcard:
ifeq ($(shell uname),Darwin) ifeq ($(shell uname),Darwin)
rm -f sdcard.dmg rm -f sdcard.dmg
hdiutil create sdcard -megabytes 64 -fs MS-DOS -volname x49gp hdiutil create $@ -megabytes 64 -fs MS-DOS -volname x49gp
else else
/sbin/mkdosfs -v -C -S 512 -f 2 -F 16 -r 512 -R 2 -n "x49gp" $@ 65536 /sbin/mkdosfs -v -C -S 512 -f 2 -F 16 -r 512 -R 2 -n "x49gp" $@ 65536
endif endif
@ -206,11 +206,13 @@ depend: depend-libs
$(MAKEDEPEND) $(CFLAGS) $(X49GP_CFLAGS) $(SRCS) >.depend $(MAKEDEPEND) $(CFLAGS) $(X49GP_CFLAGS) $(SRCS) >.depend
mrproper: clean-qemu distclean mrproper: clean-qemu distclean
make -C dist/firmware/ mrproper
pretty-code: pretty-code:
clang-format -i $(SRC_DIR)/*.c $(SRC_DIR)/*.h clang-format -i $(SRC_DIR)/*.c $(SRC_DIR)/*.h
pull-firmware: pull-firmware:
./pull-firmware.sh make -C dist/firmware/
dummy: dummy:

21
dist/firmware/Makefile vendored Normal file
View file

@ -0,0 +1,21 @@
.PHONY: get-roms mrproper
all: bootloaders official newrpl
mrproper:
rm -f ./hp-arm-models-bootloader ./hp4950v215 ./newrpl
bootloaders:
wget https://www.hpcalc.org/hp49/pc/rom/hp-arm-models-bootloader.zip
unzip -j hp-arm-models-bootloader.zip -d hp-arm-models-bootloader
rm hp-arm-models-bootloader.zip
official:
wget https://www.hpcalc.org/hp49/pc/rom/hp4950v215.zip
unzip -j hp4950v215.zip -d hp4950v215
rm hp4950v215.zip
newrpl:
mkdir -p newrpl
wget https://hpgcc3.org/downloads/newrplfw.bin -O newrpl/newrplfw.bin
echo "newrplfw.bin" > newrpl/update.scp

0
hp49g+.png → dist/hp49g+.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 416 KiB

After

Width:  |  Height:  |  Size: 416 KiB

0
hp49g+small-notext.png → dist/hp49g+small-notext.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 431 KiB

After

Width:  |  Height:  |  Size: 431 KiB

0
hp50g.png → dist/hp50g.png vendored
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 275 KiB

0
x49gp.desktop.in → dist/x49gp.desktop.in vendored
View file

0
x49gp.man.in → dist/x49gp.man.in vendored
View file

1
firmware/Placeholder
View file

@ -1 +0,0 @@
This folder will hold ROM binary files.

23
pull-firmware.sh
View file

@ -1,23 +0,0 @@
CWD=$(pwd)
TEMPDIR=${TEMPDIR:-$CWD/tmpdir}
FWDIR=${FWDIR:-$CWD/firmware}
mkdir -p "$FWDIR"
mkdir -p "$TEMPDIR"
cd "$TEMPDIR" || exit 1
echo "Retrieving Bootloader from hpcalc.org for HP 49g+ and HP 50g..."
wget https://www.hpcalc.org/hp49/pc/rom/hp-arm-models-bootloader.zip
unzip -j hp-arm-models-bootloader.zip -d "$TEMPDIR"
mv ./*.bin "$FWDIR"/
echo "Retrieving ROM 2.15 from hpcalc.org for HP 49g+ and HP 50g..."
wget https://www.hpcalc.org/hp49/pc/rom/hp4950v215.zip
unzip -j hp4950v215.zip -d "$TEMPDIR"
mv ./*.bin "$FWDIR"/
echo "Retrieving latest Unofficial newRPL build..."
wget https://hpgcc3.org/downloads/newrplfw.bin -O "$FWDIR"/newrplfw.bin
cd "$CWD" || exit 1
rm -rf "$TEMPDIR"