diff options
Diffstat (limited to 'simulations')
| -rw-r--r-- | simulations/.gitignore | 1 | ||||
| -rw-r--r-- | simulations/Makefile | 4 | ||||
| -rwxr-xr-x | simulations/libs/setup.sh | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/simulations/.gitignore b/simulations/.gitignore index a5fd42a..89d1606 100644 --- a/simulations/.gitignore +++ b/simulations/.gitignore @@ -1,6 +1,7 @@ simulator libs/simgrid libs/rapidjson +libs/*.tar* compile_commands.json platform.xml scenarios diff --git a/simulations/Makefile b/simulations/Makefile index 3ed792d..8702e66 100644 --- a/simulations/Makefile +++ b/simulations/Makefile @@ -7,7 +7,7 @@ CC := g++ $(addprefix -L , $(LIBS)) $(addprefix -I , $(INCLUDES)) all: $(EXEC) $(basename $(notdir $(SCENARIOS))) $(EXEC): $(filter-out $(SCENARIOS), $(wildcard src/*)) - $(CC) -lsimgrid $^ -o $@ + $(CC) $^ -lsimgrid -o $@ $(basename $(notdir $(SCENARIOS))): $(SCENARIOS) $(CC) $^ -o $@ @@ -16,4 +16,4 @@ run: $(EXEC) export LD_LIBRARY_PATH=$(addprefix :, $(LIBS)) && ./$(EXEC) 10 --cfg=network/bandwidth-factor:1.05 --cfg=network/model:CM02 -–cfg=network/crosstraffic:0 clean: - -rm $(EXEC) $(basename $(notdir $(SCENARIOS)))
\ No newline at end of file + -rm $(EXEC) $(basename $(notdir $(SCENARIOS))) diff --git a/simulations/libs/setup.sh b/simulations/libs/setup.sh index 395a11e..14705f6 100755 --- a/simulations/libs/setup.sh +++ b/simulations/libs/setup.sh @@ -2,8 +2,10 @@ set -e -[ ! -e "simgrid" ] && git clone https://framagit.org/simgrid/simgrid -[ ! -e "rapidjson"] && git clone https://github.com/Tencent/rapidjson +[ ! -e "simgrid-v3.35.tar.bz2" ] && wget "https://framagit.org/simgrid/simgrid/-/archive/v3.35/simgrid-v3.35.tar.bz2?ref_type=tags" -O "simgrid-v3.35.tar.bz2" +[ ! -e "simgrid" ] && tar -xf "simgrid-v3.35.tar.bz2" && mv "simgrid-v3.35" simgrid + +[ ! -e "rapidjson" ] && git clone --depth 1 https://github.com/Tencent/rapidjson cd simgrid mkdir -p build |