From 33f79308b56df15cdc29d20cc9ad095c3287453c Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Thu, 2 Jun 2011 17:07:55 -0700 Subject: [PATCH] Replace .sf and .cbf with compile.scm. --- src/gtk-screen/Makefile-fragment | 6 +- src/gtk-screen/{gtk-screen.sf => compile.scm} | 6 +- src/gtk-screen/gtk-screen-new.pkg | 181 ------------------ src/gtk-screen/gtk-screen.cbf | 7 - 4 files changed, 3 insertions(+), 197 deletions(-) rename src/gtk-screen/{gtk-screen.sf => compile.scm} (50%) delete mode 100644 src/gtk-screen/gtk-screen-new.pkg delete mode 100644 src/gtk-screen/gtk-screen.cbf diff --git a/src/gtk-screen/Makefile-fragment b/src/gtk-screen/Makefile-fragment index 2746f226c..f8be66108 100644 --- a/src/gtk-screen/Makefile-fragment +++ b/src/gtk-screen/Makefile-fragment @@ -7,14 +7,10 @@ generate: # @echo "Nothing to be done for \`generate'." build: - echo '(load "gtk-screen.sf")' \ + echo '(load "compile")' \ | ../microcode/scheme --compiler --library ../lib --batch-mode - @if [ -s ../gtk/gtk-unx.crf ]; then \ - echo "../gtk/gtk-unx.crf:0: warning: non-empty"; exit 1; fi @if [ -s gtk-screen-unx.crf ]; then \ echo "gtk-screen-unx.crf:0: warning: non-empty"; exit 1; fi - echo '(load "gtk-screen.cbf")' \ - | ../microcode/scheme --compiler --library ../lib --batch-mode install: rm -rf $(DESTDIR)$(TARGET_DIR) diff --git a/src/gtk-screen/gtk-screen.sf b/src/gtk-screen/compile.scm similarity index 50% rename from src/gtk-screen/gtk-screen.sf rename to src/gtk-screen/compile.scm index 635437816..dcd4a70fb 100644 --- a/src/gtk-screen/gtk-screen.sf +++ b/src/gtk-screen/compile.scm @@ -1,11 +1,9 @@ #| -*-Scheme-*- |# -;;;; Syntax the Gtk-Screen system +;;;; Compile the Gtk-Screen system (fluid-let ((load/suppress-loading-message? #t)) (load-option 'CREF) (load-option 'GTK)) -(sf-package-set "gtk-screen-new") - -(cref/generate-constructors "gtk-screen" 'ALL) \ No newline at end of file +(compile-system "gtk-screen" (directory-pathname (current-load-pathname))) \ No newline at end of file diff --git a/src/gtk-screen/gtk-screen-new.pkg b/src/gtk-screen/gtk-screen-new.pkg deleted file mode 100644 index 6615789f9..000000000 --- a/src/gtk-screen/gtk-screen-new.pkg +++ /dev/null @@ -1,181 +0,0 @@ -#| -*-Scheme-*- - -Copyright (C) 2007, 2008, 2009, 2010, 2011 Matthew Birkholz - -This file is part of MIT/GNU Scheme. - -MIT/GNU Scheme is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. - -MIT/GNU Scheme is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with MIT/GNU Scheme; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, -USA. - -|# - -;;;; Gtk-Screen System Packaging - -(global-definitions "../runtime/runtime") -(global-definitions "../sos/sos") -(global-definitions "../gtk/gtk") -(global-definitions "../edwin/edwin") - -;;; This is largely a copy of gtk-screen.pkg, with a few new declarations added. - -(declare (usual-integrations)) - -(define-package (edwin screen gtk-screen) - (files "gtk-screen") - (parent (edwin screen)) - (export () - set-gtk-screen-hooks!) - (export (edwin) - ;; edwin-variable$x-cut-to-clipboard - ;; edwin-variable$x-paste-from-clipboard - ;; os/interprogram-cut - ;; os/interprogram-paste - ;; x-root-window-size - ;; x-screen-ignore-focus-button? - ;; x-selection-timeout - ;; xterm-screen/flush! - ;; xterm-screen/grab-focus! - ) - (export (edwin x-commands) - ;; screen-display - ;; screen-xterm - ;; xterm-screen/set-icon-name - ;; xterm-screen/set-name - ) - (import (runtime subprocess) - hook/subprocess-status-change) - (import (edwin process) - hook/inferior-process-output) - (import (edwin window) - editor-frame-root-window - window-inferiors inferior-window - combination? combination-vertical? - set-window-size! - buffer-frame? - frame-modeline-inferior - frame-text-inferior - %window-buffer - %window-char-image-strings - %window-force-redraw? - %window-group - %window-point-index - %window-point-moved? - %window-tab-width) - (import (gtk pango) - pangos->pixels) - (import (gtk gtk-object) - gtk-object-destroy-callback - gtk-container-reverse-children) - (import (gtk fix-layout) - drawing-damage - fix-layout-new-geometry-callback - fix-layout-realize-callback - fix-layout-window - fix-layout-geometry - fix-layout-scroll-nw! - fix-drawing-display-list - fix-ink-expose-callback - fix-ink-extent - text-ink-pango-layout - - make-fix-rect copy-fix-rect fix-rect-string - fix-rect-x fix-rect-y fix-rect-width fix-rect-height - fix-rect-min-x fix-rect-max-x fix-rect-min-y fix-rect-max-y - set-fix-rect-size! set-fix-rect-position! - fix-rect-intersect? fix-rect-union!) - (import (gtk) - bit-and - gdk-key-state->char-bits gdk-keyval->name - gobject-alien gobject-unref! - gdk-window-process-updates - - gtk-object-destroy - - gtk-widget? gtk-widget-parent - gtk-widget-grab-focus - gtk-widget-show gtk-widget-show-all - gtk-widget-error-bell - gtk-widget-queue-draw - gtk-widget-font set-gtk-widget-font! - gtk-widget-get-pango-context - gtk-widget-create-pango-layout - gtk-widget-set-size-request - gtk-widget-text-color gtk-widget-base-color - set-gtk-widget-text-color! set-gtk-widget-base-color! - set-gtk-widget-fg-color! set-gtk-widget-bg-color! - - gtk-container? - gtk-container-children gtk-container-add gtk-container-remove - gtk-container-set-border-width - - gtk-scrolled-window? gtk-scrolled-window-new - gtk-scrolled-window-set-policy - gtk-scrolled-window-set-placement - - gtk-hbox? gtk-hbox-new - gtk-vbox? gtk-vbox-new - gtk-box-pack-end - - gtk-window-get-default-size - gtk-window-new - gtk-window-present - gtk-window-set-default-size - gtk-window-set-title - gtk-window-set-opacity - gtk-window-parse-geometry - - pango-layout-get-pixel-extents - pango-layout-index-to-pos - pango-layout-set-text - - pango-context-get-metrics - pango-context-spacing - - pango-font-description-from-string - pango-font-description-to-string - pango-font-description-free - pango-font-metrics-get-ascent pango-font-metrics-get-descent - pango-font-metrics-get-approximate-char-width - pango-font-metrics-unref - - fix-layout? - fix-layout-drawing set-fix-layout-drawing! set-fix-layout-size! - fix-layout-scroll-step set-fix-layout-scroll-step! - fix-layout-view fix-layout-scroll-to! - set-fix-layout-map-handler! - set-fix-layout-unmap-handler! - set-fix-layout-focus-change-handler! - set-fix-layout-visibility-notify-handler! - set-fix-layout-key-press-handler! - ;;set-fix-layout-motion-handler! - ;;set-fix-layout-button-release-handler! - - guarantee-fix-drawing - make-fix-drawing fix-drawing-widgets - set-fix-drawing-size! - fix-drawing-add-ink! - - fix-ink? - fix-ink-drawing - fix-ink-widgets set-fix-ink-widgets! - fix-ink-remove! - - set-text-ink-position! - - simple-text-ink? make-simple-text-ink - simple-text-ink-text set-simple-text-ink-text! - - set-box-ink! set-box-ink-position! - set-box-ink-shadow!)) \ No newline at end of file diff --git a/src/gtk-screen/gtk-screen.cbf b/src/gtk-screen/gtk-screen.cbf deleted file mode 100644 index 5194575b9..000000000 --- a/src/gtk-screen/gtk-screen.cbf +++ /dev/null @@ -1,7 +0,0 @@ -#| -*-Scheme-*- - -Compile the Gtk-Screen system. |# - -(fluid-let ((compiler:coalescing-constant-warnings? #f)) - (compile-directory ".") - unspecific) \ No newline at end of file -- 2.25.1