From 93bf27c99cd82fd4780b5cf5691e6eb9bf0160f9 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 10 Dec 2018 18:05:57 -0500 Subject: rebuild docs with changes from applelink.xml changes. Fix mistyped APPLELINK_CURRENT_VERSION to APPLELINK_NO_CURRENT_VERSION --- doc/generated/examples/caching_ex-random_1.xml | 4 +- doc/generated/tools.gen | 2 +- doc/generated/variables.gen | 53 +++++++++++++++++++++++++- doc/generated/variables.mod | 8 ++++ src/engine/SCons/Tool/applelink.xml | 2 +- 5 files changed, 64 insertions(+), 5 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index d00f1ca..4823b93 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f4.o -c f4.c -cc -o f1.o -c f1.c cc -o f5.o -c f5.c cc -o f2.o -c f2.c cc -o f3.o -c f3.c +cc -o f4.o -c f4.c +cc -o f1.o -c f1.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index 9dffb63..4f4cab4 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -55,7 +55,7 @@ Sets construction variables for the IBM Visual Age linker. Sets construction variables for the Apple linker (similar to the GNU linker). - Sets: &cv-link-APPLELINK_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_CURRENT_VERSION;, &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LINKCOM;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_FRAMEWORKPATH;, &cv-link-_FRAMEWORKS;.Uses: &cv-link-FRAMEWORKSFLAGS;. + Sets: &cv-link-APPLELINK_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_CURRENT_VERSION;, &cv-link-APPLELINK_NO_COMPATIBILITY_VERSION;, &cv-link-APPLELINK_NO_CURRENT_VERSION;, &cv-link-FRAMEWORKPATHPREFIX;, &cv-link-LDMODULECOM;, &cv-link-LDMODULEFLAGS;, &cv-link-LDMODULEPREFIX;, &cv-link-LDMODULESUFFIX;, &cv-link-LINKCOM;, &cv-link-SHLINKCOM;, &cv-link-SHLINKFLAGS;, &cv-link-_APPLELINK_COMPATIBILITY_VERSION;, &cv-link-_APPLELINK_CURRENT_VERSION;, &cv-link-_FRAMEWORKPATH;, &cv-link-_FRAMEWORKS;.Uses: &cv-link-FRAMEWORKSFLAGS;. ar diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 7180489..dfc604d 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -29,6 +29,17 @@ if $SHLIBVERSION is set. O + + _APPLELINK_COMPATIBILITY_VERSION + + A macro (by default a generator function) used to create the linker flags to specify + apple's linker's -compatibility_version flag. + The default generator uses $APPLELINK_COMPATIBILITY_VERSION + and $APPLELINK_NO_COMPATIBILITY_VERSION and $SHLIBVERSION + to determine the correct flag. + + + APPLELINK_COMPATIBILITY_VERSION @@ -38,12 +49,26 @@ if $SHLIBVERSION is set. O The value is specified as X[.Y[.Z]] where X is between 1 and 65535, Y can be omitted or between 1 and - 255, Z can be omitted or between 1 and 255. This value will be derived from $SHLIBVERSION if not + 255, Z can be omitted or between 1 and 255. This value will be derived from $SHLIBVERSION if + not specified. The lowest digit will be dropped and replaced by a 0. + + If the $APPLELINK_NO_COMPATIBILITY_VERSION is set then no -compatibility_version will be + output. + See MacOS's ld manpage for more details + + _APPLELINK_CURRENT_VERSION + + A macro (by default a generator function) used to create the linker flags to specify apple's linker's + -current_version flag. The default generator uses $APPLELINK_CURRENT_VERSION and + $APPLELINK_NO_CURRENT_VERSION and $SHLIBVERSION to determine the correct flag. + + + APPLELINK_CURRENT_VERSION @@ -56,10 +81,36 @@ if $SHLIBVERSION is set. O 255, Z can be omitted or between 1 and 255. This value will be set to $SHLIBVERSION if not specified. + + If the $APPLELINK_NO_CURRENT_VERSION is set then no -current_version will be + output. + See MacOS's ld manpage for more details + + APPLELINK_NO_COMPATIBILITY_VERSION + + Set this to any True (1|True|non-empty string) value to disable adding -compatibility_version flag when + generating versioned shared libraries. + + + This overrides $APPLELINK_COMPATIBILITY_VERSION. + + + + + APPLELINK_NO_CURRENT_VERSION + + Set this to any True (1|True|non-empty string) value to disable adding -current_version flag when + generating versioned shared libraries. + + + This overrides $APPLELINK_CURRENT_VERSION. + + + AR diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 7fbd49f..7dfb208 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -10,8 +10,12 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $__LDMODULEVERSIONFLAGS"> $__SHLIBVERSIONFLAGS"> +$_APPLELINK_COMPATIBILITY_VERSION"> $APPLELINK_COMPATIBILITY_VERSION"> +$_APPLELINK_CURRENT_VERSION"> $APPLELINK_CURRENT_VERSION"> +$APPLELINK_NO_COMPATIBILITY_VERSION"> +$APPLELINK_NO_CURRENT_VERSION"> $AR"> $ARCHITECTURE"> $ARCOM"> @@ -643,8 +647,12 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $__LDMODULEVERSIONFLAGS"> $__SHLIBVERSIONFLAGS"> +$_APPLELINK_COMPATIBILITY_VERSION"> $APPLELINK_COMPATIBILITY_VERSION"> +$_APPLELINK_CURRENT_VERSION"> $APPLELINK_CURRENT_VERSION"> +$APPLELINK_NO_COMPATIBILITY_VERSION"> +$APPLELINK_NO_CURRENT_VERSION"> $AR"> $ARCHITECTURE"> $ARCOM"> diff --git a/src/engine/SCons/Tool/applelink.xml b/src/engine/SCons/Tool/applelink.xml index 3cc9e64..2856e06 100644 --- a/src/engine/SCons/Tool/applelink.xml +++ b/src/engine/SCons/Tool/applelink.xml @@ -123,7 +123,7 @@ See its __doc__ string for a discussion of the format. - + Set this to any True (1|True|non-empty string) value to disable adding -current_version flag when -- cgit v0.12