bump to Veins 5.1

README.md

@@ -53,7 +53,7 @@ Cookiecutter checks successful.
 Cookiecutter successful. Running git commands to set up repository.
 [...]
 From https://github.com/sommer/veins
- * tag               veins-5.0  -> FETCH_HEAD
+ * tag               veins-5.1  -> FETCH_HEAD
 Added dir 'veins'
 Repository set up successful. Running git commands to clean up.
 Cookiecutter successful.

hooks/post_gen_project.py

@@ -31,16 +31,16 @@
 
 # INET
 {%- 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 (showcases and tutorials)'])
+subprocess.check_call(['git', 'subtree', 'add', '--prefix=inet', '--message', 'Merge INET 4.2.1', 'https://github.com/inet-framework/inet', 'v4.2.1'])
+#subprocess.check_call(['git', 'rm', 'inet/.gitmodules', 'inet/showcases', 'inet/tutorials'])
+#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', 'subtree', 'add', '--prefix=inet', '--message', 'Merge INET 3.6.8', 'https://github.com/inet-framework/inet', 'v3.6.8'])
 subprocess.check_call(['git', 'rm', 'inet/.gitmodules', 'inet/showcases', 'inet/tutorials'])
 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'])
@@ -63,7 +63,7 @@
 {%- endif %}
 
 # Veins
-subprocess.check_call(['git', 'subtree', 'add', '--prefix=veins', '--message', 'Merge Veins 5.0', 'https://github.com/sommer/veins', 'veins-5.0'])
+subprocess.check_call(['git', 'subtree', 'add', '--prefix=veins', '--message', 'Merge Veins 5.1', 'https://github.com/sommer/veins', 'veins-5.1'])
 
 # Cookiecutter project
 subprocess.check_call(['git', 'add', '.'])

{{cookiecutter.project_name_as_file_name}}/setenv

@@ -0,0 +1,27 @@
+#!/bin/echo Error. Aborting. Instead of running this script, please use: source
+
+#
+# Copyright (C) 2020 Christoph Sommer <[email protected]>
+#
+# Documentation for these modules is at http://veins.car2x.org/
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+
+cd "veins" && . ./setenv; cd - > /dev/null
+cd "{{ cookiecutter.project_name_as_file_name }}" && . ./setenv; cd - > /dev/null
+

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/.gitignore

@@ -8,7 +8,7 @@ src/**/*_m.cc
 doc/doxy
 doc/neddoc
 
-/run
+/bin/{{cookiecutter.project_name_as_file_name}}_run
 
 /out
 

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/Makefile

@@ -27,7 +27,7 @@
 ADDL_TARGETS =
 ifeq ($(wildcard out/config.py),)
 else
-    ADDL_TARGETS += run
+    ADDL_TARGETS += bin/{{cookiecutter.project_name_as_file_name}}_run
 endif
 
 # default target
@@ -40,8 +40,8 @@ else
 endif
 
 # command line scripts
-run: % : src/scripts/%.in.py out/config.py
-	@echo "Creating script \"./$@\""
+bin/{{cookiecutter.project_name_as_file_name}}_run: src/scripts/{{cookiecutter.project_name_as_file_name}}_run.in.py out/config.py
+	@echo "Creating script \"$@\""
 	@sed '/# v-- contents of out\/config.py go here/r out/config.py' "$<" > "$@"
 	@chmod a+x "$@"
 
@@ -70,7 +70,7 @@ endif
 cleanall: clean
 	rm -f src/Makefile
 	rm -f out/config.py
-	rm -f run
+	rm -f bin/{{cookiecutter.project_name_as_file_name}}_run
 
 src/Makefile:
 	@echo
@@ -98,7 +98,7 @@ doxyshow: doxy
 	xdg-open doc/doxy/index.html
 
 formatting:
-	./format-code.sh src
+	bin/veins_format_code src
 
 formatting-strict:
-	./format-code.sh --strict src
+	bin/veins_format_code --strict src

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/README.md

@@ -4,8 +4,8 @@
 
 ## Supported program versions ##
 
-- Veins 5.0 (see <http://veins.car2x.org/>)
-- OMNeT++ 5.5.1 (see <https://omnetpp.org/>)
+- Veins 5.1 (see <http://veins.car2x.org/>)
+- OMNeT++ 5.6.2 (see <https://omnetpp.org/>)
 
 ## License ##
 

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/format-code.sh → {{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/bin/{{cookiecutter.project_name_as_file_name}}_format_code

@@ -84,4 +84,4 @@ else
 fi
 
 # actually format the code
-find "$@" \( -name "*.cc" -or -name "*.h" \) -exec uncrustify -q --replace --no-backup -c "$(dirname "$0")"/.uncrustify.cfg "{}" \;
+find "$@" \( -name "*.cc" -or -name "*.h" \) -exec uncrustify -q --replace --no-backup -c "$(dirname "$0")"/../.uncrustify.cfg "{}" \;

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/configure

@@ -89,7 +89,7 @@ run_imgs = [os.path.join('images')]
 # Add flags for Veins
 if options.veins:
     fname = os.path.join(options.veins, 'print-veins-version')
-    expect_version = [b'5.0']
+    expect_version = [b'5.1']
     try:
         info('Running "%s" to determine Veins version.' % fname)
         version = subprocess.check_output(['env', fname]).strip()
@@ -120,7 +120,7 @@ if options.veins:
 # Add flags for INET
 if options.inet:
     fname = os.path.join(options.inet, '_scripts/get_version')
-    expect_version = [b'4.1.0', b'4.1.1']
+    expect_version = [b'4.2.0', b'4.2.1']
     try:
         info('Running "%s" to determine INET version.' % fname)
         version = subprocess.check_output(['env', fname]).strip()
@@ -182,7 +182,7 @@ if options.veins_inet:
 # Add flags for INET (version 3)
 if options.inet3:
     fname = os.path.join(options.inet3, '_scripts/get_version')
-    expect_version = [b'3.6.6', b'3.6.7']
+    expect_version = [b'3.6.5', b'3.6.6', b'3.6.7', b'3.6.8']
     try:
         info('Running "%s" to determine INET version.' % fname)
         version = subprocess.check_output(['env', fname]).strip()

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/examples/{{cookiecutter.project_name_as_file_name}}/run

@@ -22,4 +22,4 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-exec ../../run "$@"
+exec ../../bin/{{cookiecutter.project_name_as_file_name}}_run "$@"

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/src/scripts/run.in.py → {{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/src/scripts/{{cookiecutter.project_name_as_file_name}}_run.in.py

@@ -35,7 +35,7 @@
 # ^-- contents of out/config.py go here
 
 def relpath(s):
-    veins_root = os.path.dirname(os.path.realpath(__file__))
+    veins_root = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')
     return os.path.relpath(os.path.join(veins_root, s), '.')
 
 parser = argparse.ArgumentParser('Run a {{ cookiecutter.project_name }} simulation')

{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}/src/{{cookiecutter.project_name_as_file_name}}/{{cookiecutter.project_name_as_file_name}}.h

@@ -31,8 +31,8 @@
 #define {{ cookiecutter.project_name_as_macro_name }}_VERSION_ALPHA 0
 
 // Explicitly check Veins version number
-#if !(VEINS_VERSION_MAJOR == 5 && VEINS_VERSION_MINOR >= 0)
-#error Veins version 5.0 or compatible required
+#if !(VEINS_VERSION_MAJOR == 5 && VEINS_VERSION_MINOR >= 1)
+#error Veins version 5.1 or compatible required
 #endif
 
 // {{ cookiecutter.project_name_as_macro_name }}_API macro. Allows us to use the same .h files for both building a .dll and linking against it