From ce5a45c92031ede80cab31f4123b4f7898625a76 Mon Sep 17 00:00:00 2001
From: Martin Haye <m1@snyder-haye.com>
Date: Thu, 20 Feb 2014 07:55:07 -0800
Subject: [PATCH] Reorganized data dir and put in readmes to tell what goes
 where.

---
 .gitignore                                    | 4 +++-
 Platform/Apple/virtual/build.xml              | 6 +++---
 Platform/Apple/virtual/data/disks/readme.txt  | 1 +
 Platform/Apple/virtual/data/fonts/readme.txt  | 1 +
 Platform/Apple/virtual/data/images/readme.txt | 0
 Platform/Apple/virtual/data/maps/readme.txt   | 0
 Platform/Apple/virtual/data/tables/readme.txt | 0
 Platform/Apple/virtual/data/world/readme.txt  | 1 +
 Platform/Apple/virtual/game/readme.txt        | 0
 9 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 Platform/Apple/virtual/data/disks/readme.txt
 create mode 100644 Platform/Apple/virtual/data/fonts/readme.txt
 delete mode 100644 Platform/Apple/virtual/data/images/readme.txt
 delete mode 100644 Platform/Apple/virtual/data/maps/readme.txt
 delete mode 100644 Platform/Apple/virtual/data/tables/readme.txt
 create mode 100644 Platform/Apple/virtual/data/world/readme.txt
 delete mode 100644 Platform/Apple/virtual/game/readme.txt

diff --git a/.gitignore b/.gitignore
index 30c912db..69332ceb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,10 @@
 
 # Don't check in data specific to any particular game
 /Platform/Apple/virtual/data/images/*.bin
+/Platform/Apple/virtual/data/fonts/*.bin
+/Platform/Apple/virtual/data/world/*.xml
 
 # Only check in sample.build.props; each person's build.props will be different.
 /Platform/Apple/virtual/src/include/build.props
 /Platform/Apple/tools/A2Copy/build/
-/Platform/Apple/tools/PackPartitions/build/
\ No newline at end of file
+/Platform/Apple/tools/PackPartitions/build/
diff --git a/Platform/Apple/virtual/build.xml b/Platform/Apple/virtual/build.xml
index 87fcb700..d24e1e2d 100644
--- a/Platform/Apple/virtual/build.xml
+++ b/Platform/Apple/virtual/build.xml
@@ -37,8 +37,8 @@
     <!-- Pack the game data -->
     <echo>Packing game and code resources.</echo>
     <java jar="${pack.dir}/PackPartitions.jar" fork="true" failonerror="true">
-      <arg value="game/world.xml"/>
-      <arg value="data/partitions/game.part.0.bin"/>
+      <arg value="data/world/world.xml"/>
+      <arg value="build/game.part.0.bin"/>
     </java>
 
     <!-- Construct a directory to put on the Apple -->
@@ -46,7 +46,7 @@
     <mkdir dir="${build.dir}/root"/>
     <copy todir="${build.dir}/root">
       <fileset dir="${src.dir}/core/build" includes="*.bin*"/>
-      <fileset dir="./data/partitions" includes="*.bin*"/>
+      <fileset dir="./build" includes="game.part*.bin"/>
     </copy>
     <mkdir dir="${build.dir}/root/"/>
 
diff --git a/Platform/Apple/virtual/data/disks/readme.txt b/Platform/Apple/virtual/data/disks/readme.txt
new file mode 100644
index 00000000..6cbdff2d
--- /dev/null
+++ b/Platform/Apple/virtual/data/disks/readme.txt
@@ -0,0 +1 @@
+This directory contains the base disk image (containing ProDOS and any ancillary utilities).
diff --git a/Platform/Apple/virtual/data/fonts/readme.txt b/Platform/Apple/virtual/data/fonts/readme.txt
new file mode 100644
index 00000000..5f0504a6
--- /dev/null
+++ b/Platform/Apple/virtual/data/fonts/readme.txt
@@ -0,0 +1 @@
+Put your font file in this directory, and name the file "font.bin".
diff --git a/Platform/Apple/virtual/data/images/readme.txt b/Platform/Apple/virtual/data/images/readme.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/Platform/Apple/virtual/data/maps/readme.txt b/Platform/Apple/virtual/data/maps/readme.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/Platform/Apple/virtual/data/tables/readme.txt b/Platform/Apple/virtual/data/tables/readme.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/Platform/Apple/virtual/data/world/readme.txt b/Platform/Apple/virtual/data/world/readme.txt
new file mode 100644
index 00000000..3d04be9f
--- /dev/null
+++ b/Platform/Apple/virtual/data/world/readme.txt
@@ -0,0 +1 @@
+Put the world file saved from Outlaw Editor here, and call the file "world.xml".
diff --git a/Platform/Apple/virtual/game/readme.txt b/Platform/Apple/virtual/game/readme.txt
deleted file mode 100644
index e69de29b..00000000