From 87765b2b92f5fa58f270c21d0df52be42e7d3d0d Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Mon, 15 Apr 2024 13:40:10 +0200
Subject: [PATCH] add make install and tolling similar to x48ng's

---
 Makefile                     |  28 +++++++++++++++++++++++-----
 {ROMs => dist/ROMs}/Makefile |   0
 {ROMs => dist/ROMs}/gxrom-l  | Bin
 {ROMs => dist/ROMs}/gxrom-m  | Bin
 {ROMs => dist/ROMs}/gxrom-p  | Bin
 {ROMs => dist/ROMs}/gxrom-r  | Bin
 {ROMs => dist/ROMs}/sxrom-a  | Bin
 {ROMs => dist/ROMs}/sxrom-b  | Bin
 {ROMs => dist/ROMs}/sxrom-c  | Bin
 {ROMs => dist/ROMs}/sxrom-d  | Bin
 {ROMs => dist/ROMs}/sxrom-e  | Bin
 {ROMs => dist/ROMs}/sxrom-j  | Bin
 dist/hpemu.desktop           |   9 +++++++++
 dist/hplogo.png              | Bin 0 -> 4456 bytes
 dist/setup-hpemu-home.sh     |  11 +++++++++++
 src/files.c                  |   2 +-
 src/rpl.c                    |  31 ++++++++++++-------------------
 17 files changed, 56 insertions(+), 25 deletions(-)
 rename {ROMs => dist/ROMs}/Makefile (100%)
 rename {ROMs => dist/ROMs}/gxrom-l (100%)
 rename {ROMs => dist/ROMs}/gxrom-m (100%)
 rename {ROMs => dist/ROMs}/gxrom-p (100%)
 rename {ROMs => dist/ROMs}/gxrom-r (100%)
 rename {ROMs => dist/ROMs}/sxrom-a (100%)
 rename {ROMs => dist/ROMs}/sxrom-b (100%)
 rename {ROMs => dist/ROMs}/sxrom-c (100%)
 rename {ROMs => dist/ROMs}/sxrom-d (100%)
 rename {ROMs => dist/ROMs}/sxrom-e (100%)
 rename {ROMs => dist/ROMs}/sxrom-j (100%)
 create mode 100644 dist/hpemu.desktop
 create mode 100644 dist/hplogo.png
 create mode 100755 dist/setup-hpemu-home.sh

diff --git a/Makefile b/Makefile
index 624e16c..286d168 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+PREFIX = /usr
+DOCDIR = $(PREFIX)/doc/hpemu
+
 CC = gcc
 LIBS = $(shell pkg-config --libs sdl2 SDL2_ttf)
 CFLAGS = -Wall -Werror -O3 -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=missing-braces -Wno-error=incompatible-pointer-types
@@ -22,11 +25,6 @@ dist/hpemu: src/bus.o \
 	src/timers.o
 	$(CC) $(CFLAGS) $(LIBS) -o $@ $+
 
-# Installing
-
-get-roms:
-	make -C ROMs get-roms
-
 # Cleaning
 clean:
 	-rm src/*.o
@@ -39,3 +37,23 @@ clean-all: mrproper
 # Formatting
 pretty-code:
 	clang-format -i src/*.c src/*.h
+
+# Installing
+get-roms:
+	make -C dist/ROMs get-roms
+
+install: all get-roms
+	install -m 755 -d -- $(DESTDIR)$(PREFIX)/bin
+	install -c -m 755 dist/hpemu $(DESTDIR)$(PREFIX)/bin/hpemu
+
+	install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/hpemu
+	install -c -m 644 dist/hplogo.png $(DESTDIR)$(PREFIX)/share/hpemu/hplogo.png
+	cp -R dist/ROMs/ $(DESTDIR)$(PREFIX)/share/hpemu/
+	sed "s|@PREFIX@|$(PREFIX)|g" dist/setup-hpemu-home.sh > $(DESTDIR)$(PREFIX)/share/hpemu/setup-hpemu-home.sh
+	chmod 755 $(DESTDIR)$(PREFIX)/share/hpemu/setup-hpemu-home.sh
+
+	install -m 755 -d -- $(DESTDIR)$(DOCDIR)
+	cp -R ./*.txt $(DESTDIR)$(DOCDIR)
+
+	install -m 755 -d -- $(DESTDIR)$(PREFIX)/share/applications
+	sed "s|@PREFIX@|$(PREFIX)|g" dist/hpemu.desktop > $(DESTDIR)$(PREFIX)/share/applications/hpemu.desktop
diff --git a/ROMs/Makefile b/dist/ROMs/Makefile
similarity index 100%
rename from ROMs/Makefile
rename to dist/ROMs/Makefile
diff --git a/ROMs/gxrom-l b/dist/ROMs/gxrom-l
similarity index 100%
rename from ROMs/gxrom-l
rename to dist/ROMs/gxrom-l
diff --git a/ROMs/gxrom-m b/dist/ROMs/gxrom-m
similarity index 100%
rename from ROMs/gxrom-m
rename to dist/ROMs/gxrom-m
diff --git a/ROMs/gxrom-p b/dist/ROMs/gxrom-p
similarity index 100%
rename from ROMs/gxrom-p
rename to dist/ROMs/gxrom-p
diff --git a/ROMs/gxrom-r b/dist/ROMs/gxrom-r
similarity index 100%
rename from ROMs/gxrom-r
rename to dist/ROMs/gxrom-r
diff --git a/ROMs/sxrom-a b/dist/ROMs/sxrom-a
similarity index 100%
rename from ROMs/sxrom-a
rename to dist/ROMs/sxrom-a
diff --git a/ROMs/sxrom-b b/dist/ROMs/sxrom-b
similarity index 100%
rename from ROMs/sxrom-b
rename to dist/ROMs/sxrom-b
diff --git a/ROMs/sxrom-c b/dist/ROMs/sxrom-c
similarity index 100%
rename from ROMs/sxrom-c
rename to dist/ROMs/sxrom-c
diff --git a/ROMs/sxrom-d b/dist/ROMs/sxrom-d
similarity index 100%
rename from ROMs/sxrom-d
rename to dist/ROMs/sxrom-d
diff --git a/ROMs/sxrom-e b/dist/ROMs/sxrom-e
similarity index 100%
rename from ROMs/sxrom-e
rename to dist/ROMs/sxrom-e
diff --git a/ROMs/sxrom-j b/dist/ROMs/sxrom-j
similarity index 100%
rename from ROMs/sxrom-j
rename to dist/ROMs/sxrom-j
diff --git a/dist/hpemu.desktop b/dist/hpemu.desktop
new file mode 100644
index 0000000..ad69a24
--- /dev/null
+++ b/dist/hpemu.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=@PREFIX@/bin/hpemu
+Name=hpemu
+Icon=@PREFIX@/share/hpemu/hplogo.png
+Categories=Utility;
diff --git a/dist/hplogo.png b/dist/hplogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4fff9fe4fdccab3f3c501f92d1b4f5b056461ca
GIT binary patch
literal 4456
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
RE(dxEbcw69b@8th{THM@So#0}

literal 0
HcmV?d00001

diff --git a/dist/setup-hpemu-home.sh b/dist/setup-hpemu-home.sh
new file mode 100755
index 0000000..cdfb802
--- /dev/null
+++ b/dist/setup-hpemu-home.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+DOTHPEMU=${DOTHPEMU:-.config/hpemu}
+
+ROM=${ROM:-gxrom-r}
+
+mkdir -p ~/"${DOTHPEMU}"
+
+[ -e ~/"${DOTHPEMU}"/rom ] && rm ~/"${DOTHPEMU}"/rom
+ln -s @PREFIX@/share/hpemu/ROMs/"$ROM" ~/"${DOTHPEMU}"/rom
+cd ~/"${DOTHPEMU}"
diff --git a/src/files.c b/src/files.c
index 1868371..087a41e 100644
--- a/src/files.c
+++ b/src/files.c
@@ -367,8 +367,8 @@ void rom_init( char* filename )
         printf( "ERROR: can't read ROM file\n" );
         exit( 0x14 );
     }
-    // pack_fclose(f);
     fclose( f );
+
     if ( buf[ 0 ] & 0xF0 || buf[ 1 ] & 0xF0 ) {
         if ( size == 1024 * 1024 ) {
             printf( "ERROR: wrong ROM\n" );
diff --git a/src/rpl.c b/src/rpl.c
index 7dc2ae0..5dc03f1 100644
--- a/src/rpl.c
+++ b/src/rpl.c
@@ -14,10 +14,8 @@
 int rpl_object_size( byte* obj )
 {
     int size;
-    int prologue;
     int n;
-
-    prologue = nib_to_unsigned( obj, 5 );
+    int prologue = nib_to_unsigned( obj, 5 );
 
     switch ( prologue ) {
 
@@ -85,9 +83,9 @@ int rpl_object_size( byte* obj )
 
         case 0x02A96: // Directory
             n = nib_to_unsigned( obj + 8, 5 );
-            if ( n == 0 ) {
+            if ( n == 0 )
                 size = 13;
-            } else {
+            else {
                 size = 8 + n;
                 size += 4 + 2 * nib_to_unsigned( obj + size, 2 );
                 size += rpl_object_size( obj + size );
@@ -103,9 +101,8 @@ int rpl_object_size( byte* obj )
 static address read_address( address adr )
 {
     byte buf[ 5 ];
-    word ocrc;
+    word ocrc = crc;
 
-    ocrc = crc;
     bus_read( buf, adr, 5 );
     crc = ocrc;
 
@@ -123,12 +120,11 @@ static void write_address( address adr, address val )
 static int moveup( address src, address dst, address cnt )
 {
     byte* buf = malloc( cnt * sizeof( byte ) );
-    word ocrc;
 
     if ( !buf )
         return -1;
 
-    ocrc = crc;
+    word ocrc = crc;
     bus_read( buf, src, cnt );
     bus_write( buf, dst, cnt );
     crc = ocrc;
@@ -139,14 +135,12 @@ static int moveup( address src, address dst, address cnt )
 
 address rpl_make_temp( address size )
 {
-    address temptop, rsktop, dsktop;
+    address temptop = read_address( TEMPTOP );
+    address rsktop = read_address( RSKTOP );
+    address dsktop = read_address( DSKTOP );
 
     size += 6;
 
-    temptop = read_address( TEMPTOP );
-    rsktop = read_address( RSKTOP );
-    dsktop = read_address( DSKTOP );
-
     if ( rsktop + size > dsktop )
         return 0;
 
@@ -163,24 +157,23 @@ address rpl_make_temp( address size )
 
 void rpl_push( address adr )
 {
-    address dsktop, avmem;
+    address avmem = read_address( AVMEM );
 
-    avmem = read_address( AVMEM );
     if ( !avmem )
         return;
     write_address( AVMEM, avmem - 1 );
 
-    dsktop = read_address( DSKTOP );
+    address dsktop = read_address( DSKTOP );
     dsktop -= 5;
+
     write_address( dsktop, adr );
     write_address( DSKTOP, dsktop );
 }
 
 int rpl_push_object( byte* obj, address size )
 {
-    address adr;
+    address adr = rpl_make_temp( size );
 
-    adr = rpl_make_temp( size );
     if ( !adr )
         return -1;