Mercurial > octave

changeset 28061:8f5e625062f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use %reldir% in more places in module.mk files in scripts directory * scripts/+containers/module.mk, scripts/+matlab/+lang/module.mk, scripts/audio/module.mk, scripts/deprecated/module.mk, scripts/elfun/module.mk, scripts/general/module.mk, scripts/geometry/module.mk, scripts/gui/module.mk, scripts/help/module.mk, scripts/image/module.mk, scripts/io/module.mk, scripts/java/module.mk, scripts/legacy/module.mk, scripts/linear-algebra/module.mk, scripts/miscellaneous/module.mk, scripts/ode/module.mk, scripts/optimization/module.mk, scripts/path/module.mk, scripts/pkg/module.mk, scripts/plot/appearance/module.mk, scripts/plot/draw/module.mk, scripts/plot/util/module.mk, scripts/polynomial/module.mk, scripts/prefs/module.mk, scripts/profiler/module.mk, scripts/set/module.mk, scripts/signal/module.mk, scripts/sparse/module.mk, scripts/specfun/module.mk, scripts/special-matrix/module.mk, scripts/startup/module.mk, scripts/statistics/module.mk, scripts/strings/module.mk, scripts/testfun/module.mk, scripts/time/module.mk, scripts/web/module.mk: Use %reldir% instead of literal directory name where possbile. Ensure that all private directories are included in FCN_FILE_DIRS list.
author John W. Eaton <jwe@octave.org>
date Thu, 13 Feb 2020 11:33:27 -0500
parents e8b5bca84d88
children 4563c23597dd
files scripts/+containers/module.mk scripts/+matlab/+lang/module.mk scripts/audio/module.mk scripts/deprecated/module.mk scripts/elfun/module.mk scripts/general/module.mk scripts/geometry/module.mk scripts/gui/module.mk scripts/help/module.mk scripts/image/module.mk scripts/io/module.mk scripts/java/module.mk scripts/legacy/module.mk scripts/linear-algebra/module.mk scripts/miscellaneous/module.mk scripts/ode/module.mk scripts/optimization/module.mk scripts/path/module.mk scripts/pkg/module.mk scripts/plot/appearance/module.mk scripts/plot/draw/module.mk scripts/plot/util/module.mk scripts/polynomial/module.mk scripts/prefs/module.mk scripts/profiler/module.mk scripts/set/module.mk scripts/signal/module.mk scripts/sparse/module.mk scripts/specfun/module.mk scripts/special-matrix/module.mk scripts/startup/module.mk scripts/statistics/module.mk scripts/strings/module.mk scripts/testfun/module.mk scripts/time/module.mk scripts/web/module.mk
diffstat 36 files changed, 42 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/+containers/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/+containers/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/+containers
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/Map.m
--- a/scripts/+matlab/+lang/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/+matlab/+lang/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/+matlab/+lang
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/makeUniqueStrings.m \
--- a/scripts/audio/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/audio/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/audio \
+  %reldir% \
   %reldir%/@audioplayer \
   %reldir%/@audiorecorder
 
--- a/scripts/deprecated/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/deprecated/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/deprecated
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/output_max_field_width.m \
--- a/scripts/elfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/elfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/elfun
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/acosd.m \
--- a/scripts/general/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/general/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/general \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/geometry/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/geometry/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/geometry
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/convhull.m \
--- a/scripts/gui/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/gui/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/gui \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/help/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/help/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/help \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/image/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/image/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/image \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/io/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/io/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/io
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/beep.m \
--- a/scripts/java/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/java/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/java
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/javaArray.m \
--- a/scripts/legacy/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/legacy/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/legacy
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/findstr.m \
--- a/scripts/linear-algebra/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/linear-algebra/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/linear-algebra
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/bandwidth.m \
--- a/scripts/miscellaneous/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/miscellaneous/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/miscellaneous \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/ode/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/ode/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/ode \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/optimization/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/optimization/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/optimization \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/path/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/path/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/path \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/pkg/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/pkg/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/pkg \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/plot/appearance/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/appearance/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/appearance \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/plot/draw/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/draw/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/draw \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/plot/util/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/plot/util/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/plot/util \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_GEN_FCN_FILES = \
--- a/scripts/polynomial/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/polynomial/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/polynomial \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/prefs/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/prefs/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/prefs \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/profiler/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/profiler/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,4 @@
-FCN_FILE_DIRS += \
-  scripts/profiler
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/profexplore.m \
--- a/scripts/set/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/set/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,8 +1,9 @@
 FCN_FILE_DIRS += \
-  scripts/set \
+  %reldir% \
   %reldir%/private
 
-%canon_reldir%_PRIVATE_FCN_FILES = %reldir%/private/validsetargs.m
+%canon_reldir%_PRIVATE_FCN_FILES = \
+  %reldir%/private/validsetargs.m
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/intersect.m \
--- a/scripts/signal/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/signal/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/signal \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/sparse/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/sparse/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,5 +1,5 @@
 FCN_FILE_DIRS += \
-  scripts/sparse \
+  %reldir% \
   %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
--- a/scripts/specfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/specfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/specfun
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/beta.m \
--- a/scripts/special-matrix/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/special-matrix/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/special-matrix
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/gallery.m \
--- a/scripts/startup/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/startup/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/startup
+FCN_FILE_DIRS += %reldir%
 
 SITE_STARTUP_FILE_SRC  = %reldir%/site-rcfile
 
--- a/scripts/statistics/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/statistics/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/statistics
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/bounds.m \
@@ -50,9 +50,7 @@
 
 %canon_reldir%_DATA = $(%canon_reldir%_FCN_FILES)
 
-FCN_FILES += \
-  $(%canon_reldir%_FCN_FILES) \
-  $(%canon_reldir%_PRIVATE_FCN_FILES)
+FCN_FILES += $(%canon_reldir%_FCN_FILES)
 
 PKG_ADD_FILES += %reldir%/PKG_ADD
 
--- a/scripts/strings/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/strings/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/strings
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/base2dec.m \
--- a/scripts/testfun/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/testfun/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,6 @@
-FCN_FILE_DIRS += scripts/testfun
+FCN_FILE_DIRS += \
+  %reldir% \
+  %reldir%/private
 
 %canon_reldir%_PRIVATE_FCN_FILES = \
   %reldir%/private/compare_plot_demos.m \
--- a/scripts/time/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/time/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/time
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/addtodate.m \
--- a/scripts/web/module.mk	Thu Feb 13 10:43:28 2020 -0500
+++ b/scripts/web/module.mk	Thu Feb 13 11:33:27 2020 -0500
@@ -1,4 +1,4 @@
-FCN_FILE_DIRS += scripts/web
+FCN_FILE_DIRS += %reldir%
 
 %canon_reldir%_FCN_FILES = \
   %reldir%/web.m \
@@ -14,4 +14,4 @@
 
 PKG_ADD_FILES += %reldir%/PKG_ADD
 
-DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
\ No newline at end of file
+DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)