Author: sandervanderburg
Date: Sun Nov 21 17:56:18 2010
New Revision: 24796
URL: https://svn.nixos.org/websvn/nix/?rev=24796&sc=1
Log:
- Show usage uses argv[0] instead of a hardcoded executable name
- Implemented --no-out-link in dydisnix-gendist
Modified:
disnix/dydisnix/trunk/scripts/dydisnix-gendist.in
disnix/dydisnix/trunk/src/divide/main.c
disnix/dydisnix/trunk/src/filter-buildable/main.c
Modified: disnix/dydisnix/trunk/scripts/dydisnix-gendist.in
==============================================================================
--- disnix/dydisnix/trunk/scripts/dydisnix-gendist.in Sun Nov 21 17:45:24
2010 (r24795)
+++ disnix/dydisnix/trunk/scripts/dydisnix-gendist.in Sun Nov 21 17:56:18
2010 (r24796)
@@ -12,6 +12,7 @@
echo "-q,--qos Quality of service Nix expression which
describes how to devide services onto targets based on quality of service
attributes"
echo "--filter-buildable Checks for each combination whether the service
can be built (may take some time)"
echo "--xml Output XML version of the distribution instead
of a Nix expression"
+ echo "--no-out-link Do not create a 'result' symlink"
echo "--show-trace Shows a trace of the output"
echo "-h,--help Shows the usage of this command"
}
@@ -26,7 +27,7 @@
# Parse valid argument options
-PARAMS=`getopt -n $0 -o s:i:q:h -l
services:,infrastructure:,qos:,filter-buildable,xml,show-trace,help -- "$@"`
+PARAMS=`getopt -n $0 -o s:i:q:h -l
services:,infrastructure:,qos:,filter-buildable,xml,no-out-link,show-trace,help
-- "$@"`
if [ $? != 0 ]
then
@@ -57,6 +58,9 @@
--xml)
exprArg="--arg outputExpr false"
;;
+ --no-out-link)
+ noOutLink=1
+ ;;
--show-trace)
showTrace=1
;;
@@ -73,6 +77,7 @@
checkServicesFile
checkInfrastructureFile
+checkNoOutLink
checkShowTrace
checkTmpDir
@@ -92,6 +97,7 @@
$initialDistributionArg \
$qosArg \
$exprArg \
+ $noOutLinkArg \
$showTraceArg \
"$(readlink -f @datadir@/@PACKAGE@/gendist.nix)"
Modified: disnix/dydisnix/trunk/src/divide/main.c
==============================================================================
--- disnix/dydisnix/trunk/src/divide/main.c Sun Nov 21 17:45:24 2010
(r24795)
+++ disnix/dydisnix/trunk/src/divide/main.c Sun Nov 21 17:56:18 2010
(r24796)
@@ -4,11 +4,11 @@
#define _GNU_SOURCE
#include <string.h>
-static void print_usage()
+static void print_usage(char *command)
{
fprintf(stderr, "Usage:\n");
- fprintf(stderr, "dydisnix-divide --strategy strategy --services-xml
services.xml --infrastructure-xml infrastructure.xml --distribution-xml
distribution.xml --service-property serviceProperty --target-property
targetProperty\n");
- fprintf(stderr, "dydisnix-divide {-h | --help}\n");
+ fprintf(stderr, "%s --strategy strategy --services-xml services.xml
--infrastructure-xml infrastructure.xml --distribution-xml distribution.xml
--service-property serviceProperty --target-property targetProperty\n",
command);
+ fprintf(stderr, "%s {-h | --help}\n", command);
}
int main(int argc, char *argv[])
@@ -60,7 +60,7 @@
target_property = optarg;
break;
case 'h':
- print_usage();
+ print_usage(argv[0]);
return 0;
}
}
Modified: disnix/dydisnix/trunk/src/filter-buildable/main.c
==============================================================================
--- disnix/dydisnix/trunk/src/filter-buildable/main.c Sun Nov 21 17:45:24
2010 (r24795)
+++ disnix/dydisnix/trunk/src/filter-buildable/main.c Sun Nov 21 17:56:18
2010 (r24796)
@@ -3,11 +3,11 @@
#include <getopt.h>
#define _GNU_SOURCE
-static void print_usage()
+static void print_usage(char *command)
{
fprintf(stderr, "Usage:\n");
- fprintf(stderr, "dydisnix-filter-buildable --services services.nix
--infrastructure infrastructure.nix --distribution distribution.nix
--distribution-xml distribution.xml\n");
- fprintf(stderr, "dydisnix-filter-buildable {-h | --help}\n");
+ fprintf(stderr, "%s --services services.nix --infrastructure
infrastructure.nix --distribution distribution.nix --distribution-xml
distribution.xml\n", command);
+ fprintf(stderr, "%s {-h | --help}\n", command);
}
int main(int argc, char *argv[])
@@ -46,7 +46,7 @@
distribution_xml = optarg;
break;
case 'h':
- print_usage();
+ print_usage(argv[0]);
return 0;
}
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
