(svn r23220) -Change: move the baseset files to their new location

16 files changed, 31 insertions, 39 deletions

diff --git a/.gitignore b/.gitignore
index b608306d8..b5dcf34b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,16 +4,14 @@ bin/ai/*
 !bin/ai/compat*.nut
 !bin/ai/regression
 !bin/data
-bin/data/*
-!bin/data/openttd.grf
-!bin/data/opntitle.dat
-!bin/data/orig_*.obg
-!bin/data/orig_*.obs
-!bin/data/no_sound.obs
-!bin/gm
-bin/gm/*
-!bin/gm/no_music.obm
-!bin/gm/orig_*.obm
+bin/baseset/*
+!bin/baseset/openttd.grf
+!bin/baseset/opntitle.dat
+!bin/baseset/orig_*.obg
+!bin/baseset/orig_*.obs
+!bin/baseset/no_sound.obs
+!bin/baseset/no_music.obm
+!bin/baseset/orig_*.obm
 !bin/scripts
 bin/scripts/*
 !bin/scripts/*.example
diff --git a/.hgignore b/.hgignore
index 740ad723b..c74a52bcd 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,7 +1,7 @@
 syntax: glob
 
 .svn
-bin/data/openttd.32.bmp
+bin/baseset/openttd.32.bmp
 bin/lang/*
 bin/openttd*
 bin/*.cfg
diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 794c6d733..c49440ede 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -29,17 +29,15 @@ endif
 
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
-AI_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
-GM_DIR   = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/gm
-TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
+AI_DIR      = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/ai
+BASESET_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/baseset
+LANG_DIR    = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
+TTD_DIR     = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
-AI_DIR   = $(BUNDLE_DIR)/ai
-DATA_DIR = $(BUNDLE_DIR)/data
-LANG_DIR = $(BUNDLE_DIR)/lang
-GM_DIR   = $(BUNDLE_DIR)/gm
-TTD_DIR  = $(BUNDLE_DIR)
+AI_DIR      = $(BUNDLE_DIR)/ai
+BASESET_DIR = $(BUNDLE_DIR)/baseset
+LANG_DIR    = $(BUNDLE_DIR)/lang
+TTD_DIR     = $(BUNDLE_DIR)
 endif
 
 bundle: all
@@ -51,27 +49,26 @@ bundle: all
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
 	$(Q)mkdir -p "$(AI_DIR)"
-	$(Q)mkdir -p "$(DATA_DIR)"
+	$(Q)mkdir -p "$(BASESET_DIR)"
 	$(Q)mkdir -p "$(LANG_DIR)"
-	$(Q)mkdir -p "$(GM_DIR)"
 ifdef OSXAPP
 	$(Q)mkdir -p "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources"
 	$(Q)echo "APPL????" >                                          "$(BUNDLE_DIR)/$(OSXAPP)/Contents/PkgInfo"
 	$(Q)cp    "$(ROOT_DIR)/os/macosx/openttd.icns"                 "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
 	$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh                          "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
-	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(DATA_DIR)"
+	$(Q)cp    "$(ROOT_DIR)/os/macosx/splash.png"                   "$(BASESET_DIR)"
 endif
 ifeq ($(OS),UNIX)
-	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(DATA_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(BASESET_DIR)/"
 endif
 	$(Q)cp "$(BIN_DIR)/$(TTD)"                "$(TTD_DIR)/"
 	$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut       "$(AI_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.grf            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obg            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/"*.obs            "$(DATA_DIR)/"
-	$(Q)cp "$(BIN_DIR)/data/opntitle.dat"     "$(DATA_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/"*.grf         "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/"*.obg         "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/"*.obs         "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/opntitle.dat"  "$(BASESET_DIR)/"
+	$(Q)cp "$(BIN_DIR)/baseset/"*.obm         "$(BASESET_DIR)/"
 	$(Q)cp "$(BIN_DIR)/lang/"*.lng            "$(LANG_DIR)/"
-	$(Q)cp "$(BIN_DIR)/gm/"*.obm              "$(GM_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/readme.txt"           "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
@@ -175,11 +172,9 @@ install: bundle
 	@echo '[INSTALL] Installing OpenTTD'
 	$(Q)install -d "$(INSTALL_BINARY_DIR)"
 	$(Q)install -d "$(INSTALL_ICON_DIR)"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/data"
+	$(Q)install -d "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/lang"
-	$(Q)install -d "$(INSTALL_DATA_DIR)/gm"
 	$(Q)install -d "$(INSTALL_DATA_DIR)/scripts"
 ifeq ($(TTD), openttd.exe)
 	$(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
@@ -188,8 +183,7 @@ else
 endif
 	$(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/ai/"* "$(INSTALL_DATA_DIR)/ai"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
-	$(Q)install -m 644 "$(BUNDLE_DIR)/gm/"* "$(INSTALL_DATA_DIR)/gm"
+	$(Q)install -m 644 "$(BUNDLE_DIR)/baseset/"* "$(INSTALL_DATA_DIR)/baseset"
 	$(Q)install -m 644 "$(BUNDLE_DIR)/scripts/"* "$(INSTALL_DATA_DIR)/scripts"
 ifndef DO_NOT_INSTALL_DOCS
 	$(Q)install -d "$(INSTALL_DOC_DIR)"
diff --git a/Makefile.grf.in b/Makefile.grf.in
index a70b3072b..33fbeeeb9 100644
--- a/Makefile.grf.in
+++ b/Makefile.grf.in
@@ -20,7 +20,7 @@
 
 ROOT_DIR = !!ROOT_DIR!!
 GRF_DIR  = $(ROOT_DIR)/media/extra_grf
-BIN_DIR  = !!BIN_DIR!!/data
+BIN_DIR  = !!BIN_DIR!!/baseset
 OBJS_DIR = !!GRF_OBJS_DIR!!
 OS       = !!OS!!
 STAGE    = !!STAGE!!
diff --git a/Makefile.in b/Makefile.in
index 054466745..1dfcaa54f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,7 +148,7 @@ mrproper:
 distclean: mrproper
 
 maintainer-clean: distclean
-	$(Q)rm -f $(BIN_DIR)/data/openttd.grf
+	$(Q)rm -f $(BIN_DIR)/baseset/openttd.grf
 
 depend:
 	@for dir in $(SRC_DIRS); do \
diff --git a/Makefile.src.in b/Makefile.src.in
index 5f29136bd..2bb0da31a 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -251,10 +251,10 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
 $(BIN_DIR)/$(TTD): $(TTD)
 	$(Q)cp $(TTD) $(BIN_DIR)/$(TTD)
 ifeq ($(OS), UNIX)
-	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/data/
+	$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/baseset/
 endif
 ifeq ($(OS), OSX)
-	$(Q)cp $(ROOT_DIR)/os/macosx/splash.png $(BIN_DIR)/data/
+	$(Q)cp $(ROOT_DIR)/os/macosx/splash.png $(BIN_DIR)/baseset/
 endif
 
 $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
diff --git a/bin/gm/no_music.obm b/bin/baseset/no_music.obm
index d32f75435..d32f75435 100644
--- a/bin/gm/no_music.obm
+++ b/bin/baseset/no_music.obm
diff --git a/bin/data/no_sound.obs b/bin/baseset/no_sound.obs
index 003c368f3..003c368f3 100644
--- a/bin/data/no_sound.obs
+++ b/bin/baseset/no_sound.obs
diff --git a/bin/data/openttd.grf b/bin/baseset/openttd.grf
index ab07ede59..ab07ede59 100644
--- a/bin/data/openttd.grf
+++ b/bin/baseset/openttd.grf
diff --git a/bin/data/opntitle.dat b/bin/baseset/opntitle.dat
index 264aaff60..264aaff60 100644
--- a/bin/data/opntitle.dat
+++ b/bin/baseset/opntitle.dat
diff --git a/bin/data/orig_dos.obg b/bin/baseset/orig_dos.obg
index 0e74b02a5..0e74b02a5 100644
--- a/bin/data/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
diff --git a/bin/data/orig_dos.obs b/bin/baseset/orig_dos.obs
index 1f3d9b26f..1f3d9b26f 100644
--- a/bin/data/orig_dos.obs
+++ b/bin/baseset/orig_dos.obs
diff --git a/bin/data/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg
index 9077085a8..9077085a8 100644
--- a/bin/data/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
diff --git a/bin/data/orig_win.obg b/bin/baseset/orig_win.obg
index 52cc7e69f..52cc7e69f 100644
--- a/bin/data/orig_win.obg
+++ b/bin/baseset/orig_win.obg
diff --git a/bin/gm/orig_win.obm b/bin/baseset/orig_win.obm
index 054fa069e..054fa069e 100644
--- a/bin/gm/orig_win.obm
+++ b/bin/baseset/orig_win.obm
diff --git a/bin/data/orig_win.obs b/bin/baseset/orig_win.obs
index 0ed03fd51..0ed03fd51 100644
--- a/bin/data/orig_win.obs
+++ b/bin/baseset/orig_win.obs