Diff of /trunk/wharfie/wharfie.py [r14] .. [r15]  Maximize  Restore

Switch to unified view

a/trunk/wharfie/wharfie.py b/trunk/wharfie/wharfie.py
...
...
178
    parser = argparse.ArgumentParser()
178
    parser = argparse.ArgumentParser()
179
    parser.add_argument('--clean', action='store_true', help="Clear intermediate files" )
179
    parser.add_argument('--clean', action='store_true', help="Clear intermediate files" )
180
    parser.add_argument('--info', action='store_true', help="Print info about already generated image" )
180
    parser.add_argument('--info', action='store_true', help="Print info about already generated image" )
181
    parser.add_argument('--gen-only', action='store_true', help="Generate makefile only, but don't build it" )
181
    parser.add_argument('--gen-only', action='store_true', help="Generate makefile only, but don't build it" )
182
    parser.add_argument('--dry-run', action='store_true', help="Generate makefile with disabled run actions and don't build it" )
182
    parser.add_argument('--dry-run', action='store_true', help="Generate makefile with disabled run actions and don't build it" )
183
    parser.add_argument('--verbose', action='store_true', help="Print verbose make output" )
183
    parser.add_argument('wharfile', default='Wharfile', nargs='?', help="Filename of a 'Wharfile'. By default ./Wharfile is used." )
184
    parser.add_argument('wharfile', default='Wharfile', nargs='?', help="Filename of a 'Wharfile'. By default ./Wharfile is used." )
184
    args = parser.parse_args()
185
    args = parser.parse_args()
185
186
186
    # generate makefile
187
    # generate makefile
187
    if os.path.isfile(args.wharfile):
188
    if os.path.isfile(args.wharfile):
...
...
194
        make.write_makefile('Makefile', args.dry_run, os.path.dirname(sys.argv[0]));
195
        make.write_makefile('Makefile', args.dry_run, os.path.dirname(sys.argv[0]));
195
    else:
196
    else:
196
        make.write_makefile('Makefile', args.dry_run, os.path.abspath(os.path.dirname(sys.argv[0])) + "/../share/wharfie");
197
        make.write_makefile('Makefile', args.dry_run, os.path.abspath(os.path.dirname(sys.argv[0])) + "/../share/wharfie");
197
198
198
    # call make
199
    # call make
200
    flags=""
201
    if args.verbose:
202
        flags+=" VERBOSE=y"
203
    
199
    if args.clean:
204
    if args.clean:
200
        os.system("make clean")
205
        os.system("make %s clean" % flags)
201
    elif args.info:
206
    elif args.info:
202
        os.system("make info")
207
        os.system("make %s info" % flags)
203
    elif not args.gen_only and not args.dry_run:
208
    elif not args.gen_only and not args.dry_run:
204
        os.system("make");
209
        os.system("make %s" % flags);
205
210
206
        
211
        
207
if __name__ == "__main__":
212
if __name__ == "__main__":
208
    main()
213
    main()