summaryrefslogtreecommitdiffstats
path: root/doc/generated
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-12-10 23:05:57 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-12-10 23:05:57 (GMT)
commit93bf27c99cd82fd4780b5cf5691e6eb9bf0160f9 (patch)
tree8e771968a11a182b48023cda8f911991af45563d /doc/generated
parent57915d922633bb5e21bee97e827d20e0a1fedd13 (diff)
downloadSCons-93bf27c99cd82fd4780b5cf5691e6eb9bf0160f9.zip
SCons-93bf27c99cd82fd4780b5cf5691e6eb9bf0160f9.tar.gz
SCons-93bf27c99cd82fd4780b5cf5691e6eb9bf0160f9.tar.bz2
rebuild docs with changes from applelink.xml changes. Fix mistyped APPLELINK_CURRENT_VERSION to APPLELINK_NO_CURRENT_VERSION
Diffstat (limited to 'doc/generated')
-rw-r--r--doc/generated/examples/caching_ex-random_1.xml4
-rw-r--r--doc/generated/tools.gen2
-rw-r--r--doc/generated/variables.gen53
-rw-r--r--doc/generated/variables.mod8
4 files changed, 63 insertions, 4 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 @@
<?xml version='1.0' encoding='UTF-8'?>
<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.scons.org/dbxsd/v1.0" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-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
</screen>
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).
</para>
- <para>Sets: &amp;cv-link-APPLELINK_COMPATIBILITY_VERSION;, &amp;cv-link-APPLELINK_CURRENT_VERSION;, &amp;cv-link-FRAMEWORKPATHPREFIX;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LDMODULEFLAGS;, &amp;cv-link-LDMODULEPREFIX;, &amp;cv-link-LDMODULESUFFIX;, &amp;cv-link-LINKCOM;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-_FRAMEWORKPATH;, &amp;cv-link-_FRAMEWORKS;.</para><para>Uses: &amp;cv-link-FRAMEWORKSFLAGS;.</para></listitem>
+ <para>Sets: &amp;cv-link-APPLELINK_COMPATIBILITY_VERSION;, &amp;cv-link-APPLELINK_CURRENT_VERSION;, &amp;cv-link-APPLELINK_NO_COMPATIBILITY_VERSION;, &amp;cv-link-APPLELINK_NO_CURRENT_VERSION;, &amp;cv-link-FRAMEWORKPATHPREFIX;, &amp;cv-link-LDMODULECOM;, &amp;cv-link-LDMODULEFLAGS;, &amp;cv-link-LDMODULEPREFIX;, &amp;cv-link-LDMODULESUFFIX;, &amp;cv-link-LINKCOM;, &amp;cv-link-SHLINKCOM;, &amp;cv-link-SHLINKFLAGS;, &amp;cv-link-_APPLELINK_COMPATIBILITY_VERSION;, &amp;cv-link-_APPLELINK_CURRENT_VERSION;, &amp;cv-link-_FRAMEWORKPATH;, &amp;cv-link-_FRAMEWORKS;.</para><para>Uses: &amp;cv-link-FRAMEWORKSFLAGS;.</para></listitem>
</varlistentry>
<varlistentry id="t-ar">
<term>ar</term>
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 <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. O
</para>
</listitem>
</varlistentry>
+ <varlistentry id="cv-_APPLELINK_COMPATIBILITY_VERSION">
+ <term>_APPLELINK_COMPATIBILITY_VERSION</term>
+ <listitem><para>
+ 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 <link linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>
+ and <link linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> and <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
+ to determine the correct flag.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry id="cv-APPLELINK_COMPATIBILITY_VERSION">
<term>APPLELINK_COMPATIBILITY_VERSION</term>
<listitem><para>
@@ -38,12 +49,26 @@ if <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. O
</para>
<para>
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 <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
+ 255, Z can be omitted or between 1 and 255. This value will be derived from <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if
+ not
specified. The lowest digit will be dropped and replaced by a 0.
</para>
+ <para>
+ If the <link linkend="cv-APPLELINK_NO_COMPATIBILITY_VERSION"><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link> is set then no -compatibility_version will be
+ output.
+ </para>
<para>See MacOS's ld manpage for more details</para>
</listitem>
</varlistentry>
+ <varlistentry id="cv-_APPLELINK_CURRENT_VERSION">
+ <term>_APPLELINK_CURRENT_VERSION</term>
+ <listitem><para>
+ 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 <link linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link> and
+ <link linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> and <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> to determine the correct flag.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry id="cv-APPLELINK_CURRENT_VERSION">
<term>APPLELINK_CURRENT_VERSION</term>
<listitem><para>
@@ -56,10 +81,36 @@ if <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is set. O
255, Z can be omitted or between 1 and 255. This value will be set to <link linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> if not
specified.
</para>
+ <para>
+ If the <link linkend="cv-APPLELINK_NO_CURRENT_VERSION"><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link> is set then no -current_version will be
+ output.
+ </para>
<para>See MacOS's ld manpage for more details</para>
</listitem>
</varlistentry>
+ <varlistentry id="cv-APPLELINK_NO_COMPATIBILITY_VERSION">
+ <term>APPLELINK_NO_COMPATIBILITY_VERSION</term>
+ <listitem><para>
+ Set this to any True (1|True|non-empty string) value to disable adding -compatibility_version flag when
+ generating versioned shared libraries.
+ </para>
+ <para>
+ This overrides <link linkend="cv-APPLELINK_COMPATIBILITY_VERSION"><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="cv-APPLELINK_NO_CURRENT_VERSION">
+ <term>APPLELINK_NO_CURRENT_VERSION</term>
+ <listitem><para>
+ Set this to any True (1|True|non-empty string) value to disable adding -current_version flag when
+ generating versioned shared libraries.
+ </para>
+ <para>
+ This overrides <link linkend="cv-APPLELINK_CURRENT_VERSION"><envar>$APPLELINK_CURRENT_VERSION</envar></link>.
+ </para>
+ </listitem>
+ </varlistentry>
<varlistentry id="cv-AR">
<term>AR</term>
<listitem><para>
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.
<!ENTITY cv-__LDMODULEVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$__LDMODULEVERSIONFLAGS</envar>">
<!ENTITY cv-__SHLIBVERSIONFLAGS "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$__SHLIBVERSIONFLAGS</envar>">
+<!ENTITY cv-_APPLELINK_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_APPLELINK_COMPATIBILITY_VERSION</envar>">
<!ENTITY cv-APPLELINK_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_COMPATIBILITY_VERSION</envar>">
+<!ENTITY cv-_APPLELINK_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$_APPLELINK_CURRENT_VERSION</envar>">
<!ENTITY cv-APPLELINK_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_CURRENT_VERSION</envar>">
+<!ENTITY cv-APPLELINK_NO_COMPATIBILITY_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_NO_COMPATIBILITY_VERSION</envar>">
+<!ENTITY cv-APPLELINK_NO_CURRENT_VERSION "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$APPLELINK_NO_CURRENT_VERSION</envar>">
<!ENTITY cv-AR "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$AR</envar>">
<!ENTITY cv-ARCHITECTURE "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$ARCHITECTURE</envar>">
<!ENTITY cv-ARCOM "<envar xmlns='http://www.scons.org/dbxsd/v1.0'>$ARCOM</envar>">
@@ -643,8 +647,12 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT.
<!ENTITY cv-link-__LDMODULEVERSIONFLAGS "<link linkend='cv-__LDMODULEVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$__LDMODULEVERSIONFLAGS</envar></link>">
<!ENTITY cv-link-__SHLIBVERSIONFLAGS "<link linkend='cv-__SHLIBVERSIONFLAGS' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$__SHLIBVERSIONFLAGS</envar></link>">
+<!ENTITY cv-link-_APPLELINK_COMPATIBILITY_VERSION "<link linkend='cv-_APPLELINK_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_APPLELINK_COMPATIBILITY_VERSION</envar></link>">
<!ENTITY cv-link-APPLELINK_COMPATIBILITY_VERSION "<link linkend='cv-APPLELINK_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_COMPATIBILITY_VERSION</envar></link>">
+<!ENTITY cv-link-_APPLELINK_CURRENT_VERSION "<link linkend='cv-_APPLELINK_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$_APPLELINK_CURRENT_VERSION</envar></link>">
<!ENTITY cv-link-APPLELINK_CURRENT_VERSION "<link linkend='cv-APPLELINK_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_CURRENT_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_NO_COMPATIBILITY_VERSION "<link linkend='cv-APPLELINK_NO_COMPATIBILITY_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_NO_COMPATIBILITY_VERSION</envar></link>">
+<!ENTITY cv-link-APPLELINK_NO_CURRENT_VERSION "<link linkend='cv-APPLELINK_NO_CURRENT_VERSION' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$APPLELINK_NO_CURRENT_VERSION</envar></link>">
<!ENTITY cv-link-AR "<link linkend='cv-AR' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$AR</envar></link>">
<!ENTITY cv-link-ARCHITECTURE "<link linkend='cv-ARCHITECTURE' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$ARCHITECTURE</envar></link>">
<!ENTITY cv-link-ARCOM "<link linkend='cv-ARCOM' xmlns='http://www.scons.org/dbxsd/v1.0'><envar>$ARCOM</envar></link>">