Friction

.appveyor.yml

@@ -20,6 +20,7 @@ environment:
           ver: 2019
           generator: "Visual Studio 16 2019"
           configuration: Release
+          cmake_opts: "-DENABLE_JAVA_BINDINGS=0"
           PYTHON: C:\Python37-x64
         - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
           ver: 2019
@@ -33,15 +34,15 @@ environment:
           PYTHON: C:\Python37-x64
 
 install:
-    - git clone --recurse-submodules https://github.com/DLR-TS/SUMOLibraries
+    - git clone --depth 1 https://github.com/DLR-TS/SUMOLibraries
     - set SUMO_LIBRARIES=%CD%\SUMOLibraries
     - "%PYTHON%\\python.exe -m pip install wheel"
 
 build_script:
     - cd %APPVEYOR_BUILD_FOLDER%
     - mkdir build_msvc%ver% &&
       cd build_msvc%ver% &&
-      cmake .. -G"%generator%" -A x64 -DPYTHON_EXECUTABLE=%PYTHON%\python.exe &&
+      cmake .. -G"%generator%" -A x64 -DPYTHON_EXECUTABLE=%PYTHON%\python.exe %cmake_opts% &&
       cmake --build . --config %configuration% && cd .. &&
       %PYTHON%\python.exe tools\build\setup-libsumo.py bdist_wheel
 

.github/workflows/build-linux.yml

@@ -87,6 +87,12 @@ jobs:
         cd sumo/cmake-build
         make CTEST_OUTPUT_ON_FAILURE=1 examples test
 
+    - name: Extra tests
+      if: matrix.build_type == 'full' && github.repository == 'DLR-TS/sumo'
+      run: |
+        sumo/tests/runTests.sh -b ci -a sumo.meso.ci
+        sumo/tests/runTests.sh -b ci -a netconvert.gdal.ci,polyconvert.gdal.ci
+
     - name: Uploading artifacts (SUMO binaries)
       uses: actions/upload-artifact@v1
       with:

.github/workflows/build-windows.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-type: [plain, extra]
+        build_type: [plain, extra]
     env:
       CC: cl
       CXX: cl
@@ -47,17 +47,17 @@ jobs:
       uses: actions/cache@v2
       with:
         path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
-        key: ${{ matrix.build-type }}-${{ github.head_ref }}-${{ github.run_number }}
+        key: ${{ matrix.build_type }}-${{ github.head_ref }}-${{ github.run_number }}
         restore-keys: |
-          ${{ matrix.build-type }}-${{ github.head_ref }}-
-          ${{ matrix.build-type }}-
+          ${{ matrix.build_type }}-${{ github.head_ref }}-
+          ${{ matrix.build_type }}-
 
     # required for CMake to find Ninja
     - name: "Set up MSVC Developer Command Prompt"
       uses: seanmiddleditch/gha-setup-vsdevenv@v3
 
     - name: Configuring SUMO plain build
-      if: matrix.build-type == 'plain'
+      if: matrix.build_type == 'plain'
       run: |
         python -m pip install wheel
         cd sumo
@@ -66,13 +66,13 @@ jobs:
         cmake .. -GNinja -DCHECK_OPTIONAL_LIBS=false
 
     - name: Building SUMO plain
-      if: matrix.build-type == 'plain'
+      if: matrix.build_type == 'plain'
       run: |
         cd sumo
         cmake --build build_msvc --config Release
 
     - name: Building SUMO extra
-      if: matrix.build-type == 'extra'
+      if: matrix.build_type == 'extra'
       run: |
         cd sumo
         mkdir build_msvc
@@ -88,12 +88,12 @@ jobs:
     - name: Uploading artifacts (SUMO binaries)
       uses: actions/upload-artifact@v2
       with:
-        name: Windows-${{ matrix.build-type }}
+        name: Windows-${{ matrix.build_type }}
         path: sumo/bin
         retention-days: 30
 
     - name: Plain examples and tests
-      if: matrix.build-type == 'plain'
+      if: matrix.build_type == 'plain'
       run: |
         cd sumo/build_msvc
         $env:TEXTTEST_TMP = "D:/texttest"
@@ -103,14 +103,16 @@ jobs:
         ctest -R texttest --verbose
 
     - name: Examples and extra tests
-      if: matrix.build-type == 'extra' && github.repository == 'DLR-TS/sumo'
+      if: matrix.build_type == 'extra' && github.repository == 'DLR-TS/sumo'
       run: |
         python -m pip install -r sumo/tools/requirements.txt
         cd sumo/build_msvc
         cmake --build . --config Release --target examples
         $env:TEXTTEST_TMP = "D:/texttest"
         $env:TEXTTEST_CI_APPS = "-a complex,tools,traci"
         ctest --build-config Release --verbose
+        $env:TEXTTEST_CI_APPS = "-a sumo.meso,netconvert.gdal,polyconvert.gdal"
+        ctest --build-config Release --verbose
 
     - name: Compressing test results
       if: always() && github.repository == 'DLR-TS/sumo'
@@ -123,6 +125,6 @@ jobs:
       if: always() && github.repository == 'DLR-TS/sumo'
       uses: actions/upload-artifact@v2
       with:
-        name: texttesttmp-${{ matrix.build-type }}
+        name: texttesttmp-${{ matrix.build_type }}
         path: D:/texttest/tt.zip
         if-no-files-found: warn

.github/workflows/wheel-windows.yml

@@ -20,10 +20,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build-type: [libsumo]
+        build_type: [libsumo]
         python: [3.7, 3.8, 3.9, '3.10']
         include:
-          - build-type: sumo
+          - build_type: sumo
             python: 3.8
     env:
       CC: cl
@@ -57,17 +57,17 @@ jobs:
       uses: actions/cache@v2
       with:
         path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
-        key: ${{ matrix.build-type }}-${{ matrix.python }}-${{ github.head_ref }}-${{ github.run_number }}
+        key: ${{ matrix.build_type }}-${{ matrix.python }}-${{ github.head_ref }}-${{ github.run_number }}
         restore-keys: |
-          ${{ matrix.build-type }}-${{ matrix.python }}-${{ github.head_ref }}-
-          ${{ matrix.build-type }}-${{ matrix.python }}-
+          ${{ matrix.build_type }}-${{ matrix.python }}-${{ github.head_ref }}-
+          ${{ matrix.build_type }}-${{ matrix.python }}-
 
     # required for CMake to find Ninja
     - name: "Set up MSVC Developer Command Prompt"
       uses: seanmiddleditch/gha-setup-vsdevenv@v3
 
     - name: Configuring SUMO plain build
-      if: matrix.build-type == 'libsumo'
+      if: matrix.build_type == 'libsumo'
       run: |
         python -m pip install wheel
         cd sumo
@@ -76,15 +76,16 @@ jobs:
         cmake .. -GNinja -DCHECK_OPTIONAL_LIBS=false
 
     - name: Building libsumo plain
-      if: matrix.build-type == 'libsumo'
+      if: matrix.build_type == 'libsumo'
       run: |
         cd sumo
         cmake --build build_msvc --config Release --target libsumo libtraci
+        xcopy /s data .\tools\libsumo\data\
         python tools\build\setup-libsumo.py bdist_wheel --plat-name win_amd64
         python tools\build\setup-libtraci.py bdist_wheel --plat-name win_amd64
 
     - name: Building SUMO Wheels
-      if: matrix.build-type == 'sumo'
+      if: matrix.build_type == 'sumo'
       run: |
         python -m pip install wheel scikit-build
         cd sumo
@@ -96,11 +97,11 @@ jobs:
     - name: Uploading artifacts
       uses: actions/upload-artifact@v1
       with:
-        name: Py3-${{ matrix.build-type }}-wheels
+        name: Py3-${{ matrix.build_type }}-wheels
         path: sumo/dist
 
     - name: Plain libsumo tests
-      if: matrix.build-type == 'libsumo'
+      if: matrix.build_type == 'libsumo'
       run: |
         $env:PATH += ";$pwd\sumo\bin"
         $env:TEXTTEST_TMP = "D:/texttest"
@@ -113,7 +114,7 @@ jobs:
       if: always()
       uses: actions/upload-artifact@v2
       with:
-        name: texttesttmp-${{ matrix.build-type }}-${{ matrix.python }}
+        name: texttesttmp-${{ matrix.build_type }}-${{ matrix.python }}
         path: D:/texttest
         if-no-files-found: warn
 

.gitignore

@@ -18,6 +18,7 @@
 /cmake_build*
 /build/cmake-build*
 /build/cmake_build*
+/build/CMAKE*
 /build/cmake-codeblocks*
 /build/cmake-clang*
 /build/cmake-mingw*

CMakeLists.txt

@@ -331,7 +331,7 @@ if (CHECK_OPTIONAL_LIBS)
     file(GLOB OSG_PATH "${SUMO_LIBRARIES}/OSG-?.?.?")
     file(GLOB GL2PS_PATH "${SUMO_LIBRARIES}${LIB_VERSION}/gl2ps-?.?.?")
     set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH};${GDAL_PATH};${FFMPEG_PATH};${OSG_PATH};${GL2PS_PATH}")
-    file(GLOB SUMO_OPTIONAL_LIBRARIES_DLL "${GDAL_PATH}/bin/*.dll" "${FFMPEG_PATH}/bin/*.dll" "${GL2PS_PATH}/bin/*.dll")
+    file(GLOB SUMO_OPTIONAL_LIBRARIES_DLL "${GDAL_PATH}/bin/*.dll" "${FFMPEG_PATH}/bin/*.dll" "${OSG_PATH}/bin/*.dll" "${GL2PS_PATH}/bin/*.dll")
 
     # GDAL (for geopositioning)
     find_package(GDAL)
@@ -486,12 +486,14 @@ if (SUMO_LIBRARIES AND WIN32)
     endforeach(DLL_PATH)
     # copy OSG dlls
     if (HAVE_OSG)
-        file(GLOB OSG_DLL "${OSG_PATH}/bin/*osg.dll")
-        get_filename_component(OSG_DLL_BASENAME ${OSG_DLL} NAME)
-        set(OSG_TARGET ${CMAKE_SOURCE_DIR}/bin/${OSG_DLL_BASENAME})
+        file(GLOB OSG_PLUGIN_DLL "${OSG_PATH}/bin/osgPlugins*/osgdb_osg.dll")
+        get_filename_component(OSG_PLUGIN_DLL_BASENAME ${OSG_PLUGIN_DLL} NAME)
+        get_filename_component(OSG_PLUGIN_DIR ${OSG_PLUGIN_DLL} DIRECTORY)
+        get_filename_component(OSG_PLUGIN_DIR ${OSG_PLUGIN_DIR} NAME)
+        set(OSG_TARGET ${CMAKE_SOURCE_DIR}/bin/${OSG_PLUGIN_DIR}/${OSG_PLUGIN_DLL_BASENAME})
         add_custom_command(OUTPUT ${OSG_TARGET}
-                           COMMAND ${CMAKE_COMMAND} -E copy_directory ${OSG_PATH}/bin ${CMAKE_SOURCE_DIR}/bin
-                           DEPENDS ${OSG_DLL})
+                           COMMAND ${CMAKE_COMMAND} -E copy_directory ${OSG_PATH}/bin/${OSG_PLUGIN_DIR} ${CMAKE_SOURCE_DIR}/bin/${OSG_PLUGIN_DIR}
+                           DEPENDS ${OSG_PLUGIN_DLL})
     endif (HAVE_OSG)
     # proj 7 needs to copy "share/proj" folder in SUMO_HOME/share
     set(PROJ_DATA ${CMAKE_SOURCE_DIR}/share/proj/proj.db)

build/debian/changelog

@@ -1,10 +1,16 @@
+sumo (1.13.0-1) focal; urgency=medium
+
+  * new upstream version
+
+ -- Michael Behrisch <oss@behrisch.de>  Tue, 03 May 2022 09:01:33 +0200
+
 sumo (1.12.0-6) focal; urgency=medium
 
   * added missing executables, headers and libs
 
  -- Michael Behrisch <oss@behrisch.de>  Thu, 10 Feb 2022 11:14:50 +0100
 
-sumo (1.12.0) focal; urgency=medium
+sumo (1.12.0-1) focal; urgency=medium
 
   * new upstream version
 

build/package/sumo.metainfo.xml

@@ -40,6 +40,8 @@
     </screenshots>
     <content_rating type="oars-1.1"/>
     <releases>
+        <release version="v1_13_0" date="2022-05-03"/>
+        <release version="v1_12_0" date="2022-01-25"/>
         <release version="v1_11_0" date="2021-11-22"/>
     </releases>
 </component>

cmake-variants.yaml

@@ -1,5 +1,5 @@
 buildType:
-  default: debug
+  default: release
   description: Switch between debug and release build type
   choices:
     debug:
@@ -8,28 +8,29 @@ buildType:
       buildType: Debug
       settings:
         CMAKE_BUILD_TYPE: Debug
+    minimal:
+      short: Minimal
+      long: Minimal build without optional libs / GUI
+      buildType: Release
+      settings:
+        CMAKE_BUILD_TYPE: Release
+        CHECK_OPTIONAL_LIBS: no
+        FOX_CONFIG: ''
+        BINARY_SUFFIX: M
+    profiling:
+      short: Profiling
+      long: Profiling
+      buildType: RelWithDebInfo
+      settings:
+        CMAKE_BUILD_TYPE: RelWithDebInfo
+        PROFILING: yes
     release:
       short: Release
       long: Release
       buildType: Release
       settings:
         CMAKE_BUILD_TYPE: Release
 
-useFMI:
-  default: 'no'
-  description: Enable building of FMUs for SUMO
-  choices:
-    'yes':
-      short: FMI
-      long: FMI
-      settings:
-        FMI: 'yes'
-    'no':
-      short: 'noFMI'
-      long: 'noFMI'
-      settings:
-        FMI: 'no'
-
 pythonBindings:
   default: 'default'
   description: Enable Python bindings?

data/xsd/additional_file.xsd

@@ -117,6 +117,7 @@
         <xsd:attribute name="id" type="detectorIdType" use="required"/>
         <xsd:attribute name="lane" type="xsd:string" use="required"/>
         <xsd:attribute name="pos" type="xsd:float" use="required"/>
+        <xsd:attribute name="length" type="nonNegativeFloatType" use="optional"/>
         <xsd:attribute name="freq" type="positiveFloatType" use="required"/>
         <xsd:attribute name="file" type="xsd:string" use="required"/>
         <xsd:attribute name="vTypes" type="xsd:string" use="optional"/>
@@ -418,7 +419,7 @@
         <xsd:attribute name="lines" type="xsd:string" use="optional"/>
         <xsd:attribute name="power" type="xsd:float" use="optional"/>
         <xsd:attribute name="efficiency" type="xsd:float" use="optional"/>
-        <xsd:attribute name="chargeInTransit" type="xsd:float" use="optional"/>
+        <xsd:attribute name="chargeInTransit" type="boolType" use="optional"/>
         <xsd:attribute name="chargeDelay" type="xsd:float" use="optional"/>
     </xsd:complexType>
 
@@ -441,6 +442,7 @@
         <xsd:attribute name="id" type="idType" use="required"/>
         <xsd:attribute name="voltage" type="xsd:float" use="optional"/>
         <xsd:attribute name="currentLimit" type="xsd:float" use="optional"/>
+        <xsd:attribute name="pos" type="xsd:string" use="optional"/>
     </xsd:complexType>
 
     <xsd:complexType name="overheadWireClampType">

data/xsd/datamode_file.xsd

@@ -25,22 +25,22 @@
     <xsd:complexType name="edgeDataType">
         <xsd:attribute name="id" type="xsd:string" use="required"/>
         <xsd:attribute name="count" type="xsd:float" use="optional"/>
-        <xsd:anyAttribute/>
+        <xsd:anyAttribute processContents="lax"/>
     </xsd:complexType>
 
     <xsd:complexType name="edgeRelationType">
         <xsd:attribute name="from" type="xsd:string" use="required"/>
         <xsd:attribute name="to" type="xsd:string" use="required"/>
         <xsd:attribute name="count" type="xsd:float" use="optional"/>
         <xsd:attribute name="probability" type="xsd:float" use="optional"/>
-        <xsd:anyAttribute/>
+        <xsd:anyAttribute processContents="lax"/>
     </xsd:complexType>
 
     <xsd:complexType name="tazRelationType">
         <xsd:attribute name="from" type="xsd:string" use="required"/>
         <xsd:attribute name="to" type="xsd:string" use="required"/>
         <xsd:attribute name="count" type="xsd:float" use="optional"/>
-        <xsd:anyAttribute/>
+        <xsd:anyAttribute processContents="lax"/>
     </xsd:complexType>
 
 </xsd:schema>