Merge pull request #162 from carla-simulator/build-sytem

Increase version, and some improvements to the build system

Rebuild.sh

@@ -1,6 +1,46 @@
 #!/bin/bash
+
+################################################################################
+# Updates CARLA content.
+################################################################################
+
 set -e
 
+DOC_STRING="Update CARLA content to the latest version, to be run after 'git pull'."
+
+USAGE_STRING="Usage: $0 [-h|--help] [--no-editor]"
+
+# ==============================================================================
+# -- Parse arguments -----------------------------------------------------------
+# ==============================================================================
+
+LAUNCH_UE4_EDITOR=true
+
+OPTS=`getopt -o h --long help,no-editor -n 'parse-options' -- "$@"`
+
+if [ $? != 0 ] ; then echo "$USAGE_STRING" ; exit 2 ; fi
+
+eval set -- "$OPTS"
+
+while true; do
+  case "$1" in
+    --no-editor )
+      LAUNCH_UE4_EDITOR=false;
+      shift ;;
+    -h | --help )
+      echo "$DOC_STRING"
+      echo "$USAGE_STRING"
+      exit 1
+      ;;
+    * )
+      break ;;
+  esac
+done
+
+# ==============================================================================
+# -- Set up environment --------------------------------------------------------
+# ==============================================================================
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 pushd "$SCRIPT_DIR" >/dev/null
 
@@ -60,8 +100,15 @@ set -e
 log "Build CarlaUE4 project..."
 make CarlaUE4Editor
 
-log "Launching UE4Editor..."
-${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${PWD}/CarlaUE4.uproject"
+if $LAUNCH_UE4_EDITOR ; then
+  log "Launching UE4Editor..."
+  ${UE4_ROOT}/Engine/Binaries/Linux/UE4Editor "${PWD}/CarlaUE4.uproject"
+else
+  echo ""
+  echo "****************"
+  echo "*** Success! ***"
+  echo "****************"
+fi
 
 popd >/dev/null
 

Unreal/CarlaUE4/Config/DefaultGame.ini

@@ -3,7 +3,7 @@ ProjectID=675BF8694238308FA9368292CC440350
 ProjectName=CARLA UE4
 CompanyName=CVC
 CopyrightNotice="Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma de Barcelona (UAB). This work is licensed under the terms of the MIT license. For a copy, see <https://opensource.org/licenses/MIT>."
-ProjectVersion=0.7.0
+ProjectVersion=0.7.1
 
 [/Script/UnrealEd.ProjectPackagingSettings]
 BuildConfiguration=PPBC_Development

Unreal/CarlaUE4/Plugins/Carla/Carla.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "0.7.0",
+	"VersionName": "0.7.1",
 	"FriendlyName": "CARLA",
 	"Description": "",
 	"Category": "Science",

Update.sh

@@ -1,17 +1,19 @@
 #! /bin/bash
 
 ################################################################################
-# Updates CARLA contents.
+# Updates CARLA content.
 ################################################################################
 
 set -e
 
+DOC_STRING="Update CARLA content to the latest version, to be run after 'git pull'."
+
+USAGE_STRING="Usage: $0 [-h|--help] [-s|--skip-download]"
+
 # ==============================================================================
 # -- Parse arguments -----------------------------------------------------------
 # ==============================================================================
 
-USAGE_STRING="Usage: $0 [-h|--help] [-s|--skip-download]"
-
 SKIP_DOWNLOAD=false
 
 OPTS=`getopt -o hs --long help,skip-download -n 'parse-options' -- "$@"`
@@ -26,6 +28,7 @@ while true; do
       SKIP_DOWNLOAD=true;
       shift ;;
     -h | --help )
+      echo "$DOC_STRING"
       echo "$USAGE_STRING"
       exit 1
       ;;

Util/ContentVersions.txt

@@ -7,3 +7,4 @@
 0.5.4: 0B2HFV-VuKn3PYUFFanlmZ2VMTW8
 0.6.0: 1Gw8sw01hDEV4FtpHEZZwvS-6XN0jmaLT
 0.7.0: 11PKC_lG7L80L1ZxiMlzV17utU45UcRnT
+0.7.1: 1gf3YaFIjwr1EaK6qxq2V-a510Brt9Imq