More changes for new distrib scheme.

diff --git a/dist/make-doc-files b/dist/make-doc-files
index 112a5931e574bd9931df543d8b0fb7abbd94cec5..1cba8e72a9e7050091fed17014cb0329cd74bb27 100755 (executable)
--- a/dist/make-doc-files
+++ b/dist/make-doc-files
@@ -25,7 +25,6 @@
 
 . "$(dirname "${0}")"/shared.sh
 make_output_dir
-standard_args
 
 BUILD_DIR=doc-build
 

diff --git a/dist/make-liarc-files b/dist/make-liarc-files
index bb44ea1befb56fa931e57631e27fe5db4e3e99e4..10242d3591d33f271c4f0ba546ae3408631595ea 100755 (executable)
--- a/dist/make-liarc-files
+++ b/dist/make-liarc-files
@@ -25,7 +25,6 @@
 
 . "$(dirname "${0}")"/shared.sh
 make_output_dir
-standard_args
 
 LIARC_DIR=${PROJECT_NAME}-c-${RELEASE}
 

diff --git a/dist/make-native-files b/dist/make-native-files
index 10b25e39e62be2aa1a497054e9ffa3ff25aa0abf..4cc9fdee8d4e7a44d884e9bc118a2d68b21aa558 100755 (executable)
--- a/dist/make-native-files
+++ b/dist/make-native-files
@@ -25,7 +25,6 @@
 
 . "$(dirname "${0}")"/shared.sh
 make_output_dir
-standard_args
 
 build ()
 {

diff --git a/dist/make-src-files b/dist/make-src-files
index db0ec89799c0c347701383bca3d722a048fff178..50bfaf800658479023b59ae1ba4af5232f709381 100755 (executable)
--- a/dist/make-src-files
+++ b/dist/make-src-files
@@ -25,7 +25,6 @@
 
 . "$(dirname "${0}")"/shared.sh
 reset_output_dir
-standard_args
 
 notify "Creating the changelog"
 my_rm_f "${CHANGELOG}"

diff --git a/dist/make-system-file b/dist/make-system-file
deleted file mode 100755 (executable)
index 1e735f4..0000000
--- a/dist/make-system-file
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-#     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#     2005, 2006, 2007, 2008, 2009, 2010 Massachusetts Institute of
-#     Technology
-#
-# This program 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.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# inputs: ucode tar, scheme binary tars
-# outputs: system-specific tar
-
-system_args ()
-{
-    (( ${#} >= 3 )) || usage
-    DIST_TYPE=${1}
-    ARCH=${2}
-    SYSTEM=${3}
-}
-ARGS_FUNCTION=system_args
-
-system_usage ()
-{
-    echo "usage: ${PROGRAM} TYPE ARCH SYSTEM [OPTIONS]"
-    usage_arg_type
-    echo "  ARCH must be 'i386' or 'x86-64'"
-    echo "  SYSTEM is the operating system identifier"
-    echo "  OPTIONS are passed to the configure script"
-}
-USAGE_FUNCTION=system_usage
-
-. "$(dirname "${0}")"/shared.sh
-make_output_dir
-
-shift 3
-
-OUT=${SYSTEM_OUT}-${ARCH}-${SYSTEM}
-ARCH_BASE=${DIST_DIR}-${ARCH}
-SYSTEM_BASE=${ARCH_BASE}-${SYSTEM}
-UCODE_DIR=${DIST_DIR}/src/microcode
-IMAGE_DIR=temp_image_dir
-LIB_DIR=lib/mit-scheme-"${ARCH}"
-
-compile ()
-{
-    my_configure --enable-native-code="${ARCH}" "${@}"
-    my_make
-}
-
-make_image ()
-{
-    make install DESTDIR="${TL_DIR}"/"${IMAGE_DIR}"
-}
-
-notify "Compiling executable"
-unpack_dist_file_to "${UCODE_BASE}" "${DIST_DIR}"
-run_command "${OUT}"-compile "${UCODE_DIR}" compile "${@}"
-
-notify "Making image directory"
-new_temp_dir "${IMAGE_DIR}"
-run_command "${OUT}"-image "${UCODE_DIR}" make_image
-unpack_dist_file_to "${ARCH_BASE}" "${SYSTEM_BASE}"
-my_mv "${IMAGE_DIR}"/usr/local/bin "${SYSTEM_BASE}"/.
-my_mv "${IMAGE_DIR}"/usr/local/"${LIB_DIR}"/lib "${SYSTEM_BASE}"/"${LIB_DIR}"/.
-
-notify "Making archive file"
-make_tar_file "${OUT}" "${SYSTEM_BASE}"
-
-notify_finished

diff --git a/dist/shared.sh b/dist/shared.sh
index b08a1565af5c65f912b6a25be8d20bc1143a0422..636f2ad574b1a6d97c8f3fb84a2036243196f8d8 100644 (file)
--- a/dist/shared.sh
+++ b/dist/shared.sh
@@ -92,7 +92,7 @@ SRC_OUT=${OUTPUT_DIR}/src
 DOC_OUT=${OUTPUT_DIR}/doc
 LIARC_OUT=${OUTPUT_DIR}/liarc
 NATIVE_OUT=${OUTPUT_DIR}/native
-SYSTEM_OUT=${OUTPUT_DIR}/system
+MACOSX_OUT=${OUTPUT_DIR}/macosx
 
 notify ()
 {