From f38c1d8d13349ddfc493fbd4c2d5a170ec0487ed Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 31 Mar 2021 14:23:48 +0100 Subject: [PATCH 1/2] Codechange: Prioritise .ottdrev file over git checkout --- findversion.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/findversion.sh b/findversion.sh index 8e31219..ce1649a 100755 --- a/findversion.sh +++ b/findversion.sh @@ -57,7 +57,12 @@ ROOT_DIR=`pwd` # Determine if we are using a modified version # Assume the dir is not modified MODIFIED="0" -if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then +if [ -f "$ROOT_DIR/.ottdrev" ]; then + # We are an exported source bundle + cat $ROOT_DIR/.ottdrev + exit + +elif [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then # We are a git checkout # Refresh the index to make sure file stat info is in sync, then look for modifications git update-index --refresh >/dev/null @@ -92,10 +97,6 @@ if [ -d "$ROOT_DIR/.git" ] || [ -f "$ROOT_DIR/.git" ]; then ISSTABLETAG="0" fi -elif [ -f "$ROOT_DIR/.ottdrev" ]; then - # We are an exported source bundle - cat $ROOT_DIR/.ottdrev - exit else # We don't know MODIFIED="1" From 6a6b61b121678898fac15eb165545a4d7980e0dc Mon Sep 17 00:00:00 2001 From: Charles Pigott Date: Wed, 31 Mar 2021 14:27:52 +0100 Subject: [PATCH 2/2] Doc: Changelog for 0.4.0 release --- docs/changelog.ptxt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/changelog.ptxt b/docs/changelog.ptxt index 91ff3dd..240c8ea 100644 --- a/docs/changelog.ptxt +++ b/docs/changelog.ptxt @@ -1,10 +1,17 @@ +OpenMSX 0.4.0 +------------- +Change: Restore 'Keep on Rolling' by Trolley Trev +Change: Stop calling OpenMSX a 'replacement' + + + OpenMSX 0.3.1 ------------- -- Change: Add copyright information to build system +Change: Add copyright information to build system -- Fix #1210: Typo in readme. -- Fix #1202: Replace 'Keep on rolling' (temporarily) with 'Big Man Boogie' by Jim Redfarn -- Fix #1078: Let songs set their assumed defaults (editing by Xrufu) +Fix #1210: Typo in readme. +Fix #1202: Replace 'Keep on rolling' (temporarily) with 'Big Man Boogie' by Jim Redfarn +Fix #1078: Let songs set their assumed defaults (editing by Xrufu)