Project: Move source files into src/ to tidy up root dir

* Source files move into src/
* Fonts move from mgtk/fonts to res/fonts
* A top-level Makefile is retained
* bin/ files are updated to reference new paths
* References to ../out from source files need an extra ../

Author: inexorabletash

Makefile

@@ -11,7 +11,7 @@ all: vercheck $(targets)
 # Build all targets
 $(targets):
 	@tput setaf 3 && echo "Building: $@" && tput sgr0
-	@$(MAKE) -C $@ \
+	@$(MAKE) -C src/$@ \
 	  && (tput setaf 2 && echo "make $@ good" && tput sgr0) \
           || (tput blink && tput setaf 1 && echo "MAKE $@ BAD" && tput sgr0 && false)
 
@@ -35,7 +35,7 @@ shk:
 clean:
 	@for dir in $(targets); do \
 	  tput setaf 2 && echo "cleaning $$dir" && tput sgr0; \
-	  $(MAKE) -C $$dir clean; \
+	  $(MAKE) -C src/$$dir clean; \
 	done
 
 # Ensure minimum cc65 version

bin/audit_das

@@ -10,7 +10,7 @@ max_seg_size=$(( 0x1C00 - 0x800 ))
 
 make
 printf "                       Main    Aux  Main%%  Aux%% \n"
-for file in $(cat desk.acc/TARGETS | bin/targets.pl targets | sort); do
+for file in $(cat src/desk.acc/TARGETS | bin/targets.pl targets | sort); do
     aux_lo=$(xxd -p -l1 -s0 "out/${file}.da")
     aux_hi=$(xxd -p -l1 -s1 "out/${file}.da")
     aux=$(( 0x${aux_hi}${aux_lo} ))

bin/bumpver

@@ -14,10 +14,10 @@ cd "$(dirname "$0")/.."
 # ============================================================
 # Extract metadata for the build
 
-vmajor=$(grep 'kDeskTopVersionMajor =' config.inc | sed -e 's/.* = //')
-vminor=$(grep 'kDeskTopVersionMinor =' config.inc | sed -e 's/.* = //')
-vsuffix=$(grep 'define kDeskTopVersionSuffix' config.inc | cut -d'"' -f2)
-lang=$(grep 'define kBuildLang' config.inc | cut -d'"' -f2)
+vmajor=$(grep 'kDeskTopVersionMajor =' src/config.inc | sed -e 's/.* = //')
+vminor=$(grep 'kDeskTopVersionMinor =' src/config.inc | sed -e 's/.* = //')
+vsuffix=$(grep 'define kDeskTopVersionSuffix' src/config.inc | cut -d'"' -f2)
+lang=$(grep 'define kBuildLang' src/config.inc | cut -d'"' -f2)
 vtype=$(echo "$vsuffix" | sed -E -e 's/^-//' -e 's/[0-9]+$//')
 vrel=$(echo "$vsuffix" | sed -E -e 's/[^0-9]*//')
 
@@ -33,7 +33,7 @@ echo "Bumping to ${version}..."
 
 bin/setlang "en"
 
-perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-${vtype}${vrel}\"/" config.inc
+perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-${vtype}${vrel}\"/" src/config.inc
 
 git commit -a -m "Bump verson to ${version}" > /dev/null
 git tag "v${version}" > /dev/null

bin/lkg

@@ -7,10 +7,10 @@ source "bin/util.sh"
 # ============================================================
 # Tweak config
 
-git checkout config.inc
+git checkout src/config.inc
 bin/setdate en
 hash=$(git rev-parse --short HEAD)
-perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-build-${hash}\"/" config.inc
+perl -pni -e "s/define kDeskTopVersionSuffix .*/define kDeskTopVersionSuffix \"-build-${hash}\"/" src/config.inc
 
 # ============================================================
 # Do a build and package
@@ -29,4 +29,4 @@ INSTALL_IMG="${lkg}" INSTALL_PATH="/A2.DESKTOP" bin/setopt noram nosel noshort c
 # ============================================================
 # Reset config
 
-git checkout config.inc
+git checkout src/config.inc

bin/loc_makeres.pl

@@ -131,7 +131,7 @@ ($$$$)
       my $outfile = $file;
       $outfile =~ s|/|/res/|;
       $outfile =~ s|\.s$|.res.$lang|;
-      open $fhs{$lang}, '>'.$outfile or die $!;
+      open $fhs{$lang}, '>src/'.$outfile or die $!;
     }
 
     %dupes = ();

bin/manifest

@@ -27,9 +27,9 @@ source "bin/util.sh"
 get_da_loc_name() {
     local name="$1"
     local res="res_filename_${name//./_}"
-    local filename="desk.acc/res/filenames.res.${lang}"
+    local filename="src/desk.acc/res/filenames.res.${lang}"
     if [[ -n "$no_loc_da_names" ]]; then
-      filename="desk.acc/res/filenames.res.en"
+      filename="src/desk.acc/res/filenames.res.en"
     fi
     local match=$(egrep -i "^\.define ${res} " "${filename}" | cut -d' ' -f3 | tr -d '"')
     echo "${match:-$name}"
@@ -107,7 +107,7 @@ emit add_file $disposition "res/package/SAM.BIN" "Extras" "SAM" 000000
 # Part 5: Desk Accessories (optional and extra)
 
 # Add Desk Accessories
-for line in $(cat desk.acc/TARGETS | bin/targets.pl); do
+for line in $(cat src/desk.acc/TARGETS | bin/targets.pl); do
     IFS=',' read -ra array <<< "$line"
     file="${array[0]}"
     loc=$(get_da_loc_name "$file")
@@ -149,44 +149,44 @@ if [[ -z "$no_sample_media" ]]; then
       emit add_file $disposition "out/System.$l.font"      $mediafnt "System.$l"      070000
       emit add_file $disposition "out/Monaco.$l.font"      $mediafnt "Monaco.$l"      070000
     done
-    emit add_file $disposition "mgtk/fonts/MousePaint"     $mediafnt "MousePaint"     070000
-    emit add_file $disposition "mgtk/fonts/mini"           $mediafnt "Mini"           070000
-    emit add_file $disposition "mgtk/fonts/Athens"         $mediafnt "Athens"         070000
-    emit add_file $disposition "mgtk/fonts/New.York"       $mediafnt "New.York"       070000
-    emit add_file $disposition "mgtk/fonts/Toronto"        $mediafnt "Toronto"        070000
-    emit add_file $disposition "mgtk/fonts/Venice"         $mediafnt "Venice"         070000
-    emit add_file $disposition "mgtk/fonts/Catalyst"       $mediafnt "Catalyst"       070000
-
-    emit add_file $disposition "mgtk/fonts/fairfax/Fairfax.en"   $mediafnt "Fairfax.en"     070000
-    emit add_file $disposition "mgtk/fonts/fairfax/FairfaxBd.en" $mediafnt "FairfaxBd.en"   070000
-    emit add_file $disposition "mgtk/fonts/fairfax/FairfaxIt.en" $mediafnt "FairfaxIt.en"   070000
-    emit add_file $disposition "mgtk/fonts/fairfax/FairfaxSf.en" $mediafnt "FairfaxSf.en"   070000
-    emit add_file $disposition "mgtk/fonts/erin/Magdalena.en"    $mediafnt "Magdalena.en"   070000
-    emit add_file $disposition "mgtk/fonts/erin/MagdalenaBd.en"  $mediafnt "MagdalenaBd.en" 070000
-    emit add_file $disposition "mgtk/fonts/erin/McMillen.en"     $mediafnt "McMillen.en"    070000
-    emit add_file $disposition "mgtk/fonts/erin/McMillenBd.en"   $mediafnt "McMillenBd.en"  070000
-    emit add_file $disposition "mgtk/fonts/erin/Mischke.en"      $mediafnt "Mischke.en"     070000
-    emit add_file $disposition "mgtk/fonts/erin/MischkeBd.en"    $mediafnt "MischkeBd.en"   070000
-    emit add_file $disposition "mgtk/fonts/erin/Monterey.en"     $mediafnt "Monterey.en"    070000
-    emit add_file $disposition "mgtk/fonts/erin/MontereyBd.en"   $mediafnt "MontereyBd.en"  070000
+    emit add_file $disposition "res/fonts/MousePaint"     $mediafnt "MousePaint"     070000
+    emit add_file $disposition "res/fonts/mini"           $mediafnt "Mini"           070000
+    emit add_file $disposition "res/fonts/Athens"         $mediafnt "Athens"         070000
+    emit add_file $disposition "res/fonts/New.York"       $mediafnt "New.York"       070000
+    emit add_file $disposition "res/fonts/Toronto"        $mediafnt "Toronto"        070000
+    emit add_file $disposition "res/fonts/Venice"         $mediafnt "Venice"         070000
+    emit add_file $disposition "res/fonts/Catalyst"       $mediafnt "Catalyst"       070000
+
+    emit add_file $disposition "res/fonts/fairfax/Fairfax.en"   $mediafnt "Fairfax.en"     070000
+    emit add_file $disposition "res/fonts/fairfax/FairfaxBd.en" $mediafnt "FairfaxBd.en"   070000
+    emit add_file $disposition "res/fonts/fairfax/FairfaxIt.en" $mediafnt "FairfaxIt.en"   070000
+    emit add_file $disposition "res/fonts/fairfax/FairfaxSf.en" $mediafnt "FairfaxSf.en"   070000
+    emit add_file $disposition "res/fonts/erin/Magdalena.en"    $mediafnt "Magdalena.en"   070000
+    emit add_file $disposition "res/fonts/erin/MagdalenaBd.en"  $mediafnt "MagdalenaBd.en" 070000
+    emit add_file $disposition "res/fonts/erin/McMillen.en"     $mediafnt "McMillen.en"    070000
+    emit add_file $disposition "res/fonts/erin/McMillenBd.en"   $mediafnt "McMillenBd.en"  070000
+    emit add_file $disposition "res/fonts/erin/Mischke.en"      $mediafnt "Mischke.en"     070000
+    emit add_file $disposition "res/fonts/erin/MischkeBd.en"    $mediafnt "MischkeBd.en"   070000
+    emit add_file $disposition "res/fonts/erin/Monterey.en"     $mediafnt "Monterey.en"    070000
+    emit add_file $disposition "res/fonts/erin/MontereyBd.en"   $mediafnt "MontereyBd.en"  070000
 
     disposition="fonts2"
 
     # HRCG conversions
-    emit add_file $disposition "mgtk/fonts/hrcg/ASCII"           $mediafnt "ASCII"          070000
-    emit add_file $disposition "mgtk/fonts/hrcg/BLIPPO.BLACK"    $mediafnt "Blippo.Black"   070000
-    emit add_file $disposition "mgtk/fonts/hrcg/BYTE"            $mediafnt "Byte"           070000
-    emit add_file $disposition "mgtk/fonts/hrcg/COLOSSAL"        $mediafnt "Colossal"       070000
-    emit add_file $disposition "mgtk/fonts/hrcg/COUNT"           $mediafnt "Count"          070000
-    emit add_file $disposition "mgtk/fonts/hrcg/FLOW"            $mediafnt "Flow"           070000
-    emit add_file $disposition "mgtk/fonts/hrcg/GOTHIC"          $mediafnt "Gothic"         070000
-    emit add_file $disposition "mgtk/fonts/hrcg/MIRROR"          $mediafnt "Mirror"         070000
-    emit add_file $disposition "mgtk/fonts/hrcg/OUTLINE"         $mediafnt "Outline"        070000
-    emit add_file $disposition "mgtk/fonts/hrcg/PUDGY"           $mediafnt "Pudgy"          070000
-    emit add_file $disposition "mgtk/fonts/hrcg/ROMAN"           $mediafnt "Roman"          070000
-    emit add_file $disposition "mgtk/fonts/hrcg/SLANT"           $mediafnt "Slant"          070000
-    emit add_file $disposition "mgtk/fonts/hrcg/STOP"            $mediafnt "Stop"           070000
-    emit add_file $disposition "mgtk/fonts/hrcg/UPSIDE.DOWN"     $mediafnt "Upside.Down"    070000
-
-    emit add_file $disposition "mgtk/fonts/Pig.Font"       $mediafnt "Pig.Font"       070000
+    emit add_file $disposition "res/fonts/hrcg/ASCII"           $mediafnt "ASCII"          070000
+    emit add_file $disposition "res/fonts/hrcg/BLIPPO.BLACK"    $mediafnt "Blippo.Black"   070000
+    emit add_file $disposition "res/fonts/hrcg/BYTE"            $mediafnt "Byte"           070000
+    emit add_file $disposition "res/fonts/hrcg/COLOSSAL"        $mediafnt "Colossal"       070000
+    emit add_file $disposition "res/fonts/hrcg/COUNT"           $mediafnt "Count"          070000
+    emit add_file $disposition "res/fonts/hrcg/FLOW"            $mediafnt "Flow"           070000
+    emit add_file $disposition "res/fonts/hrcg/GOTHIC"          $mediafnt "Gothic"         070000
+    emit add_file $disposition "res/fonts/hrcg/MIRROR"          $mediafnt "Mirror"         070000
+    emit add_file $disposition "res/fonts/hrcg/OUTLINE"         $mediafnt "Outline"        070000
+    emit add_file $disposition "res/fonts/hrcg/PUDGY"           $mediafnt "Pudgy"          070000
+    emit add_file $disposition "res/fonts/hrcg/ROMAN"           $mediafnt "Roman"          070000
+    emit add_file $disposition "res/fonts/hrcg/SLANT"           $mediafnt "Slant"          070000
+    emit add_file $disposition "res/fonts/hrcg/STOP"            $mediafnt "Stop"           070000
+    emit add_file $disposition "res/fonts/hrcg/UPSIDE.DOWN"     $mediafnt "Upside.Down"    070000
+
+    emit add_file $disposition "res/fonts/Pig.Font"       $mediafnt "Pig.Font"       070000
 fi

bin/setdate

@@ -15,8 +15,8 @@ yy=$(expr `date +%y` + 0)
 mm=$(expr `date +%m` + 0)
 dd=$(expr `date +%d` + 0)
 
-month=$(egrep "\bres_string_month_name_${mm}\b" "common/res/common.res.${lang}" | cut -d'"' -f2)
-order=$(egrep "\bres_const_date_order\b" "common/res/common.res.${lang}" | cut -d' ' -f3)
+month=$(egrep "\bres_string_month_name_${mm}\b" "src/common/res/common.res.${lang}" | cut -d'"' -f2)
+order=$(egrep "\bres_const_date_order\b" "src/common/res/common.res.${lang}" | cut -d' ' -f3)
 
 if [ "$order" = "0" ]; then
     date="$month $dd, $yyyy"
@@ -25,12 +25,12 @@ else
 fi
 
 # Update build date string
-perl -pni -e "s/define kBuildDate .*/define kBuildDate \"$date\"/" config.inc
+perl -pni -e "s/define kBuildDate .*/define kBuildDate \"$date\"/" src/config.inc
 
 # Update default date
-perl -pni -e 's/^(kBuildYYYY \s+ = \s+) \d+ /${1}'"$yyyy"'/x' config.inc
-perl -pni -e 's/^(kBuildYY \s+ = \s+) \d+ /${1}'"$yy"'/x' config.inc
-perl -pni -e 's/^(kBuildMM \s+ = \s+) \d+ /${1}'"$mm"'/x' config.inc
-perl -pni -e 's/^(kBuildDD \s+ = \s+) \d+ /${1}'"$dd"'/x' config.inc
+perl -pni -e 's/^(kBuildYYYY \s+ = \s+) \d+ /${1}'"$yyyy"'/x' src/config.inc
+perl -pni -e 's/^(kBuildYY \s+ = \s+) \d+ /${1}'"$yy"'/x' src/config.inc
+perl -pni -e 's/^(kBuildMM \s+ = \s+) \d+ /${1}'"$mm"'/x' src/config.inc
+perl -pni -e 's/^(kBuildDD \s+ = \s+) \d+ /${1}'"$dd"'/x' src/config.inc
 
 echo Set date to: $(echo "$date" | bin/transcode.pl decode $lang)

bin/setlang

@@ -9,17 +9,17 @@ decoded_a=$(echo 'a' | bin/transcode.pl decode $lang)
 supports_lowercase=$(if [ "$decoded_a" == "a" ]; then echo 1; else echo 0; fi);
 date=$(bin/setdate $lang)
 
-git checkout config.inc
+git checkout src/config.inc
 perl -pni \
      -e "s/(?<=define kBuildLang ).*/\"$lang\"/;" \
      -e "s/(?<=define kBuildSupportsLowercase ).*/$supports_lowercase/" \
-     config.inc
+     src/config.inc
 
 if [ "$supports_lowercase" != "1" ]; then
   perl -pni \
        -e 's/(?<=define kDeskTopProductName )"(.*)"/"\U$1\E"/;' \
        -e 's/(?<=define kDeskTopVersionSuffix )"(.*)"/"\U$1\E"/;' \
-       config.inc
+       src/config.inc
 fi
 
 echo Set lang to: $lang

bin/setopt

@@ -47,7 +47,7 @@ config="$tempdir/DeskTop.config#F10000"
 # ============================================================
 # Modify bytes based on command line args
 
-# See config.inc for the DeskTopSettings definition. Note that first byte
+# See src/config.inc for the DeskTopSettings definition. Note that first byte
 # of the file is version number, rest is settings struct.
 #
 # file_version       = offset  0 len 1

bin/util.sh

@@ -73,9 +73,9 @@ fini_progress () {
 # ============================================================
 # Extract metadata for the build
 
-vmajor=$(grep 'kDeskTopVersionMajor =' config.inc | sed -e 's/.* = //')
-vminor=$(grep 'kDeskTopVersionMinor =' config.inc | sed -e 's/.* = //')
-vsuffix=$(grep 'define kDeskTopVersionSuffix' config.inc | cut -d'"' -f2)
-lang=$(grep 'define kBuildLang' config.inc | cut -d'"' -f2)
+vmajor=$(grep 'kDeskTopVersionMajor =' src/config.inc | sed -e 's/.* = //')
+vminor=$(grep 'kDeskTopVersionMinor =' src/config.inc | sed -e 's/.* = //')
+vsuffix=$(grep 'define kDeskTopVersionSuffix' src/config.inc | cut -d'"' -f2)
+lang=$(grep 'define kBuildLang' src/config.inc | cut -d'"' -f2)
 version=$(echo ${vmajor}.${vminor}${vsuffix}-${lang})
-supports_lowercase=$(grep 'define kBuildSupportsLowercase' config.inc | cut -d' ' -f3)
+supports_lowercase=$(grep 'define kBuildSupportsLowercase' src/config.inc | cut -d' ' -f3)