Veins VLC 1.0-alpha1

.cproject

@@ -97,7 +97,7 @@
 		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="MiXiM.org.omnetpp.cdt.omnetppProjectType.1295410688" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
+		<project id="veins_vlc.org.omnetpp.cdt.omnetppProjectType.1295410688" name="OMNeT++ Simulation" projectType="org.omnetpp.cdt.omnetppProjectType"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
 		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

.gitignore

@@ -18,54 +18,11 @@ examples/**/.qtenvrc
 examples/**/.cmdenv-log
 examples/**/valgrind.out
 
-subprojects/veins_catch/out
-subprojects/veins_catch/run
-subprojects/veins_catch/src/*.dll
-subprojects/veins_catch/src/*.dylib
-subprojects/veins_catch/src/*.so
-subprojects/veins_catch/src/Makefile
-subprojects/veins_catch/src/veins_catch
-subprojects/veins_catch/src/veins_catch_dbg
-
-subprojects/veins_inet3/src/Makefile
-subprojects/veins_inet3/src/*.so
-subprojects/veins_inet3/src/*.dll
-subprojects/veins_inet3/src/*.dylib
-subprojects/veins_inet3/src/**/*_m.h
-subprojects/veins_inet3/src/**/*_m.cc
-subprojects/veins_inet3/out
-subprojects/veins_inet3/run
-subprojects/veins_inet3/examples/**/results
-subprojects/veins_inet3/examples/**/.tkenvrc
-subprojects/veins_inet3/examples/**/.qtenvrc
-subprojects/veins_inet3/examples/**/.cmdenv-log
-subprojects/veins_inet3/examples/**/valgrind.out
-
-subprojects/veins_inet/src/Makefile
-subprojects/veins_inet/src/*.so
-subprojects/veins_inet/src/*.dll
-subprojects/veins_inet/src/*.dylib
-subprojects/veins_inet/src/**/*_m.h
-subprojects/veins_inet/src/**/*_m.cc
-subprojects/veins_inet/out
-subprojects/veins_inet/run
-subprojects/veins_inet/examples/**/results
-subprojects/veins_inet/examples/**/.tkenvrc
-subprojects/veins_inet/examples/**/.qtenvrc
-subprojects/veins_inet/examples/**/.cmdenv-log
-subprojects/veins_inet/examples/**/valgrind.out
-
-subprojects/veins_testsims/src/Makefile
-subprojects/veins_testsims/src/*.so
-subprojects/veins_testsims/src/*.dll
-subprojects/veins_testsims/src/*.dylib
-subprojects/veins_testsims/src/**/*_m.h
-subprojects/veins_testsims/src/**/*_m.cc
-subprojects/veins_testsims/out
-subprojects/veins_testsims/run
-subprojects/veins_testsims/sim/**/results
-subprojects/veins_testsims/sim/**/veins-runall-output
-subprojects/veins_testsims/sim/**/.tkenvrc
-subprojects/veins_testsims/sim/**/.qtenvrc
-subprojects/veins_testsims/sim/**/.cmdenv-log
-subprojects/veins_testsims/sim/**/valgrind.out
+subprojects/veins_vlc_catch/out
+subprojects/veins_vlc_catch/run
+subprojects/veins_vlc_catch/src/*.dll
+subprojects/veins_vlc_catch/src/*.dylib
+subprojects/veins_vlc_catch/src/*.so
+subprojects/veins_vlc_catch/src/Makefile
+subprojects/veins_vlc_catch/src/veins_vlc_catch
+subprojects/veins_vlc_catch/src/veins_vlc_catch_dbg

.nedfolders

@@ -1,3 +1,2 @@
-examples/veins
 examples/veins-vlc
-src/veins
+src/veins-vlc

.oppbuildspec

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <buildspec version="4.0">
     <dir path="." type="custom"/>
-    <dir makemake-options="--make-so --deep -o veins -O out -I. --meta:export-include-path --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
+    <dir makemake-options="--make-so --deep -o veins-vlc -O out -pVEINS_VLC -I. --meta:export-include-path --meta:use-exported-include-paths --meta:export-library --meta:use-exported-libs --meta:feature-cflags --meta:feature-ldflags" path="src" type="makemake"/>
 </buildspec>

.project

@@ -3,6 +3,7 @@
 	<name>veins-vlc</name>
 	<comment></comment>
 	<projects>
+		<project>veins</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

Makefile

@@ -1,4 +1,27 @@
-.PHONY: all makefiles clean cleanall doxy
+
+#
+# Copyright (C) 2013-2019 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
+#
+
+.PHONY: all makefiles clean cleanall doxy formatting formatting-strict
 
 # if out/config.py exists, we can also create command line scripts for running simulations
 ADDL_TARGETS =
@@ -71,8 +94,15 @@ out/config.py:
 
 # autogenerated documentation
 doxy:
-	doxygen doxy.cfg
+	PROJECT_VERSION=$(shell doc/version.sh) doxygen doxy.cfg
 
 doxyshow: doxy
 	xdg-open doc/doxy/index.html
 
+formatting:
+	./format-code.sh src
+	./format-code.sh subprojects
+
+formatting-strict:
+	./format-code.sh --strict src
+	./format-code.sh --strict subprojects