From bee29c2c96f0089dbcacf28a10d1dc84386d8e17 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Wed, 20 Mar 2024 10:42:25 +0100 Subject: [PATCH] first real post Signed-off-by: Gwenhael Le Moine --- src/blog/gitting-emu48.org | 116 +++++++++++++++++++++++++++++++++++ src/blog/goodbye-markdown.md | 25 -------- src/blog/hello-org.org | 34 ---------- 3 files changed, 116 insertions(+), 59 deletions(-) create mode 100644 src/blog/gitting-emu48.org delete mode 100644 src/blog/goodbye-markdown.md delete mode 100644 src/blog/hello-org.org diff --git a/src/blog/gitting-emu48.org b/src/blog/gitting-emu48.org new file mode 100644 index 0000000..49b88f1 --- /dev/null +++ b/src/blog/gitting-emu48.org @@ -0,0 +1,116 @@ +--- +title: Git'ting Emu48 +date: 2024-03-20 10:12:24 +layout: post +lang: en +tags: [] +draft: true +--- +#+OPTIONS: toc:nil num:nil +#+LANGUAGE: en + +https://www.hpcalc.org/details/3644 + +Creating the repo +#+begin_src shell +git init +#+end_src + + +From 1.37 Emu48 is distributed as a `setup.exe` which I needed to install in Wine: +#+begin_src shell + for e in Emu48v137Setup.exe \ + Emu48v138Setup.exe \ + Emu48v140Setup.exe \ + Emu48v141Setup.exe \ + Emu48v142Setup.exe \ + Emu48v144Setup.exe \ + Emu48v145Setup.exe \ + Emu48v147Setup.exe \ + Emu48v148Setup.exe \ + Emu48v149Setup.exe \ + Emu48v150Setup.exe \ + Emu48v153Setup.exe \ + Emu48v155Setup.exe \ + Emu48v156Setup.exe \ + Emu48v157Setup.exe \ + Emu48v158Setup.exe \ + Emu48v159Setup.exe \ + Emu48v160Setup.exe \ + Emu48v161Setup.exe \ + Emu48v162Setup.exe \ + Emu48v163Setup.exe \ + Emu48v164Setup.exe \ + Emu48v165Setup.exe \ + Emu48v166Setup.exe ; do + WINEPREFIX=~/wine-Emu48 conty wine $e; + done +#+end_src + + +Once this was done these versions were applied in git: +#+begin_src shell + for e in "2005-06-14: Updated to version 1.37" \ + "2005-09-03: Updated to version 1.38" \ + "2005-12-17: Updated to version 1.40" \ + "2006-05-14: Updated to version 1.41" \ + "2006-11-24: Updated to version 1.42" \ + "2007-08-04: Updated to version 1.44" \ + "2007-09-25: Updated to version 1.45" \ + "2008-05-11: Updated to version 1.47" \ + "2009-08-01: Updated to version 1.48" \ + "2009-08-29: Updated to version 1.49" \ + "2010-07-31: Updated to version 1.50" \ + "2012-09-15: Updated to version 1.53" \ + "2013-09-14: Updated to version 1.55" \ + "2014-10-18: Updated to version 1.56" \ + "2015-08-15: Updated to version 1.57" \ + "2016-09-11: Updated to version 1.58" \ + "2017-08-15: Updated to version 1.59" \ + "2018-01-24: Updated to version 1.60" \ + "2018-08-18: Updated to version 1.61" \ + "2019-10-16: Updated to version 1.62" \ + "2020-09-30: Updated to version 1.63" \ + "2021-10-01: Updated to version 1.64" \ + "2022-07-31: Updated to version 1.65" \ + "2023-09-17: Updated to version 1.66"; do + ver=$(echo $e | grep -o "[0-9.]*$"); + rsync -Ha --delete --exclude .git ~/wine-Emu48/drive_c/Program\ Files\ \(x86\)/HP-Emulators/Emu48-$ver/ ./; + git add *; + git commit -sam "$e"; + git tag "$ver"; + done + git push + git push --tags +#+end_src + +Then I realized I forgot the 20th anniversary release (https://www.hpcalc.org/details/8654) which while the source is the same is nice the document in the history. +So onto inserting it between 1.59 and 1.60: +First installing it +#+begin_src shell + WINEPREFIX=~/wine-Emu48 conty wine ./Emu48v159Setup20thAnn.exe +#+end_src + +Then branch out a temp branch from 1.59 and layering 1.59 20th anniversary onto 1.59 +#+begin_src shell + git checkout -b temp 1.59 + rsync -Ha --exclude .git --delete ~/wine-Emu48/drive_c/Program\ Files\ \(x86\)/HP-Emulators/Emu48-1.59anniv/ ./ + git add * + git commit -sam "2017-08-19: Emu48 20th Anniversary" + git tag 1.59.a +#+end_src + +Finally rebase main onto temp +#+begin_src shell + git rebase temp main + git branch -d temp +#+end_src + +Now I had to re-tag 1.60 and later. I first deleted the tags +#+begin_src shell + for t in "1.60" "1.61" "1.62" "1.63" "1.64" "1.65" "1.66"; do + git tag -d $t; + git push --delete origin $t; + done +#+end_src +and then retagged the commits in Magit diff --git a/src/blog/goodbye-markdown.md b/src/blog/goodbye-markdown.md deleted file mode 100644 index 6c83b06..0000000 --- a/src/blog/goodbye-markdown.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: Goodbye Markdown... -tags: [blog] -date: 2024-02-16 -layout: post ---- - -## For the record - -For the record, even though it has *org* in the name, jorge can also render markdown, -thanks to [goldmark](https://github.com/yuin/goldmark/). - -Let's look at some code: - -``` python -import os - -def hello(): - print("Hello World!") - os.exit(0) - -hello() -``` - -[Next time](./hello-org), I'll talk about org-mode posts. diff --git a/src/blog/hello-org.org b/src/blog/hello-org.org deleted file mode 100644 index 73420e2..0000000 --- a/src/blog/hello-org.org +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: Hello Org! -subtitle: Writing posts with org-mode syntax -tags: [blog, emacs] -date: 2024-02-17 -layout: post ---- -#+OPTIONS: toc:nil num:nil - -** Indeed - -This post was originally written with org-mode syntax, instead of [[file:goodbye-markdown][markdown]]. - -As you can see, /italics/ and *bold* render as expected, and you can even use footnotes[fn:1]. - -All of this is powered by [[https://github.com/niklasfasching/go-org][go-org]], btw[fn:2]. - -Let's look at some code: - -#+begin_src python -import os - -def hello(): - print("Hello World!") - os.exit(0) - -hello() -#+end_src - -** Notes - -[fn:1] See? - -[fn:2] And another one footnote, to stay on the safe side.