From 56da01547ba7e9bb09171ee71669abb444271b5c Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 6 Jun 2005 21:34:47 +0000 Subject: [PATCH] Work around windows stupidity, leading to change printf("%%s %s", toto) to '%toto (null)' git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1355 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- tools/gras/stub_generator.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index 1446f919cf..76ec949bf7 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -67,23 +67,6 @@ const char *SIM_PREEMBULE = " return retcode;\n" \ "}\n" -#define SIM_MAIN_PREEMBULE \ -"int main (int argc,char *argv[]) {\n" \ -" int i,j;\n" \ -"\n" \ -" /* Simulation setup */\n" \ -" MSG_global_init_args(&argc,argv);\n" \ -" if (argc != 3) {\n" \ -" fprintf(stderr, \"Usage: %%s platform_file application_description.txt [--gras-log=...]\\n\",argv[0]);\n" \ -" exit(1);\n" \ -" }\n" \ -"\n" \ -" MSG_paje_output(\"%s.trace\");\n" \ -" MSG_set_channel_number(10); /* Using at most 10 channel (ports) per host. Change it here if needed */\n" \ -" MSG_create_environment(argv[1]);\n" \ -"\n" \ -" /* Application deployment */\n" - const char *SIM_MAIN_POSTEMBULE = "\n" "\n" " MSG_launch_application(argv[2]);\n" @@ -181,7 +164,23 @@ static void generate_sim(char *project) } fprintf(OUT, "\n%s\n",warning); - fprintf(OUT, SIM_MAIN_PREEMBULE, project); + fprintf(OUT, "%s", "int main (int argc,char *argv[]) {\n" + " int i,j;\n" + "\n" + " /* Simulation setup */\n" + " MSG_global_init_args(&argc,argv);\n" + " if (argc != 3) {\n" + " fprintf(stderr, \"Usage: %s platform_file application_description.txt [--gras-log=...]\\n\",argv[0]);\n" + " exit(1);\n" + " }\n" + "\n"); + fprintf(OUT, + " MSG_paje_output(\"%s.trace\");\n" + " MSG_set_channel_number(10); /* Using at most 10 channel (ports) per host. Change it here if needed */\n" + " MSG_create_environment(argv[1]);\n" + "\n" + " /* Application deployment */\n", + project); xbt_dict_foreach(process_function_set,cursor,key,data) { fprintf(OUT," MSG_function_register(\"%s\", launch_%s);\n",key,key); } -- 2.20.1