From f7a384cc5200a52dfd48cd9785ef270f49074f05 Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Tue, 26 Apr 2011 17:19:08 -0700 Subject: [PATCH] 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. --- src/Makefile.in | 2 -- src/cref/butils.scm | 2 +- src/cref/object.scm | 6 ++---- src/cref/redpkg.scm | 11 ----------- src/gtk/Makefile-fragment | 10 +++------- src/gtk/Tags.sh | 4 ++-- src/gtk/compile.scm | 21 ++++++++++++++++++++- src/gtk/gtk.pkg | 11 +++++++++++ src/gtk/keys.scm | 7 +++++++ src/runtime/thread-queue.scm | 2 +- 10 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 71bac65dc..95d2269c0 100644 --- 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 f90d0b87b..5110da151 100644 --- 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 54d509494..77829b06f 100644 --- 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 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-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? 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 5879430ef..cc10cdece 100644 --- 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 30b2cf3dd..6eba438b8 100644 --- 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 () -- 2.25.1