Update to veins-5a2, omnetpp-5.5.1, sumo-1.2.0, inet-4.1.1

sommer · Aug 18, 2019 · e9466ac · e9466ac
1 parent 8e670f0
commit e9466ac
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/files/SHA1SUMS b/files/SHA1SUMS
@@ -1,5 +1,5 @@
 a4088782173170e4ab7ce024f9f4253961c56cca  .zshrc
 da34180d8f618a6a311fe31fb08508496eb91601  debian-9.4.0-amd64-netinst.iso
-6a5bdf53786c241d617429fba465e56984a6dc55  omnetpp-5.4.1-src-linux.tgz
-56ffa3c786630e31263eb18017bce0cc217660f5  sumo-src-1.0.1.zip
+9a20bfcb8d367844e5e8d5c781127aa794292ffa  omnetpp-5.5.1-src-linux.tgz
+afd3e3c4deb2eabec2fb9ca0915f7e763d6da88a  sumo-src-1.2.0.zip
 3ee5da0011b9a8f6f6a269139e60d5208987315a  veins-background.jpg
diff --git a/instant-veins.json b/instant-veins.json
@@ -22,7 +22,7 @@
   ],
 
   "variables": {
-    "version": "5a1-i1"
+    "version": "5a2-i1"
   },
 
   "builders": [
@@ -91,13 +91,13 @@
     },
     {
       "type": "file",
-      "source": "files/omnetpp-5.4.1-src-linux.tgz",
-      "destination": "/home/veins/src/omnetpp-5.4.1-src-linux.tgz"
+      "source": "files/omnetpp-5.5.1-src-linux.tgz",
+      "destination": "/home/veins/src/omnetpp-5.5.1-src-linux.tgz"
     },
     {
       "type": "file",
-      "source": "files/sumo-src-1.0.1.zip",
-      "destination": "/home/veins/src/sumo-src-1.0.1.zip"
+      "source": "files/sumo-src-1.2.0.zip",
+      "destination": "/home/veins/src/sumo-src-1.2.0.zip"
     },
     {
       "type": "ansible-local",

diff --git a/scripts/ansible.yml b/scripts/ansible.yml
@@ -145,16 +145,16 @@
       become_user: veins
       shell: |
         set -exu
-        tar -xf omnetpp-5.4.1-src-linux.tgz
+        tar -xf omnetpp-5.5.1-src-linux.tgz
       args:
         executable: /bin/sh
         chdir: /home/veins/src
-        creates: /home/veins/src/omnetpp-5.4.1
+        creates: /home/veins/src/omnetpp-5.5.1
 
     - name: Create symlink
       become_user: veins
       file:
-        src: /home/veins/src/omnetpp-5.4.1
+        src: /home/veins/src/omnetpp-5.5.1
         dest: /home/veins/src/omnetpp
         state: link
 
@@ -194,6 +194,7 @@
         - libavcodec-dev
         - libswscale-dev
         - python-dev
+        - cmake
       become_user: root
 
     - name: Create default directories
@@ -211,16 +212,16 @@
       become_user: veins
       shell: |
         set -exu
-        unzip sumo-src-1.0.1.zip
+        unzip sumo-src-1.2.0.zip
       args:
         executable: /bin/sh
         chdir: /home/veins/src
-        creates: /home/veins/src/sumo-1.0.1
+        creates: /home/veins/src/sumo-1.2.0
 
     - name: Create symlink
       become_user: veins
       file:
-        src: /home/veins/src/sumo-1.0.1
+        src: /home/veins/src/sumo-1.2.0
         dest: /home/veins/src/sumo
         state: link
 
@@ -235,11 +236,11 @@
       shell: |
         set -exu
         source ~/.profile
-        ./configure --with-python
+        cmake ..
         make -j2
       args:
         executable: /bin/bash
-        chdir: /home/veins/src/sumo
+        chdir: /home/veins/src/sumo/build
         creates: /home/veins/src/sumo/bin/sumo
 
     #  _            _
@@ -270,7 +271,7 @@
       become_user: veins
       shell: |
         set -exu
-        git checkout -B v4.0.0-work v4.0.0
+        git checkout -B v4.1.1-work v4.1.1
         git submodule init
         git submodule update
       args:
@@ -364,7 +365,7 @@
       become_user: veins
       shell: |
         set -exu
-        git checkout -B veins-5a1-work veins-5a1
+        git checkout -B veins-5a2-work veins-5a2
       args:
         executable: /bin/bash
         chdir: /home/veins/src/veins