From: Gert D. <dri...@us...> - 2004-05-27 15:01:50
|
Update of /cvsroot/nant/nant/src/NAnt.Core/Functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16071 Modified Files: PkgConfigFunctions.cs Log Message: added get-link-flags and get-compile-flags functions renamed module to package in xml doc and function arguments Index: PkgConfigFunctions.cs =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Core/Functions/PkgConfigFunctions.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PkgConfigFunctions.cs 18 May 2004 08:53:04 -0000 1.2 --- PkgConfigFunctions.cs 27 May 2004 15:01:40 -0000 1.3 *************** *** 44,146 **** /// <summary> ! /// Gets the value of a variable for the specified module. /// </summary> ! /// <param name="module">The module for which the variable should be retrieved.</param> /// <param name="name">The name of the variable.</param> /// <returns> /// The value of variable <paramref name="name" /> for the specified ! /// module. /// </returns> [Function("get-variable")] ! public string GetVariable(string module, string name) { ! return RunPkgConfigString( new Argument[]{ new Argument("--variable=\"" + name + "\""), ! new Argument(module)}); } /// <summary> ! /// Determines the version of the given module. /// </summary> ! /// <param name="module">The module to get the version of.</param> /// <returns> ! /// The version of the given module. /// </returns> [Function("get-mod-version")] ! public string GetModVersion(string module) { return RunPkgConfigString( new Argument[]{ new Argument("--modversion"), ! new Argument(module) }); } /// <summary> ! /// Determines whether the given module is at least version /// <paramref name="version" />. /// </summary> ! /// <param name="module">The module to check.</param> ! /// <param name="version">The version the module should at least have.</param> /// <returns> ! /// <see langword="true" /> if the given module is at least version /// <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-atleast-version")] ! public bool IsAtLeastVersion(string module, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--atleast-version=\"" + version + "\""), ! new Argument(module) }); } /// <summary> ! /// Determines whether the given module is exactly version /// <paramref name="version" />. /// </summary> ! /// <param name="module">The module to check.</param> ! /// <param name="version">The version the module should have.</param> /// <returns> ! /// <see langword="true" /> if the given module is exactly version /// <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-exact-version")] ! public bool IsExactVersion(string module, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--exact-version=\"" + version + "\""), ! new Argument(module)}); } /// <summary> ! /// Determines whether the given module is at no newer than version /// <paramref name="version" />. /// </summary> ! /// <param name="module">The module to check.</param> ! /// <param name="version">The version the module should maximum have.</param> /// <returns> ! /// <see langword="true" /> if the given module is at no newer than /// version <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-max-version")] ! public bool IsMaxVersion(string module, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--max-version=\"" + version + "\""), ! new Argument(module) }); } /// <summary> ! /// Determines whether the given module is between two versions. /// </summary> ! /// <param name="module">The module to check.</param> ! /// <param name="minVersion">The version the module should at least have.</param> ! /// <param name="maxVersion">The version the module should maximum have.</param> /// <returns> ! /// <see langword="true" /> if the given module is between <paramref name="minVersion" /> /// and <paramref name="maxVersion" />; otherwise, <see langword="false" />. /// </returns> [Function("is-between-version")] ! public bool IsBetweenVersion(string module, string minVersion, string maxVersion) { return RunPkgConfigBool( new Argument[]{ new Argument("--atleast-version=\"" + minVersion + "\""), new Argument("--max-version=\"" + maxVersion + "\""), ! new Argument(module) } ); } /// <summary> ! /// Determines whether the given module exists. /// </summary> ! /// <param name="package">The module to check.</param> /// <returns> ! /// <see langword="true" /> if the module exists; otherwise, /// <see langword="false" />. /// </returns> --- 44,174 ---- /// <summary> ! /// Gets the value of a variable for the specified package. /// </summary> ! /// <param name="package">The package for which the variable should be retrieved.</param> /// <param name="name">The name of the variable.</param> /// <returns> /// The value of variable <paramref name="name" /> for the specified ! /// package. /// </returns> [Function("get-variable")] ! public string GetVariable(string package, string name) { ! return RunPkgConfigString(new Argument[] { new Argument("--variable=\"" + name + "\""), ! new Argument(package) }); } /// <summary> ! /// Gets the link flags required to compile the package, including all ! /// its dependencies. /// </summary> ! /// <param name="package">The package for which the link flags should be retrieved.</param> /// <returns> ! /// The link flags required to compile the package. ! /// </returns> ! [Function("get-link-flags")] ! public string GetLinkFlags(string package) { ! return RunPkgConfigString(new Argument[] { new Argument("--libs"), ! new Argument(package) }); ! } ! ! /// <summary> ! /// Gets the compile flags required to compile the package, including all ! /// its dependencies. ! /// </summary> ! /// <param name="package">The package for which the compile flags should be retrieved.</param> ! /// <returns> ! /// The pre-processor and compile flags required to compile the package. ! /// </returns> ! [Function("get-compile-flags")] ! public string GetCompileFlags(string package) { ! return RunPkgConfigString(new Argument[] { new Argument("--cflags"), ! new Argument(package) }); ! } ! ! /// <summary> ! /// Determines the version of the given package. ! /// </summary> ! /// <param name="package">The package to get the version of.</param> ! /// <returns> ! /// The version of the given package. /// </returns> [Function("get-mod-version")] ! public string GetModVersion(string package) { return RunPkgConfigString( new Argument[]{ new Argument("--modversion"), ! new Argument(package) }); } /// <summary> ! /// Determines whether the given package is at least version /// <paramref name="version" />. /// </summary> ! /// <param name="package">The package to check.</param> ! /// <param name="version">The version the package should at least have.</param> /// <returns> ! /// <see langword="true" /> if the given package is at least version /// <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-atleast-version")] ! public bool IsAtLeastVersion(string package, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--atleast-version=\"" + version + "\""), ! new Argument(package) }); } /// <summary> ! /// Determines whether the given package is exactly version /// <paramref name="version" />. /// </summary> ! /// <param name="package">The package to check.</param> ! /// <param name="version">The version the package should have.</param> /// <returns> ! /// <see langword="true" /> if the given package is exactly version /// <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-exact-version")] ! public bool IsExactVersion(string package, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--exact-version=\"" + version + "\""), ! new Argument(package)}); } /// <summary> ! /// Determines whether the given package is at no newer than version /// <paramref name="version" />. /// </summary> ! /// <param name="package">The package to check.</param> ! /// <param name="version">The version the package should maximum have.</param> /// <returns> ! /// <see langword="true" /> if the given package is at no newer than /// version <paramref name="version" />; otherwise, <see langword="false" />. /// </returns> [Function("is-max-version")] ! public bool IsMaxVersion(string package, string version) { return RunPkgConfigBool( new Argument[]{ new Argument("--max-version=\"" + version + "\""), ! new Argument(package) }); } /// <summary> ! /// Determines whether the given package is between two versions. /// </summary> ! /// <param name="package">The package to check.</param> ! /// <param name="minVersion">The version the package should at least have.</param> ! /// <param name="maxVersion">The version the package should maximum have.</param> /// <returns> ! /// <see langword="true" /> if the given package is between <paramref name="minVersion" /> /// and <paramref name="maxVersion" />; otherwise, <see langword="false" />. /// </returns> [Function("is-between-version")] ! public bool IsBetweenVersion(string package, string minVersion, string maxVersion) { return RunPkgConfigBool( new Argument[]{ new Argument("--atleast-version=\"" + minVersion + "\""), new Argument("--max-version=\"" + maxVersion + "\""), ! new Argument(package) } ); } /// <summary> ! /// Determines whether the given package exists. /// </summary> ! /// <param name="package">The package to check.</param> /// <returns> ! /// <see langword="true" /> if the package exists; otherwise, /// <see langword="false" />. /// </returns> *************** *** 169,174 **** return true; } catch (Exception) { ! if (execTask.ExitCode == -1) { ! // process could not be started throw; } --- 197,202 ---- return true; } catch (Exception) { ! if (execTask.ExitCode == ExternalProgramBase.UnknownExitCode) { ! // process could not be started or did not exit in time throw; } |