build: new builder image with updated mingw toolchain 220810

egidx · Sep 7, 2022 · 30060b1 · 30060b1
1 parent 4a81080
commit 30060b1
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/releng/docker-build.sh b/releng/docker-build.sh
@@ -6,6 +6,6 @@ OMNETPP_ROOT=$(pwd)
 docker run --network none -v "$OMNETPP_ROOT":/root/omnetpp-repo -e what -e GIT_VERSION -e BUILD_DOC \
        -e BUILD_CORE_DISTRO -e BUILD_LINUX_X86_64_DISTRO -e BUILD_LINUX_AARCH64_DISTRO \
        -e BUILD_WIN32_X86_64_DISTRO -e BUILD_MACOS_X86_64_DISTRO -e BUILD_MACOS_AARCH64_DISTRO \
-       omnetpp/distrobuild:eclipse4.22-tools220331-220331 && \
+       omnetpp/distrobuild:eclipse4.22-tools220810-220810 && \
 docker cp $(docker ps -lq):/root/omnetpp/out/dist/ releng && \
 docker rm $(docker ps -lq)
diff --git a/releng/dockerfiles/distrobuild/Dockerfile b/releng/dockerfiles/distrobuild/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Rudolf Hornig <[email protected]>"
 # during docker image builds, the 'tools' directory in the context dir should contain the Windows and macOS toolchains (i.e. ./tools/170717/...)
 SHELL ["/bin/bash", "-c"]
 ENV TOOLS_DIR /root/tools
-ENV TOOLS_VERSION 220331
+ENV TOOLS_VERSION 220810
 ENV OMNETPP_DIR /root/omnetpp
 
 # clone the directory

diff --git a/releng/dockerfiles/distrobuild/build b/releng/dockerfiles/distrobuild/build
@@ -11,5 +11,5 @@
 rm -rf omnetpp-repo
 # copy the current state of the repo to the context dir
 git clone -n ../../../.git omnetpp-repo
-docker build -t omnetpp/distrobuild:eclipse4.22-tools220331-220331 .
+docker build -t omnetpp/distrobuild:eclipse4.22-tools220810-220810 .
 rm -rf omnetpp-repo
diff --git a/ui/features/org.omnetpp.ide.omnetpp/feature.xml b/ui/features/org.omnetpp.ide.omnetpp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.omnetpp.ide.omnetpp"
       label="OMNeT++ IDE - Academic Edition, not for commercial use"
-      version="6.0.0.qualifier"
+      version="6.0.1.qualifier"
       provider-name="OpenSim Ltd."
       plugin="org.omnetpp.main"
       os="linux,macosx,win32"

diff --git a/ui/features/org.omnetpp.ide/feature.xml b/ui/features/org.omnetpp.ide/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.omnetpp.ide"
       label="OMNeT++ IDE"
-      version="6.0.0.qualifier"
+      version="6.0.1.qualifier"
       provider-name="OpenSim Ltd."
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"

diff --git a/ui/releng/org.omnetpp.ide.configuration/omnetpp-update-sites.xml b/ui/releng/org.omnetpp.ide.configuration/omnetpp-update-sites.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bookmarks>
    <site url="https://download.eclipse.org/releases/2021-12" selected="true" name="Eclipse release 2021-12"/>
-   <site url="https://pydev.org/update_sites/9.2.0" selected="true" name="PyDev"/> <!-- from: https://www.pydev.org/update_sites/ -->
+   <site url="https://pydev.org/update_sites/9.3.0" selected="true" name="PyDev"/> <!-- from: https://www.pydev.org/update_sites/ -->
    <site url="https://download.eclipse.org/tools/cdt/releases/10.5" selected="false" name="CDT SDK"/>
    <site url="https://download.eclipse.org/tools/gef/updates/legacy/releases/" selected="false" name="GEF3 Legacy SDK"/>
    <site url="https://download.eclipse.org/eclipse/updates/4.22" selected="false" name="Eclipse 4.22 SDK"/>

diff --git a/ui/releng/org.omnetpp.ide.configuration/pom.xml b/ui/releng/org.omnetpp.ide.configuration/pom.xml
@@ -11,8 +11,8 @@
     <tycho.extras.version>2.3.0</tycho.extras.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <eclipse-repo.url>https://download.eclipse.org/releases/2021-12</eclipse-repo.url>
-    <justj-repo.url>https://download.eclipse.org/justj/jres/17/updates/release/17.0.1</justj-repo.url>
-    <pydev-repo.url>https://pydev.org/update_sites/9.2.0</pydev-repo.url>
+    <justj-repo.url>https://download.eclipse.org/justj/jres/17/updates/release/17.0.4</justj-repo.url>
+    <pydev-repo.url>https://pydev.org/update_sites/9.3.0</pydev-repo.url>
     <ansiconsole-repo.url>https://www.mihai-nita.net/eclipse</ansiconsole-repo.url>
   </properties>
 

diff --git a/ui/releng/org.omnetpp.ide.omnetpp.product/omnetpp.product b/ui/releng/org.omnetpp.ide.omnetpp.product/omnetpp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="OMNeT++ IDE" uid="org.omnetpp.ide.omnetpp.product" id="org.omnetpp.main.product" application="org.eclipse.ui.ide.workbench" version="6.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="OMNeT++ IDE" uid="org.omnetpp.ide.omnetpp.product" id="org.omnetpp.main.product" application="org.eclipse.ui.ide.workbench" version="6.0.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/icons/about-image.png"/>