Consolidation of profj prior to removal from release

svn: r15918

collects/profj/build-info.ss

@@ -35,7 +35,7 @@
                               (map (lambda (p) (build-path p "profj" "libs"))
                                    (current-library-collection-paths))))
            (htdch-lib? (ormap (lambda (p) (same-base-dir? dir p))
-                              (map (lambda (p) (build-path p "htdch"))
+                              (map (lambda (p) (build-path p "profj" "htdch"))
                                    (current-library-collection-paths))))
            (scheme-lib? (ormap (lambda (p) (same-base-dir? dir p))
                                (current-library-collection-paths)))
@@ -43,7 +43,7 @@
                      (cond
                        (profj-lib? `(lib ,name "profj" "libs" ,@path))
                        (htdch-lib? 
-                        `(lib ,name "htdch" ,@(if scheme? (cdddr path) path)))
+                        `(lib ,name "profj" "htdch" ,@(if scheme? (cdddr path) path)))
                        (scheme-lib? `(lib ,name ,@(cddr path)))
                        ((and local? (not (to-file))) `(quote ,name))
                        (else `(file ,(path->string (build-path dir name)))))))
@@ -230,6 +230,7 @@
               (let* ([dir (find-directory path err)]
                      [class-list (get-class-list dir)]
                      [package-contents null])
+                (printf "~a~n~a~n" dir class-list)
                 (for-each (check-dup-import
                            (lambda (class)
                              (import-class class path dir file type-recs level (import-src imp) #t)
@@ -379,7 +380,7 @@
                 (send type-recs set-location! original-loc)))))
   
   ;(make-directory path bool)
-  (define-struct dir-path (path scheme?))
+  (define-struct dir-path (path scheme?) #:transparent)
   
   ;find-directory: (list string) ( -> void) -> dir-path
   (define (find-directory path fail)

collects/profj/htdch/colors/installer.ss

@@ -6,7 +6,7 @@
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "colors"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "colors"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]

collects/profj/htdch/draw/Canvas-native-methods.ss

@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/htdch/draw/support.scm")
          mzlib/unit)
 
 (define void-or-true #t)

collects/profj/htdch/draw/World-native-methods.ss

@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/htdch/draw/support.scm")
          mzlib/unit)
 
 (provide endOfTime-java.lang.String-native endOfWorld-java.lang.String-native bigBangO-double-native)

collects/profj/htdch/draw/installer.ss

@@ -1,16 +1,16 @@
 (module installer mzscheme
   (require profj/compile
-           (prefix colors: htdch/colors/installer)
-           (prefix geometry: htdch/geometry/installer))
+           (prefix colors: profj/htdch/colors/installer)
+           (prefix geometry: profj/htdch/geometry/installer))
   (provide installer)
   
   (define (mprintf . a)
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (colors:installer plthome)
-    (geometry:installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "draw"))))
+    #;(colors:installer plthome)
+    #;(geometry:installer plthome)
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "draw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]

collects/profj/htdch/draw/pre-installer.ss

@@ -3,7 +3,7 @@
   (provide pre-installer)
   
   (define (pre-installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "draw"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "draw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path])

collects/profj/htdch/geometry/installer.ss

@@ -6,7 +6,7 @@
     (fprintf a (current-error-port)))
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "geometry"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "geometry"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]

collects/profj/htdch/graphics/DrawImage.djava

@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 import scheme.lib.mred.mred;
         
 public class DrawImage extends Command {

collects/profj/htdch/graphics/DrawLine.djava

@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class DrawLine extends Command {
 

collects/profj/htdch/graphics/DrawRectangle.djava

@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class DrawRectangle extends Command {
 

collects/profj/htdch/graphics/GameWorld.djava

@@ -1,6 +1,6 @@
 package graphics;
 
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 import scheme.lib.mred.mred;
 
 public abstract class GameWorld extends World {

collects/profj/htdch/graphics/Image.djava

@@ -2,7 +2,7 @@ package graphics;
 
 import scheme.lib.htdp.image;
 import scheme.lib.graphics.graphics;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class Image {
   dynamic theImage;

collects/profj/htdch/graphics/PictureFactory.djava

@@ -1,7 +1,7 @@
 package graphics;
 
 import scheme.lib.htdp.image;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class PictureFactory {
 

collects/profj/htdch/graphics/View.djava

@@ -1,7 +1,7 @@
 package graphics;
 
 import scheme.lib.mred.mred;
-import scheme.lib.htdch.graphics.rename;
+import scheme.lib.profj.htdch.graphics.rename;
 
 public class View {
 

collects/profj/htdch/graphics/installer.ss

@@ -3,7 +3,7 @@
   (provide installer)
   
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "graphics"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "graphics"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]

collects/profj/htdch/idraw/Canvas-native-methods.ss

@@ -1,6 +1,6 @@
 #lang scheme
 
-(require (lib "htdch/draw/support.scm")
+(require (lib "profj/htdch/draw/support.scm")
          mzlib/unit)
 
 (define void-or-true (void))

collects/profj/htdch/idraw/World-native-methods.ss

@@ -1,5 +1,5 @@
 #lang scheme 
-  (require (lib "htdch/draw/support.scm")
+  (require (lib "profj/htdch/draw/support.scm")
            mzlib/unit)
   
 (provide endOfTime-java.lang.String-native endOfWorld-java.lang.String-native bigBangO-double-native)

collects/profj/htdch/idraw/installer.ss

@@ -3,7 +3,7 @@
   (provide installer)
 
   (define (installer plthome)
-    (let ((draw-path (build-path (collection-path "htdch" "idraw"))))
+    (let ((draw-path (build-path (collection-path "profj" "htdch" "idraw"))))
       (let ((javac
              (lambda (file)
                (parameterize ([current-load-relative-directory draw-path]

collects/profj/htdch/info.ss

@@ -3,4 +3,4 @@
 (define name "Java Teachpacks")
 
 (define compile-omit-paths '("Examples"))
-(define install-collection "installer.scm")
+#;(define install-collection "installer.scm")

collects/profj/htdch/installer.scm

@@ -12,4 +12,4 @@
   (color:installer plthome)
   (draw:installer  plthome)
   (idraw:installer plthome)
-  (graph:installer plthome))
+  #;(graph:installer plthome))

collects/profj/installer.ss

@@ -3,6 +3,7 @@
            (prefix io: profj/libs/java/io/installer)
            (prefix test: profj/libs/java/tester/installer)
            (prefix util: profj/libs/java/util/installer)
+           (prefix htdch: (lib "installer.scm" "profj" "htdch"))
            )
   (provide installer)
 
@@ -10,4 +11,5 @@
     (io:installer plthome)
     (lang:installer plthome)
     (test:installer plthome)
-    (util:installer plthome)))
+    (util:installer plthome)
+    (htdch:installer plthome)))

collects/profj/profj-pref.ss

@@ -10,7 +10,7 @@
                   (get-preference 'projf:classpath (lambda () null)))
             (map (lambda (p) (build-path p "profj" "libs"))
                  (current-library-collection-paths))
-            (map (lambda (p) (build-path p "htdch"))
+            (map (lambda (p) (build-path p "profj" "htdch"))
                  (current-library-collection-paths))))
   
   ;reset-classpath: -> void