[Git][cmucl/cmucl][issue-363-add-version-number] Install main items in the correct places.

5 Jan 2025


      Raymond Toy pushed to branch issue-363-add-version-number at cmucl / cmucl


Commits:
e0b1282a by Raymond Toy at 2025-01-04T19:46:06-08:00
Install main items in the correct places.

Very important that we install a symlink for bin/lisp to the actual
lisp binary.

Update directories so that install puts the items in the correct
versioned names and directories.

- - - - -


1 changed file:

- bin/make-main-dist.sh


Changes:

=====================================
bin/make-main-dist.sh
=====================================
@@ -64,16 +64,24 @@ then
 	exit 2
 fi
 
-DESTDIR=${INSTALL_DIR:-release-$$}
-DOCDIR=${DOCDIR:-doc/cmucl}
-MANDIR=${MANDIR:-man/man1}
-TARGET="`echo $1 | sed 's:/*$::'`"
 VERSION=$2
 ARCH=$3
 OS=$4
 
+# Where to install the main library of cmucl files
 CMUCLLIBVER="lib/cmucl/$VERSION"
 
+# Where to install everything
+DESTDIR=${INSTALL_DIR:-release-$$}
+
+# Where to install docs
+DOCDIR=${DOCDIR:-share/cmucl/$VERSION/doc}
+
+# Where to install man pages
+MANDIR=${MANDIR:-share/man/man1}
+
+TARGET="`echo $1 | sed 's:/*$::'`"
+
 # Core file to look for.
 CORE=lisp.core
 case $ARCH in
@@ -132,6 +140,9 @@ install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/$CMUCLLIBVER/lib/ext-formats
 install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR}
 install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR}
 install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/lisp-$VERSION
+# Install symlink for lisp
+(cd $DESTDIR/bin; ln -s lisp-$VERSION lisp)
+
 if [ "$EXECUTABLE" = "true" ]
 then
     install ${GROUP} ${OWNER} -m 0644 $TARGET/lisp/lisp.a $DESTDIR/$CMUCLLIBVER/lib/
@@ -203,16 +214,17 @@ do
 done
 
 install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \
-	$DESTDIR/${MANDIR}/
+	$DESTDIR/${MANDIR}/cmucl-$VERSION.1
 install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
-	$DESTDIR/${MANDIR}/
+	$DESTDIR/${MANDIR}/lisp-$VERSION.1
+set -x
 install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR}
 if [ -f src/general-info/release-$VERSION.txt ] 
 then
 	install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \
 		$DESTDIR/${DOCDIR}
 fi
-
+set +x
 if [ -z "$INSTALL_DIR" ]; then
     sync ; sleep 1 ; sync ; sleep 1 ; sync
     echo Tarring main components



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0b1282a50cf24511f37732d...

-- 
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/-/commit/e0b1282a50cf24511f37732d...
You're receiving this email because of your account on gitlab.common-lisp.net.

    

Raymond Toy (＠rtoy)

tags

participants (1)