From 74d7562a5916f997949722f6ae74719a612bc9ba Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Sun, 4 Dec 2011 20:37:11 +0100
Subject: [PATCH] Moved druntime and Phobos submodules to runtime.

This makes much more sense since the subdirecotry also contains the build system for them, and reduces clutter.
---
 .gitmodules                  | 4 ++--
 runtime/CMakeLists.txt       | 4 ++--
 druntime => runtime/druntime | 0
 phobos => runtime/phobos     | 0
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename druntime => runtime/druntime (100%)
 rename phobos => runtime/phobos (100%)

diff --git a/.gitmodules b/.gitmodules
index 2a4d65f93c0..550a1db7675 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "druntime"]
-	path = druntime
+	path = runtime/druntime
 	url = git://github.com/ldc-developers/druntime.git
 [submodule "phobos"]
-	path = phobos
+	path = runtime/phobos
 	url = git://github.com/ldc-developers/phobos.git
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index db76285f0e7..45f8e5ff435 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -34,13 +34,13 @@ else(BUILD_SHARED_LIBS)
 endif(BUILD_SHARED_LIBS)
 
 get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY)
-set(RUNTIME_DIR ${PROJECT_PARENT_DIR}/druntime CACHE PATH "runtime source dir")
+set(RUNTIME_DIR ${PROJECT_SOURCE_DIR}/druntime CACHE PATH "runtime source dir")
 
 #
 # Gather source files.
 #
 
-set(PHOBOS2_DIR ${PROJECT_PARENT_DIR}/phobos CACHE PATH "phobos2 source dir")
+set(PHOBOS2_DIR ${PROJECT_SOURCE_DIR}/phobos CACHE PATH "phobos2 source dir")
 set(RUNTIME_CC druntime-core)
 set(RUNTIME_GC druntime-gc-basic)
 set(RUNTIME_DC druntime-rt-ldc)
diff --git a/druntime b/runtime/druntime
similarity index 100%
rename from druntime
rename to runtime/druntime
diff --git a/phobos b/runtime/phobos
similarity index 100%
rename from phobos
rename to runtime/phobos