More merge cleanup, typos. Simpler build.

Use compile-system's 'dependencies option rather than a gtk-new.pkg
with depends-on package options, to keep the liarc build simple(r).

* src/Makefile.in: Punt conses.png.

* src/cref/butils.scm: for-all?'s arguments are "backward".

* src/cref/: object.scm, redpkg.scm: Punted depends-on.

* src/gtk/Makefile-fragment: compile-liarc-bundle is now handled by
compile-ffi.  Install conses.png.

* src/gtk/Tags.sh: The etags that comes with emacs23 does not like
--langmap, while Exuberant Ctags' etags only complains about --language.

* src/gtk/compile.scm: Re-stated the dependency information.

* src/gtk/: gtk.pkg, gtk-new.pkg: Merged but commented out the new
depends-on package options.

* src/gtk/keys.scm: Pared some entries so the x86-64 assembler does
not die.

* src/runtime/thread-queue.scm: Typo.

diff --git a/src/Makefile.in b/src/Makefile.in
index 71bac65dc75343d40004fb83ce7bf86c3bad8082..95d2269c006e19a069894db4841eca63c1ca4d9f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -203,8 +203,6 @@ install-auxdir-top:
        $(mkinstalldirs) $(DESTDIR)$(AUXDIR)
        $(INSTALL_DATA) $(top_srcdir)/etc/optiondb.scm $(DESTDIR)$(AUXDIR)/.
        $(INSTALL_DATA) lib/*.com $(DESTDIR)$(AUXDIR)/.
-       if [ -e lib/conses.png ]; then \
-           $(INSTALL_DATA) lib/conses.png $(DESTDIR)$(AUXDIR)/.; fi
 
 .PHONY: all all-native all-liarc all-svm macosx-app
 .PHONY: compile-microcode build-bands

diff --git a/src/cref/butils.scm b/src/cref/butils.scm
index f90d0b87b351077066cfd13e4491ec4fd19a3559..5110da15139d594c9063e47a1189a463ffbea682 100644 (file)
--- a/src/cref/butils.scm
+++ b/src/cref/butils.scm
@@ -70,7 +70,7 @@ USA.
            (if entry (cdr entry) '())))
 
        (for-each (lambda (file.deps)
-                   (if (not (for-all? string? file.deps))
+                   (if (not (for-all? file.deps string?))
                        (error "Bogus dependency:" file.deps)))
                  dependencies)
 

diff --git a/src/cref/object.scm b/src/cref/object.scm
index 54d50949462a6319aeba3c5e97887b22d22114e1..77829b06fbadea4ee79b0ece48878baa1770f300 100644 (file)
--- a/src/cref/object.scm
+++ b/src/cref/object.scm
@@ -36,8 +36,7 @@ USA.
   (initializations '())
   (finalizations '())
   (exports '())
-  (imports '())
-  (depends-on '()))
+  (imports '()))
 
 (define-structure (pmodel (conc-name pmodel/))
   (root-package #f read-only #t)
@@ -61,8 +60,7 @@ USA.
   (children '())
   (bindings (make-rb-tree eq? symbol<?) read-only #t)
   (references (make-rb-tree eq? symbol<?) read-only #t)
-  (links '())
-  (depends-on '()))
+  (links '()))
 
 (define-integrable (package/n-files package)
   (length (package/files package)))

diff --git a/src/cref/redpkg.scm b/src/cref/redpkg.scm
index 732c715c71ea7e12a5b42f5912e5185fd4294114..be0d0e45f0247a8f844a9d0029bb70b72de675b1 100644 (file)
--- a/src/cref/redpkg.scm
+++ b/src/cref/redpkg.scm
@@ -376,13 +376,6 @@ USA.
                        package
                        (append! (package-description/finalizations package)
                                 (list finalization))))))
-               ((DEPENDS-ON)
-                (if (not (check-list (cdr option) string?))
-                    (error "Illegal depends-on" (cdr option)))
-                (set-package-description/depends-on!
-                 package
-                 (append! (package-description/depends-on package)
-                          (map parse-filename (cdr option)))))
                (else
                 (warn "Unexpected option:" option))))
            options))
@@ -592,10 +585,6 @@ USA.
              (append-map! (lambda (file-case)
                             (append-map cdr (cdr file-case)))
                           file-cases))))
-  (set-package/depends-on!
-   package 
-   (append! (package/depends-on package)
-           (list-copy (package-description/depends-on description))))
   (for-each (lambda (export)
              (let ((destination (get-package (car export) #t)))
                (for-each (lambda (names)

diff --git a/src/gtk/Makefile-fragment b/src/gtk/Makefile-fragment
index 12ec48b7736795d9ff2d413d1d074a2ed02a4023..feac50aa891a61f3134f156ab5e0a559b302b3aa 100644 (file)
--- a/src/gtk/Makefile-fragment
+++ b/src/gtk/Makefile-fragment
@@ -3,12 +3,7 @@
 
 TARGET_DIR = $(AUXDIR)/gtk
 
-build: compile
-       if test `echo "(pp microcode-id/compiled-code-type)"            \
-                | ../microcode/scheme --library ../lib --batch-mode` = "c"; \
-       then $(MAKE) compile-liarc-bundle; fi
-
-compile: ../lib/gtk-shim.so ../lib/gtk-types.bin ../lib/gtk-const.bin  \
+build: ../lib/gtk-shim.so ../lib/gtk-types.bin ../lib/gtk-const.bin    \
          ../lib/conses.png swat-pole-zero.scm
        cd ../ && echo '(load "etc/compile.scm")(compile-ffi "gtk")'    \
        | microcode/scheme --library lib --batch-mode
@@ -26,7 +21,7 @@ compile: ../lib/gtk-shim.so ../lib/gtk-types.bin ../lib/gtk-const.bin \
        $(INSTALL_DATA) conses.png $@
 
 swat-pole-zero.scm:
-       ln -sf ../swat/scheme/other/pole-zero.scm swat-pole-zero.scm
+       $(LN_S) ../swat/scheme/other/pole-zero.scm swat-pole-zero.scm
 
 install:
        rm -rf $(DESTDIR)$(TARGET_DIR)
@@ -38,6 +33,7 @@ install:
        $(INSTALL_DATA) gtk-shim.so $(DESTDIR)$(AUXDIR)/.
        $(INSTALL_DATA) gtk-types.bin $(DESTDIR)$(AUXDIR)/.
        $(INSTALL_DATA) gtk-const.bin $(DESTDIR)$(AUXDIR)/.
+       $(INSTALL_DATA) conses.png $(DESTDIR)$(AUXDIR)/.
        if test `echo "(pp microcode-id/compiled-code-type)"            \
                 | ../microcode/scheme --library ../lib --batch-mode` = "c"; \
        then $(MAKE) install-liarc-bundle; fi

diff --git a/src/gtk/Tags.sh b/src/gtk/Tags.sh
index 2f95f74b57c0aeedc1d79a37d3e3f68055a0fa31..54c42828daeefd4adeae16f5ab83ab0ef30bf091 100755 (executable)
--- a/src/gtk/Tags.sh
+++ b/src/gtk/Tags.sh
@@ -3,5 +3,5 @@
 # Utility to make TAGS file for the gtk build directory.
 # The working directory must be the build directory.
 
-etags gtk-shim.h scmwidget.c.stay --langmap=scheme:+.cdecl \
-       `echo *.scm | sed 's/ gtk-const.scm//'` Includes/*.cdecl
+etags gtk-shim.h scmwidget.c.stay `echo *.scm | sed 's/ gtk-const.scm//'` \
+       --language=scheme Includes/*.cdecl

diff --git a/src/gtk/compile.scm b/src/gtk/compile.scm
index ddefcef0627d3ee79a666a387911ee03d0cd1647..8b095feed2e610a042af4d3cafef9c3a1aa8683a 100644 (file)
--- a/src/gtk/compile.scm
+++ b/src/gtk/compile.scm
@@ -7,4 +7,23 @@
   (load-option 'SOS)
   (load-option 'FFI))
 
-(compile-system "gtk-new" (directory-pathname (current-load-pathname)))
\ No newline at end of file
+(compile-system "gtk" (directory-pathname (current-load-pathname))
+               ;; Temporary hack, until the released CREF loosens up
+               ;; and simply warns about new options it does not
+               ;; support, like the depends-on options commented out
+               ;; of gtk.pkg and recreated below.
+               ;;
+               ;; File         integrate-external      c-include
+               ;; ------------ ----------------------- ---------------
+               'dependencies
+               '(("gobject"                            "gtk-const.bin")
+                 ("pango"                              "gtk-const.bin")
+                 ("gtk-object"                         "gtk-const.bin")
+                 ("scm-widget"                         "gtk-const.bin")
+                 ("fix-layout" "gtk.ext" "pango.ext"   "gtk-const.bin")
+                 ("keys"                               "gtk-const.bin")
+                 ("thread"     "gtk.ext" "pango.ext"   "gtk-const.bin")
+                 ("main"                               "gtk-const.bin")
+                 ("gtk-ev"     "gtk.ext" "pango.ext"   "gtk-const.bin")
+                 ("fix-demo"   "gtk.ext" "pango.ext")
+                 ("swat"       "gtk.ext" "pango.ext")))
\ No newline at end of file

diff --git a/src/gtk/gtk.pkg b/src/gtk/gtk.pkg
index 7a28157b3c0a250f7cdc6f6285387a22abbfc1db..cc89bb80fa7ec5093601a006d3efb06dc55d3f0b 100644 (file)
--- a/src/gtk/gtk.pkg
+++ b/src/gtk/gtk.pkg
@@ -34,6 +34,7 @@ USA.
 (define-package (gtk gobject)
   (parent (gtk))
   (files "gobject")
+  ;;(depends-on "gtk-const.bin")
   (export (gtk)
          <gobject> gobject-alien
          gobject-live? gobject-unref!
@@ -54,6 +55,7 @@ USA.
 (define-package (gtk pango)
   (parent (gtk))
   (files "pango")
+  ;;(depends-on "gtk-const.bin")
   (export (gtk)
          <pango-layout>
          pango-layout-get-context
@@ -78,6 +80,7 @@ USA.
 (define-package (gtk gtk-object)
   (parent (gtk))
   (files "gtk-object")
+  ;;(depends-on "gtk-const.bin")
   (export (gtk)
          <gtk-object> gtk-object? guarantee-gtk-object
          gtk-object-destroyed? gtk-object-destroy
@@ -148,6 +151,7 @@ USA.
 (define-package (gtk widget)
   (parent (gtk))
   (files "scm-widget")
+  ;;(depends-on "gtk-const.bin")
   (import (gtk gtk-object)
          set-gtk-object-destroy-callback!)
   (export (gtk)
@@ -157,6 +161,7 @@ USA.
 (define-package (gtk fix-layout)
   (parent (gtk))
   (files "fix-layout")
+  ;;(depends-on "gtk.ext" "pango.ext" "gtk-const.bin")
   (import (gtk pango)
           make-pango-layout pango-rectangle pangos->pixels pixels->pangos)
   (import (gtk gtk-object)
@@ -227,6 +232,7 @@ USA.
 (define-package (gtk keys)
   (parent (gtk))
   (files "keys")
+  ;;(depends-on "gtk-const.bin")
   (export (gtk)
          gdk-key-state->char-bits
          gdk-keyval->name))
@@ -234,6 +240,7 @@ USA.
 (define-package (gtk thread)
   (parent (runtime thread))
   (files "thread")
+  ;;(depends-on "gtk.ext" "pango.ext")
   (export ()
          stop-gtk-thread)
   (import (gtk gobject)
@@ -244,6 +251,7 @@ USA.
 (define-package (gtk main)
   (parent (gtk))
   (files "main")
+  ;;(depends-on "gtk-const.bin")
   (import (runtime load)
          *unused-command-line*
          hook/process-command-line
@@ -263,6 +271,7 @@ USA.
 (define-package (gtk event-viewer)
   (parent (gtk))
   (files "gtk-ev")
+  ;;(depends-on "gtk.ext" "pango.ext" "gtk-const.bin")
   (import (gtk fix-layout)
          gdk-rectangle gdk-rectangle-from-rect
          make-fix-rect
@@ -276,6 +285,7 @@ USA.
 (define-package (gtk fix-layout demo)
   (parent (gtk fix-layout))
   (files "fix-demo")
+  ;;(depends-on "gtk.ext" "pango.ext")
   (import (gtk fix-layout)
          fix-layout-view)
   (export ()
@@ -284,6 +294,7 @@ USA.
 (define-package (gtk swat)
   (parent (gtk))
   (files "swat")
+  ;;(depends-on "gtk.ext" "pango.ext")
   (import (gtk gtk-object)
          gtk-object-destroy-callback)
   (import (gtk fix-layout)

diff --git a/src/gtk/keys.scm b/src/gtk/keys.scm
index 5879430ef5751895926e83bce9538aa96f9c1e36..cc10cdececdd7eef1ddfdf66659e01b1060ee4f7 100644 (file)
--- a/src/gtk/keys.scm
+++ b/src/gtk/keys.scm
@@ -685,6 +685,10 @@ USA.
     (cons (C-enum "GDK_musicalflat") 'musicalflat)
     (cons (C-enum "GDK_malesymbol") 'malesymbol)
     (cons (C-enum "GDK_femalesymbol") 'femalesymbol)
+
+#| Kludge: the x86-64 assembler balks at something here... perhaps
+   just the number of arguments?
+
     (cons (C-enum "GDK_telephone") 'telephone)
     (cons (C-enum "GDK_telephonerecorder") 'telephonerecorder)
     (cons (C-enum "GDK_phonographcopyright") 'phonographcopyright)
@@ -739,6 +743,9 @@ USA.
     (cons (C-enum "GDK_hebrew_resh") 'hebrew-resh)
     (cons (C-enum "GDK_hebrew_shin") 'hebrew-shin)
     (cons (C-enum "GDK_hebrew_taf") 'hebrew-taf)
+
+|#
+
     (cons (C-enum "GDK_BackSpace") 'BackSpace)
     (cons (C-enum "GDK_Tab") 'Tab)
     (cons (C-enum "GDK_Linefeed") 'Linefeed)

diff --git a/src/runtime/thread-queue.scm b/src/runtime/thread-queue.scm
index 30b2cf3dd0fef5171315fd9665e1efa96f7e9200..6eba438b86c8855822d2200795221c553fb95b5f 100644 (file)
--- a/src/runtime/thread-queue.scm
+++ b/src/runtime/thread-queue.scm
@@ -124,7 +124,7 @@ USA.
   (guarantee-integer time 'thread-queue/dequeue-until)
   (when-non-empty-before time queue %dequeue!))
 
-(declare (integrable-operator when-non-empty-before))
+(declare (integrate-operator when-non-empty-before))
 (define (when-non-empty-before time queue operation)
   (without-interrupts
    (lambda ()