Gitlab Update from 13.1.4 to 13.2.2 runs on 2020-08-03

Commit 9b04f1d0 authored by Henning Puttnies's avatar Henning Puttnies

Portability improvements

- Reworked readme
- Updated build and include paths 
parent be0b340a
......@@ -24,25 +24,13 @@
<tool id="cdt.managedbuild.tool.gnu.archiver.base.516168595" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.494155886" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
<option id="gnu.cpp.compiler.option.include.paths.1645209324" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\include\omnetpp&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\util&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\hardwareclock&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.141072468" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.203245933" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
<option id="gnu.c.compiler.option.include.paths.244292071" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\include\omnetpp&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\util&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\hardwareclock&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.108202265" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
......@@ -55,14 +43,7 @@
</tool>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.382875790" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
<option id="gnu.both.asm.option.include.paths.249465872" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\transportlayer\contract\udp&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\include\omnetpp&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\util&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\git\IEEE8021AS\src\hardwareclock&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.604053120" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
......@@ -105,6 +86,7 @@
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1186846763" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
......@@ -116,6 +98,7 @@
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1997833153" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
......@@ -134,6 +117,7 @@
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\common&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\omnetpp-5.2\samples\inet\src\inet\linklayer\ethernet&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/inet/src}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1862632406" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool>
......
......@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-472779307619174126" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1299638576911073154" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......@@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-445083379622863576" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1299638576911073154" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
......
eclipse.preferences.version=1
environment/project/org.omnetpp.cdt.gnu.config.debug.2084392799/PATH/delimiter=;
environment/project/org.omnetpp.cdt.gnu.config.debug.2084392799/PATH/operation=replace
environment/project/org.omnetpp.cdt.gnu.config.debug.2084392799/PATH/value=C\:\\omnetpp-5.2\\bin;C\:\\omnetpp-5.2\\tools\\win64\\mingw64\\bin;C\:\\omnetpp-5.2\\tools\\win64\\usr\\bin;C\:/omnetpp-5.2/ide/jre/bin/server;C\:/omnetpp-5.2/ide/jre/bin;C\:/omnetpp-5.2/ide/jre/lib/amd64;.;C\:\\omnetpp-5.2\\tools\\win64\\usr\\local\\bin;C\:\\Windows\\System32;C\:\\Windows;C\:\\Windows\\System32\\Wbem;C\:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C\:\\omnetpp-5.2\\tools\\win64\\usr\\bin\\site_perl;C\:\\omnetpp-5.2\\tools\\win64\\usr\\bin\\vendor_perl;C\:\\omnetpp-5.2\\tools\\win64\\usr\\bin\\core_perl;C\:\\omnetpp-5.2;C\:\\omnetpp-5.2\\samples\\inet\\src
environment/project/org.omnetpp.cdt.gnu.config.debug.2084392799/append=true
environment/project/org.omnetpp.cdt.gnu.config.debug.2084392799/appendContributed=true
OMNeT++ Simulation Model of the General Precision Time Protocol (gPTP)
===============================================================
This model of the General Precision Time Protocol (gPTP), well known by IEEE 802.1AS standard was implemented by Enkhtuvshin Janchivnyambuu, Henning Puttnies, and Peter Danielis at the University of Rostock in March 2018.
Requirements
------------------------
- OMNeT++ 5.2
- INET inet-3.6.3
Implemented by Enkhtuvshin Janchivnyambuu, Henning Puttnies and Peter Danielis, University of Rostock
General Precision Time Protocol (gPTP), well known by IEEE 802.1AS standard, module for OMNeT++ 5.2 and INET inet-3.6.3
March, 2018.
\ No newline at end of file
/IEEE8021AS_dbg.exe
......@@ -2,7 +2,7 @@
# OMNeT++/OMNEST Makefile for IEEE8021AS
#
# This file was generated with the command:
# opp_makemake -f --deep -KINET_PROJ=C:/omnetpp-5.2/samples/inet -DINET_IMPORT -IC:/omnetpp-5.2/include/omnetpp -IC:/omnetpp-5.2/git/IEEE8021AS/src/util -IC:/omnetpp-5.2/git/IEEE8021AS/src/hardwareclock -I$$\(INET_PROJ\)/src -I$$\(INET_PROJ\)/src/inet/common -I$$\(INET_PROJ\)/src/inet/linklayer/ethernet -L$$\(INET_PROJ\)/src -lINET$$\(D\)
# opp_makemake -f --deep -KINET_PROJ=G:/Promotionszeit/Dissertation/WorkspaceOmnet5_2/inet -DINET_IMPORT -I$$\(INET_PROJ\)/src -L$$\(INET_PROJ\)/src -lINET$$\(D\)
#
# Name of target to be created (-o option)
......@@ -16,13 +16,7 @@ USERIF_LIBS = $(ALL_ENV_LIBS) # that is, $(TKENV_LIBS) $(QTENV_LIBS) $(CMDENV_LI
#USERIF_LIBS = $(QTENV_LIBS)
# C++ include paths (with -I)
INCLUDE_PATH = \
-IC:/omnetpp-5.2/include/omnetpp \
-IC:/omnetpp-5.2/git/IEEE8021AS/src/util \
-IC:/omnetpp-5.2/git/IEEE8021AS/src/hardwareclock \
-I$(INET_PROJ)/src \
-I$(INET_PROJ)/src/inet/common \
-I$(INET_PROJ)/src/inet/linklayer/ethernet
INCLUDE_PATH = -I$(INET_PROJ)/src
# Additional object and library files to link with
EXTRA_OBJS =
......@@ -46,7 +40,7 @@ MSGFILES = \
SMFILES =
# Other makefile variables (-K)
INET_PROJ=C:/omnetpp-5.2/samples/inet
INET_PROJ=G:/Promotionszeit/Dissertation/WorkspaceOmnet5_2/inet
#------------------------------------------------------------------------------
......
......@@ -6,7 +6,7 @@
//
cplusplus {{
#include "simtime.h"
#include "omnetpp/simtime.h"
#include "gPtp.h"
#include "omnetpp.h"
}};
......
......@@ -19,7 +19,7 @@
// cplusplus {{
#include "simtime.h"
#include "omnetpp/simtime.h"
#include "gPtp.h"
#include "omnetpp.h"
// }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment