コミット: ab99dcb2790314d6dd9a4eb31cfc11926ca57dfe - mingw.pkg (git)

Experimental package creation tool for MinGW.org

コミットメタ情報

• リビジョン: ab99dcb2790314d6dd9a4eb31cfc11926ca57dfe (tree)
• 日時: 2022-03-06 07:38:46
• 作者: Keith Marshall <keith@user...>
• コミッター: Keith Marshall

ログメッセージ

Improve source directory identification mechanisms.

* src/modules/pkgspec.sh (initialize_abs_srcdir, abs_srcdir): New
functions; implement them to identify, and report source path name.
(pkgspec_from_srcdir): Do not require the basename from...
(PACKAGE_ABS_SRCDIR): ...this; it may not be defined, whereas...
(PACKAGE_SRCDIR): ...this is, and is sufficient.

変更サマリ

• modified: src/modules/pkgspec.sh

差分

--- a/src/modules/pkgspec.sh
+++ b/src/modules/pkgspec.sh
@@ -9,7 +9,7 @@
 # $Id$
 #
 # Written by Keith Marshall <[e-mail]>
-# Copyright (C) 2011-2014, 2017, 2018, 2020, MinGW.OSDN Project
+# Copyright (C) 2011-2014, 2017, 2018, 2020, 2022, MinGW.OSDN Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -39,9 +39,22 @@
 #
   ARCH=${ARCH-"mingw32"}
 
-# Provide an absolute canonical reference form for PACKAGE_SRCDIR.
+# Determine an absolute canonical reference form for PACKAGE_SRCDIR; provide
+# a capability to abort if inaccessible, but allow for deferred failure.
 #
-  PACKAGE_ABS_SRCDIR=`cd $PACKAGE_SRCDIR; pwd`
+  abs_srcdir() { 2> /dev/null cd $PACKAGE_SRCDIR && pwd || {
+      ${1-"true"} && die 2 "cannot access directory '$PACKAGE_SRCDIR'"
+    }
+  }
+# If available, store this canonical reference in PACKAGE_ABS_SRCDIR, and
+# redefine the evaluator function to simply reproduce the stored path.
+#
+  initialize_abs_srcdir() {
+    PACKAGE_ABS_SRCDIR=`abs_srcdir ${1+"$1"}` && {
+      abs_srcdir() { echo "$PACKAGE_ABS_SRCDIR"; }
+    }
+  }
+  initialize_abs_srcdir ${fail_if_inaccessible-"false"}
 
 # Ensure we have a PACKAGE name specification; if not, attempt to deduce
 # a suitable default from the name of the top-level source code directory.
@@ -51,7 +64,7 @@
     #
     # An optional second argument overrides the default derivation.
     #
-    IFS=-; set -- ${2-`basename "$PACKAGE_ABS_SRCDIR"`}; IFS=
+    IFS=-; set -- ${2-`basename "$PACKAGE_SRCDIR"`}; IFS=
     value= fs=; $pkgspec_request_class "$@"
   }
   pkgspec_get_name() {