From 004b7e95d7c07045ff197463abf3eab1e9d353ac Mon Sep 17 00:00:00 2001
From: Leandro Lucarella <llucax@gmail.com>
Date: Sat, 29 May 2010 20:11:07 -0300
Subject: [PATCH] Move the modules to package rt.gc.cdgc

Tango 0.99.9 uses this package scheme, so we follow it for easier
integration.
---
 Makefile                   | 15 ++++++++-------
 {gc => rt/gc/cdgc}/alloc.d |  4 ++--
 {gc => rt/gc/cdgc}/bits.d  |  4 ++--
 {gc => rt/gc/cdgc}/gc.d    | 10 +++++-----
 {gc => rt/gc/cdgc}/iface.d |  8 ++++----
 {gc => rt/gc/cdgc}/libc.d  |  2 +-
 {gc => rt/gc/cdgc}/stats.d |  2 +-
 7 files changed, 23 insertions(+), 22 deletions(-)
 rename {gc => rt/gc/cdgc}/alloc.d (98%)
 rename {gc => rt/gc/cdgc}/bits.d (99%)
 rename {gc => rt/gc/cdgc}/gc.d (99%)
 rename {gc => rt/gc/cdgc}/iface.d (98%)
 rename {gc => rt/gc/cdgc}/libc.d (95%)
 rename {gc => rt/gc/cdgc}/stats.d (98%)

diff --git a/Makefile b/Makefile
index 32232ef..736862e 100644
--- a/Makefile
+++ b/Makefile
@@ -31,13 +31,14 @@ LD_OUTPUT_OPTION = -o $@
 #LDFLAGS :=
 
 # GC sources
-sources := \
-	gc/iface.d \
-	gc/alloc.d \
-	gc/bits.d \
-	gc/stats.d \
-	gc/libc.d \
-	gc/gc.d
+sources := $(addprefix rt/gc/cdgc/,\
+	iface.d \
+	alloc.d \
+	bits.d \
+	stats.d \
+	libc.d \
+	gc.d \
+	)
 
 # Default target
 all: $B/cdgc.so
diff --git a/gc/alloc.d b/rt/gc/cdgc/alloc.d
similarity index 98%
rename from gc/alloc.d
rename to rt/gc/cdgc/alloc.d
index eeebcf4..b709fda 100644
--- a/gc/alloc.d
+++ b/rt/gc/cdgc/alloc.d
@@ -24,7 +24,7 @@
  * Authors:   Walter Bright, David Friedman, Sean Kelly
  */
 
-module gc.alloc;
+module rt.gc.cdgc.alloc;
 
 
 // C OS-specific API
@@ -134,7 +134,7 @@ else static if (is(typeof(malloc)))
     //       to PAGESIZE alignment, there will be space for a void* at the end
     //       after PAGESIZE bytes used by the GC.
 
-    import gcx; // for PAGESIZE
+    import rt.gc.cdgc.gc: PAGESIZE;
 
     const size_t PAGE_MASK = PAGESIZE - 1;
 
diff --git a/gc/bits.d b/rt/gc/cdgc/bits.d
similarity index 99%
rename from gc/bits.d
rename to rt/gc/cdgc/bits.d
index e9ece9b..67eb2df 100644
--- a/gc/bits.d
+++ b/rt/gc/cdgc/bits.d
@@ -24,9 +24,9 @@
  * Authors:   Walter Bright, David Friedman, Sean Kelly
  */
 
-module gc.bits;
+module rt.gc.cdgc.bits;
 
-import gc.libc;
+import rt.gc.cdgc.libc;
 
 private extern (C) void onOutOfMemoryError();
 
diff --git a/gc/gc.d b/rt/gc/cdgc/gc.d
similarity index 99%
rename from gc/gc.d
rename to rt/gc/cdgc/gc.d
index bce6004..1c99055 100644
--- a/gc/gc.d
+++ b/rt/gc/cdgc/gc.d
@@ -24,7 +24,7 @@
  * Authors:   Walter Bright, David Friedman, Sean Kelly
  */
 
-module gc.gc;
+module rt.gc.cdgc.gc;
 
 // D Programming Language Garbage Collector implementation
 
@@ -46,10 +46,10 @@ version = STACKGROWSDOWN;       // growing the stack means subtracting from the
 
 /***************************************************/
 
-import gc.bits;
-import gc.stats;
-import gc.alloc;
-import gc.libc;
+import rt.gc.cdgc.bits;
+import rt.gc.cdgc.stats;
+import rt.gc.cdgc.alloc;
+import rt.gc.cdgc.libc;
 
 
 version (GNU)
diff --git a/gc/iface.d b/rt/gc/cdgc/iface.d
similarity index 98%
rename from gc/iface.d
rename to rt/gc/cdgc/iface.d
index 260607e..7f78437 100644
--- a/gc/iface.d
+++ b/rt/gc/cdgc/iface.d
@@ -24,11 +24,11 @@
  * Authors:   Walter Bright, Sean Kelly
  */
 
-module gc.iface;
+module rt.gc.cdgc.iface;
 
-import gc.gc;
-import gc.stats;
-import gc.c;
+import rt.gc.cdgc.gc;
+import rt.gc.cdgc.stats;
+import rt.gc.cdgc.libc;
 
 version=GCCLASS;
 
diff --git a/gc/libc.d b/rt/gc/cdgc/libc.d
similarity index 95%
rename from gc/libc.d
rename to rt/gc/cdgc/libc.d
index e0cd23e..3c40cf9 100644
--- a/gc/libc.d
+++ b/rt/gc/cdgc/libc.d
@@ -1,5 +1,5 @@
 
-module gc.c;
+module rt.gc.cdgc.libc;
 
 version (Windows) {
     alias int   c_long;
diff --git a/gc/stats.d b/rt/gc/cdgc/stats.d
similarity index 98%
rename from gc/stats.d
rename to rt/gc/cdgc/stats.d
index 84368ea..351c3ce 100644
--- a/gc/stats.d
+++ b/rt/gc/cdgc/stats.d
@@ -24,7 +24,7 @@
  * Authors:   Walter Bright, Sean Kelly
  */
 
-module gc.stats;
+module rt.gc.cdgc.stats;
 
 /**
  *
-- 
2.43.0