X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/693ba4212f01cdcc236bc94bfb2a0fbcbb6a3379..4003b7456e5fcf18c79b20568363419d9f62686b:/tools/gras/stub_generator.c diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index b602aed730..c7f4cde38f 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -9,6 +9,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" +#include "xbt/function_types.h" #include "xbt/log.h" #include "surf/surfxml_parse.h" #include "surf/surf.h" @@ -27,7 +28,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator"); #define RL_SOURCENAME_LDADD "%s_%s_LDADD" #define RL_SOURCENAME_SOURCES "%s_%s_SOURCES" #define MAKEFILE_FILENAME_AM "%s.Makefile.am" -#define MAKEFILE_FILENAME_LOCAL "%s.Makefile.local" +#define MAKEFILE_FILENAME_LOCAL "%s.mk" #define MAKEFILE_FILENAME_REMOTE "%s.Makefile.remote" #define DEPLOYMENT "%s.deploy.sh" @@ -288,7 +289,7 @@ static void generate_makefile_am(char *project, char *deployment) } fprintf(OUT, SIM_SOURCENAME, project); fprintf(OUT, ": %s\n", deployment); - fprintf(OUT, "\tstub_generator %s %s >/dev/null\n", project, deployment); + fprintf(OUT, "\tgras_stub_generator %s %s >/dev/null\n", project, deployment); fclose(OUT); } @@ -307,11 +308,17 @@ static void generate_makefile_local(char *project, char *deployment) xbt_assert1(OUT, "Unable to open %s for writing",filename); free(filename); - fprintf(OUT, "############ PROJECT COMPILING AND ARCHIVING #########\n"); - fprintf(OUT, "PROJECT_NAME=%s\n",project); - fprintf(OUT, - "DISTDIR=gras-$(PROJECT_NAME)\n\n" - "GRAS_ROOT?= $(shell echo \"\\\"<<<< GRAS_ROOT undefined !!! >>>>\\\"\")\n" +// fprintf(OUT, "############ PROJECT COMPILING AND ARCHIVING #########\n"); + fprintf(OUT,"## Variable declarations\n" + "PROJECT_NAME=%s\n" + "DISTDIR=gras-$(PROJECT_NAME)\n\n" + ,project); + + fprintf(OUT, + "# Set the GRAS_ROOT environment variable to the path under which you installed SimGrid\n" + "# Compilation will fail if you don't do so\n" + "GRAS_ROOT?= $(shell echo \"\\\"<<<< GRAS_ROOT undefined !!! >>>>\\\"\")\n\n" + "# You can fiddle the following to make it fit your taste\n" "CFLAGS = -O3 -w -g\n" "INCLUDES = -I$(GRAS_ROOT)/include\n" "LIBS_SIM = -lm -L$(GRAS_ROOT)/lib/ -lsimgrid\n" @@ -338,14 +345,26 @@ static void generate_makefile_local(char *project, char *deployment) fprintf(OUT, "\n" + "## By default, build all the binaries\n" "all: $(BIN_FILES)\n" "\n"); + + fprintf(OUT, "\n## generate temps: regenerate the source file each time the deployment file changes\n"); + xbt_dict_foreach(process_function_set,cursor,key,data) { + fprintf(OUT, RL_SOURCENAME, project,key); + fprintf(OUT, " "); + } + fprintf(OUT, SIM_SOURCENAME, project); + fprintf(OUT, ": %s\n", deployment); + fprintf(OUT, "\tgras_stub_generator %s %s >/dev/null\n", project, deployment); + + fprintf(OUT, "\n## Generate the binaries\n"); fprintf(OUT, SIM_BINARYNAME ": " SIM_OBJNAME " %s.o\n",project, project, project); fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_SIM) $(LIBS) $(LDADD) -o $@ \n"); xbt_dict_foreach(process_function_set,cursor,key,data) { fprintf(OUT, RL_BINARYNAME " : " RL_OBJNAME " %s.o\n", project, key, project, key, project); fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_RL) $(LIBS) $(LDADD) -o $@ \n"); - } + } fprintf(OUT, "\n" "%%: %%.o\n" @@ -353,16 +372,19 @@ static void generate_makefile_local(char *project, char *deployment) "\n" "%%.o: %%.c\n" "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c -o $@ $<\n" - "\n" - "DIST_FILES= $(C_FILES) "MAKEFILE_FILENAME_LOCAL" "MAKEFILE_FILENAME_REMOTE"\n" + "\n"); + + fprintf(OUT, + "## Rules for tarballs and cleaning\n" + "DIST_FILES= $(C_FILES) "MAKEFILE_FILENAME_LOCAL" " /*MAKEFILE_FILENAME_REMOTE*/"\n" "distdir: $(DIST_FILES)\n" "\trm -rf $(DISTDIR)\n" "\tmkdir -p $(DISTDIR)\n" "\tcp $^ $(DISTDIR)\n" "\n" "dist: clean distdir\n" - "\ttar c $(DISTDIR) | gzip -c > $(DISTDIR).tar.gz\n" - "\n", project, project); + "\ttar c $(DISTDIR) | gzip -c9 > $(DISTDIR).tar.gz\n" + "\n", project /*, project*/); fprintf(OUT, "clean:\n" @@ -377,7 +399,7 @@ static void generate_makefile_local(char *project, char *deployment) ".SUFFIXES:\n" ".PHONY : clean\n" "\n"); - + /* fprintf(OUT, "############ REMOTE COMPILING #########\n"); fprintf(OUT, "MACHINES ?= "); @@ -431,7 +453,7 @@ static void generate_makefile_local(char *project, char *deployment) "\t then echo \"Sucessful\"; else failed=1;echo \"Failed (check $(SRCDIR)/buildlogs/$$site.log)\"; fi;echo; \\\n" "\t fi;\\\n" "\t done;\n",project,project,project); - +*/ fclose(OUT); } @@ -560,13 +582,13 @@ int main(int argc, char *argv[]) { char *project_name = NULL; char *deployment_file = NULL; - + int i; + surf_init(&argc, argv); - xbt_assert1((argc ==3),"Usage: %s project_name deployment_file\n",argv[0]); + xbt_assert1((argc >= 3),"Usage: %s project_name deployment_file [deployment_file...]\n",argv[0]); project_name = argv[1]; - deployment_file = argv[2]; process_function_set = xbt_dict_new(); process_list = xbt_dynar_new(sizeof(s_process_t),s_process_free); @@ -575,9 +597,13 @@ int main(int argc, char *argv[]) STag_surfxml_process_fun = parse_process_init; ETag_surfxml_argument_fun = parse_argument; ETag_surfxml_process_fun = parse_process_finalize; - surf_parse_open(deployment_file); - if(surf_parse()) xbt_assert1(0,"Parse error in %s",deployment_file); - surf_parse_close(); + for(i=2; i