From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Thu, 10 Nov 2016 07:17:43 +0000 (-0700)
Subject: x11 plugin: Rename files to avoid conflicts with LIAR/C's output.
X-Git-Tag: mit-scheme-pucked-9.2.12~254^2~4
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f44a44c0f9ad512f7786f66c632a4705e31f68b7;p=mit-scheme.git

x11 plugin: Rename files to avoid conflicts with LIAR/C's output.
---

diff --git a/src/x11/compile.sh b/src/x11/compile.sh
index f879d29dd..dbf4ab81d 100755
--- a/src/x11/compile.sh
+++ b/src/x11/compile.sh
@@ -34,11 +34,11 @@ ${MIT_SCHEME_EXE} --prepend-library . --batch-mode <<\EOF
   (load-option 'FFI)
 
   (let ((runtime (->environment '(runtime))))
-    (compile-file "x11base" '() runtime)
-    (compile-file "x11color" '() runtime)
-    (compile-file "x11graph" '() runtime)
-    (compile-file "x11device" '() runtime)
-    (compile-file "x11term" '() runtime))
+    (compile-file "x11-base" '() runtime)
+    (compile-file "x11-color" '() runtime)
+    (compile-file "x11-graphics" '() runtime)
+    (compile-file "x11-device" '() runtime)
+    (compile-file "x11-terminal" '() runtime))
 
   (cref/generate-constructors "x11")
   )
diff --git a/src/x11/configure.ac b/src/x11/configure.ac
index 93f9347f2..807fb5e92 100644
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -63,7 +63,7 @@ os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
 
 MIT_SCHEME_PKD="x11-${os_suffix}.pkd"
 
-for f in x11base x11color x11graph x11term x11device; do
+for f in x11-base x11-color x11-graphics x11-terminal x11-device; do
     MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
     MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
     MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
diff --git a/src/x11/x11base.scm b/src/x11/x11-base.scm
similarity index 100%
rename from src/x11/x11base.scm
rename to src/x11/x11-base.scm
diff --git a/src/x11/x11color.scm b/src/x11/x11-color.scm
similarity index 100%
rename from src/x11/x11color.scm
rename to src/x11/x11-color.scm
diff --git a/src/x11/x11device.scm b/src/x11/x11-device.scm
similarity index 100%
rename from src/x11/x11device.scm
rename to src/x11/x11-device.scm
diff --git a/src/x11/x11graph.scm b/src/x11/x11-graphics.scm
similarity index 100%
rename from src/x11/x11graph.scm
rename to src/x11/x11-graphics.scm
diff --git a/src/x11/x11term.scm b/src/x11/x11-terminal.scm
similarity index 100%
rename from src/x11/x11term.scm
rename to src/x11/x11-terminal.scm
diff --git a/src/x11/x11.pkg b/src/x11/x11.pkg
index ea2faa387..65fc847cf 100644
--- a/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@ -31,7 +31,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
   (parent ()))
 
 (define-package (x11 base)
-  (files "x11base")
+  (files "x11-base")
   (parent (x11))
   (export (x11)
 	  x-visual-deallocate
@@ -116,7 +116,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  x-send-selection-notify))
 
 (define-package (x11 color)
-  (files "x11color")
+  (files "x11-color")
   (parent (x11))
   (export (x11)
 	  x-window-visual
@@ -134,7 +134,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  cleanup-alien!))
 
 (define-package (x11 graphics)
-  (files "x11graph")
+  (files "x11-graphics")
   (parent (x11))
   (export (x11)
 	  x-graphics-set-vdc-extent
@@ -170,7 +170,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  x-graphics-map-y-coordinate))
 
 (define-package (x11 device)
-  (files "x11device")
+  (files "x11-device")
   (parent (x11))
   (export (x11)
 	  create-x-colormap
@@ -293,7 +293,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 	  make-image-type))
 
 (define-package (x11 terminal)
-  (files "x11term")
+  (files "x11-terminal")
   (parent (x11))
   (export (x11)
 	  xterm-erase-cursor