[SM-Commit] GIT changes to master tome rdp by Eric Sandall (feff24cae6ae07e5d6c18e4e2e4ab9668580466f)

Eric Sandall scm at mail.sourcemage.org
Thu Mar 29 18:40:37 EDT 2007


GIT changes to master tome rdp by Eric Sandall <sandalle at sourcemage.org>:

 GrimoireGuruHandbook.tex |  112 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 96 insertions(+), 16 deletions(-)

New commits:
commit feff24cae6ae07e5d6c18e4e2e4ab9668580466f
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    GrimoireGuruHandbook.tex: PRE_BUILD is run after DOWNLOAD

commit 888149cd94e46b1ac63958da20078efa3cd2e829
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    GrimoireGuruHandbook.tex: Mention adding SPELL_OPTION to OPTS for config_query_option

commit 78f43c03b3200a25b09b3f682bfdee2ac63e5a83
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    GrimoireGuruHandbook.tex: Update pushing a new remote branch to be proper

commit cc5b80cb4f1b9daaf3ecec23d1acef6f3087c60d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    GrimoireGuruHandbook.tex: Add most of the DEPENDS information

diff --git a/GrimoireGuruHandbook.tex b/GrimoireGuruHandbook.tex
index c06c910..c255d25 100644
--- a/GrimoireGuruHandbook.tex
+++ b/GrimoireGuruHandbook.tex
@@ -354,7 +354,8 @@ help with it, so we'll push it to the up
 	\end{verbatim}
 	\item Now we push our currently checked out branch onto the remote
 	\begin{verbatim}
-		$ git push origin devel-openoffice
+		$ git push ssh://scm.sourcemage.org/smgl/grimoi
+re devel-openoffice:devel-openoffice
 updating 'refs/heads/devel-openoffice'
   from 0000000000000000000000000000000000000000
   to   fa9869a20bbfb479fafd63ef41e890919df3b6d9
@@ -384,15 +385,6 @@ $ git branch -r
   origin/devel-openoffice
   origin/master
 	\end{verbatim}
-	\item Remove your local devel-openoffice (since it is not linked with
-the remote, it will be difficult to keep them in sync)
-	\begin{verbatim}
-		$ git branch -D devel-openoffice
-	\end{verbatim}
-	\item Check out the remote devel-openoffice to your local branch
-	\begin{verbatim}
-		$ git checkout -b devel-openoffice origin/devel-openoffice
-	\end{verbatim}
 \end{enumerate}
 You are now set to collaborate on the devel-openoffice branch with other
 developers. :)
@@ -856,10 +848,18 @@ config_query_multi   SOMETHING     "What
 \end{verbatim}
 
 config\_query\_option is a bit different, it does not overwrite content of
-\textdollar SPELL\_OPTION, rather the result is appended to it.
-config\_query\_multi is
-different from config\_query\_list in that it makes available multiple options
-instead of just one. To use it one has to add
+\textdollar SPELL\_OPTION, rather the result is appended to it. If you want to
+use the parameters passed via config\_query\_option, you will need to manually
+add it. This is generally done in BUILD with:
+\begin{verbatim}
+OPTS="$SPELL_OPTION  \
+      $OPTS"         &&
+
+default_build
+\end{verbatim}
+
+config\_query\_multi is different from config\_query\_list in that it makes
+available multiple options instead of just one. To use it one has to add
 \begin{verbatim}
 source $GRIMOIRE/config_query_multi.function
 \end{verbatim}
@@ -874,6 +874,86 @@ variable name.
 For more examples and functions look into /var/lib/sorcery/modules/libapi.
 
 \section{DEPENDS}
+\subsection{depends}
+Denotes that a spell requires another spell to work.
+Syntax:
+\begin{verbatim}
+	depends  <'spell'>  ['flags']  ['description']  ['grimoire']
+\end{verbatim}
+
+
+Example: This package requires gtk+2 to be installed before compiling
+\begin{verbatim}
+	depends  'gtk+2'
+\end{verbatim}
+
+Example: This package requires gtk+2 to be installed before compiling and
+needs '--with-gtk' passed to ./configure
+\begin{verbatim}
+	depends  'gtk+2'  '--with-gtk'
+\end{verbatim}
+
+Example: This package requires a provider of GECKO before compiling
+\begin{verbatim}
+	depends  'GECKO'
+\end{verbatim}
+
+Example: This package requires a provider of JDK, available only in the
+z-rejected grimoire, before compiling:
+\begin{verbatim}
+	depends  'JDK'  ''  ''  'z-rejected'
+\end{verbatim}
+
+
+\subsection{optional\_depends}
+The given package will build added functionality if this package is installed
+before compilation.
+
+Syntax:
+\begin{verbatim}
+  optional_depends  <'spell'>            \
+                    <'enabling flags'>   \
+                    <'disabling flags'>  \
+                    <'description'>      \
+                    ['grimoire']
+\end{verbatim}
+
+Example: Optionally require gtk+2 for a GTK based GUI
+\begin{verbatim}
+  optional_depends  'gtk+2'                \
+                    '--enable-gui'         \
+                    '--disable-gui'        \
+                    'for a GTK+-based GUI'
+\end{verbatim}
+
+Example: Optionally require JAVA (only available in z-rejected) for a JAVA
+interface.
+\begin{verbatim}
+  optional_depends  'JAVA'                                    \
+                    '--with-java=$INSTALL_ROOT/usr/lib/jdk'   \
+                    '--without-java'                          \
+                    'for JAVA console'                        \
+                    'z-rejected'
+\end{verbatim}
+
+
+\subsection{sub\_depends}
+Not available in Sorcery 1.13.6, so overridden in libcompat to use depends and
+optional\_depends.
+
+\subsection{suggest\_depends}
+Not available in Sorcery 1.13.6, so overridden in libcompat to use
+optional\_depends.
+
+\subsection{runtime\_depends}
+Not available in Sorcery 1.13.6, so overridden in libcompat to use
+depends.
+
+\subsection{force\_depends}
+Causes a dependent spell to be recast when it might not otherwise be. This is
+intended to be called on an already enabled dependency. It can be thought of
+as an inverse of up\_trigger (although it is *not* a trigger)
+
 \section{CONFLICTS}
 This file lists other spells that conflict against the spell being installed,
 which default to 'n' when asked to dispel a currently installed spell.
@@ -896,6 +976,8 @@ Example: Set the default to 'y' when ask
 conflicts  freeglut  y
 \end{verbatim}
 
+\section{DOWNLOAD}
+
 \section{PRE\_BUILD}
 The PRE\_BUILD file is executed by cast before the BUILD file.
 
@@ -934,8 +1016,6 @@ NOCONFIGURE="X"  ./autogen.sh
 The 'NOCONFIGURE="X"' variable to autogen.sh tells autogen.sh to *not* run
 ./configure, since ./configure will be run in default\_build.
 
-\section{DOWNLOAD}
-
 \section{BUILD}
 \section{PRE\_INSTALL}
 PRE\_INSTALL is responsible for removing the old version of the spell.



More information about the SM-Commit mailing list