Move the modules to package rt.gc.cdgc

Tango 0.99.9 uses this package scheme, so we follow it for easier
integration.

diff --git a/Makefile b/Makefile
index 32232ef218aca16d062661c683ce6d2ad97bebd0..736862e0b52204ff1b9833e4333e7fac1d02821c 100644 (file)
--- 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 eeebcf467769c8ac7b90eff0abfad5b734a47576..b709fda6ff63ea24d8108d5f21f2b06e89f53373 100644 (file)
--- 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 e9ece9bb6aa16db57e0044d836eb215d2d3ddf96..67eb2df19c5df2227224fb86d2d563407e49e3d7 100644 (file)
--- 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 bce6004155dd2483671db3899fac368ef0d39f20..1c9905524d5153926f3048045a55308ea027d85c 100644 (file)
--- 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 260607eee41b6288022e60e6c5812c03728cc75b..7f7843732a01b4c4aa9d505c318755936ea9597e 100644 (file)
--- 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 e0cd23e72bc69f1a2c17b04fe5fca1c472a0eaa8..3c40cf9c25fadc0969193690166b4f6df34314e3 100644 (file)
--- 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 84368ead4577186953fa2862c100a167a2c1679f..351c3ce3c06a418a45ac678da42d86fab6f59f94 100644 (file)
--- 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;
 
 /**
  *