From bdad2af6abb19c590e167ffd46e7a84b6ce898f1 Mon Sep 17 00:00:00 2001 From: Christoph Sommer Date: Mon, 23 Nov 2020 16:01:38 +0100 Subject: [PATCH] don't include INET's tutorials and showcases --- hooks/post_gen_project.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 7151f18..9b0577b 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -33,18 +33,18 @@ {%- if cookiecutter.use_inet == "yes" %} subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet', '--message', 'Merge INET 4.1.1', 'https://github.com/inet-framework/inet', 'v4.1.1']) subprocess.check_call(['git', 'rm', 'inet/.gitmodules', 'inet/showcases', 'inet/tutorials']) -subprocess.check_call(['git', 'commit', '--message', 'inet: remove submodules']) -subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet/tutorials', '--message', 'Merge INET Tutorials 4.0.0', 'https://github.com/inet-framework/inet-tutorials', 'v4.0.0']) -subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet/showcases', '--message', 'Merge INET Showcases 4.0.0', 'https://github.com/inet-framework/inet-showcases', 'v4.0.0']) +subprocess.check_call(['git', 'commit', '--message', 'inet: remove submodules (showcases and tutorials)']) +#subprocess.check_call(['git', 'subtree', 'add', '--squash', '--prefix=inet/tutorials', '--message', 'Merge INET Tutorials 4.0.0', 'https://github.com/inet-framework/inet-tutorials', 'v4.0.0']) +#subprocess.check_call(['git', 'subtree', 'add', '--squash', '--prefix=inet/showcases', '--message', 'Merge INET Showcases 4.0.0', 'https://github.com/inet-framework/inet-showcases', 'v4.0.0']) {%- endif %} # INET (version 3) {%- if cookiecutter.use_inet3 == "yes" %} subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet', '--message', 'Merge INET 3.6.7', 'https://github.com/inet-framework/inet', 'v3.6.7']) subprocess.check_call(['git', 'rm', 'inet/.gitmodules', 'inet/showcases', 'inet/tutorials']) -subprocess.check_call(['git', 'commit', '--message', 'inet: remove submodules']) -subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet/tutorials', '--message', 'Merge INET Tutorials 3.6.4', 'https://github.com/inet-framework/inet-tutorials', 'v3.6.4']) -subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet/showcases', '--message', 'Merge INET Showcases 3.6.4', 'https://github.com/inet-framework/inet-showcases', 'v3.6.4']) +subprocess.check_call(['git', 'commit', '--message', 'inet: remove submodules (showcases and tutorials)']) +#subprocess.check_call(['git', 'subtree', 'add', '--squash', '--prefix=inet/tutorials', '--message', 'Merge INET Tutorials 3.6.4', 'https://github.com/inet-framework/inet-tutorials', 'v3.6.4']) +#subprocess.check_call(['git', 'subtree', 'add', '--squash', '--prefix=inet/showcases', '--message', 'Merge INET Showcases 3.6.4', 'https://github.com/inet-framework/inet-showcases', 'v3.6.4']) {%- endif %} # Veins VLC