Let's not include the time of the build in the binary. The date is enough.

[synfig.git] / synfig-core / trunk / src / tool / main.cpp

diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp
index 238d23a..77281c8 100644 (file)
--- a/synfig-core/trunk/src/tool/main.cpp
+++ b/synfig-core/trunk/src/tool/main.cpp
@@ -268,9 +268,7 @@ void guid_test()
 {
        cout<<"GUID Test"<<endl;
        for(int i=20;i;i--)
-       {
                cout<<synfig::GUID().get_string()<<' '<<synfig::GUID().get_string()<<endl;
-       }
 }
 
 void signal_test_func()
@@ -334,10 +332,12 @@ void display_help(int amount)
                Argument("--start-time","<time>",_("Set the starting time"));
                Argument("--end-time","<time>",_("Set the ending time"));
                Argument("--dpi","<res>",_("Set the physical resolution (dots-per-inch)"));
-               Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch"));
+               Argument("--dpi-x","<res>",_("Set the physical X resolution (dots-per-inch)"));
                Argument("--dpi-y","<res>",_("Set the physical Y resolution (dots-per-inch)"));
+
                Argument("--list-canvases",NULL,_("List the exported canvases in the composition"));
                Argument("--append","<filename>",_("Append layers in <filename> to composition"));
+
                Argument("--layer-info","<layer>",_("Print out layer's description, parameter info, etc."));
                Argument("--layers",NULL,_("Print out the list of available layers"));
                Argument("--targets",NULL,_("Print out the list of available targets"));
@@ -387,7 +387,7 @@ int process_global_flags(arg_list_t &arg_list)
                if(*iter == "--info")
                {
                        cout<<PACKAGE"-"VERSION<<endl;
-                       cout<<"Compiled on "__DATE__ " at "__TIME__;
+                       cout<<"Compiled on "__DATE__ /* " at "__TIME__ */;
 #ifdef __GNUC__
                        cout<<" with GCC "<<__VERSION__;
 #endif
@@ -420,7 +420,8 @@ int process_global_flags(arg_list_t &arg_list)
                        Progress p(PACKAGE);
                        synfig::Main synfig_main(dirname(progname),&p);
                        iter=next++;
-                       if (iter==arg_list.end()) {
+                       if (iter==arg_list.end())
+                       {
                                error("The `%s' flag requires a value.  Use --help for a list of options.", "--layer-info");
                                return SYNFIGTOOL_MISSINGARGUMENT;
                        }
@@ -531,7 +532,8 @@ int process_global_flags(arg_list_t &arg_list)
 }
 
 /* true if the given flag takes an extra parameter */
-bool flag_requires_value(String flag) {
+bool flag_requires_value(String flag)
+{
        return (flag=="-a"                      || flag=="-c"                   || flag=="-g"                   || flag=="-h"                   || flag=="-o"           ||
                        flag=="-Q"                      || flag=="-s"                   || flag=="-t"                   || flag=="-T"                   || flag=="-w"           ||
                        flag=="--append"        || flag=="--begin-time" || flag=="--dpi"                || flag=="--dpi-x"              || flag=="--dpi-y"      ||
@@ -555,7 +557,8 @@ int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
                        cluster.push_back(*iter);
                        arg_list.erase(iter);
                        iter=next++;
-                       if (iter==arg_list.end()) {
+                       if (iter==arg_list.end())
+                       {
                                error("The `%s' flag requires a value.  Use --help for a list of options.", cluster.back().c_str());
                                return SYNFIGTOOL_MISSINGARGUMENT;
                        }
@@ -842,6 +845,16 @@ int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
        return SYNFIGTOOL_OK;
 }
 
+void list_child_canvases(string prefix, Canvas::Handle canvas)
+{
+       Canvas::Children children(canvas->children());
+       for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+       {
+               cout << prefix << ":" << (*iter)->get_id() << endl;
+               list_child_canvases(prefix + ":" + (*iter)->get_id(), *iter);
+       }
+}
+
 /* === M E T H O D S ======================================================= */
 
 /* === E N T R Y P O I N T ================================================= */
@@ -867,6 +880,7 @@ int main(int argc, char *argv[])
                cerr<<_("FATAL: Synfig Version Mismatch")<<endl;
                return SYNFIGTOOL_BADVERSION;
        }
+
        if(argc==1)
        {
                display_help(0);
@@ -942,7 +956,6 @@ int main(int argc, char *argv[])
                                        cerr<<_("Throwing out job...")<<endl;
                                        job_list.pop_front();
                                        continue;
-
                                }
                        }
                        else
@@ -1035,9 +1048,7 @@ int main(int argc, char *argv[])
                        job_list.front().target=synfig::Target::create(target_name,job_list.front().outfilename);
 
                        if(target_name=="sif")
-                       {
                                job_list.front().sifout=true;
-                       }
                        else
                        {
                                if(!job_list.front().target)
@@ -1061,9 +1072,7 @@ int main(int argc, char *argv[])
 
                        // Set the threads for the target
                        if(job_list.front().target && Target_Scanline::Handle::cast_dynamic(job_list.front().target))
-                       {
                                Target_Scanline::Handle::cast_dynamic(job_list.front().target)->set_threads(threads);
-                       }
 
                        if(imageargs.size())
                        {
@@ -1122,10 +1131,8 @@ int main(int argc, char *argv[])
                }
                else if (job_list.front().list_canvases)
                {
-                       cerr << "Listing Canvases:" << endl;
-                       Canvas::Children children(job_list.front().canvas->children());
-                       for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
-                               cout << "  " << job_list.front().filename << "#:" << (*iter)->get_id() << endl;
+                       list_child_canvases(job_list.front().filename + "#", job_list.front().canvas);
+                       cerr << endl;
                }
                else
                {
@@ -1139,9 +1146,7 @@ int main(int argc, char *argv[])
                                return SYNFIGTOOL_RENDERFAILURE;
                        }
                        if(print_benchmarks)
-                       {
                                cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
-                       }
                }
        }