Remove Qt and fast-rtps libs from repo.

Sondro · Dec 13, 2018 · 7a7f2a4 · 7a7f2a4
1 parent 4ca3f3c
commit 7a7f2a4
Show file tree

Hide file tree

Showing 5,860 changed files with 16 additions and 739,128 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ jobs:
       env:
         - JOB=lint
       script:
-        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181017_1330
+        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181026_1200
         - ./apollo_docker.sh ${JOB}
         - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
         - rm -rf "/apollo/data/core"
@@ -30,31 +30,31 @@ jobs:
       env:
         - JOB=cibuild
       script:
-        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181017_1330
+        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181026_1200
         - ./apollo_docker.sh ${JOB}
         - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
         - rm -rf "/apollo/data/core"
     - # stage: stage-02
       env:
         - JOB=cibuild_extended
       script:
-        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181017_1330
+        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181026_1200
         - ./apollo_docker.sh ${JOB}
         - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
         - rm -rf "/apollo/data/core"
     - # stage: stage-02
       env:
         - JOB=citest_basic
       script:
-        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181017_1330
+        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181026_1200
         - ./apollo_docker.sh ${JOB}
         - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
         - rm -rf "/apollo/data/core"
     - # stage: stage-02
       env:
         - JOB=citest_extended
       script:
-        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181017_1330
+        - ./docker/scripts/dev_start.sh -t dev-x86_64-20181026_1200
         - ./apollo_docker.sh ${JOB}
         - rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
         - rm -rf "/apollo/data/core"

diff --git a/WORKSPACE.in b/WORKSPACE.in
@@ -219,13 +219,13 @@ new_http_archive(
 new_local_repository(
     name = "qt",
     build_file = "third_party/qt.BUILD",
-    path = "/apollo/third_party/Qt5.5.1/5.5/gcc_64",
+    path = "/usr/local/Qt5.5.1/5.5/gcc_64",
 )
 
 new_local_repository(
     name = "fastrtps",
     build_file = "third_party/fastrtps.BUILD",
-    path = "/apollo/third_party/fast-rtps",
+    path = "/usr/local/fast-rtps",
 )
 
 # grpc

diff --git a/cyber/setup.bash b/cyber/setup.bash
@@ -5,7 +5,7 @@ recorder_path="${tool_path}/cyber_recorder"
 monitor_path="${tool_path}/cyber_monitor"
 PYTHON_LD_PATH="/apollo/bazel-bin/cyber/py_wrapper"
 launch_path="${CYBER_PATH}/tools/cyber_launch"
-qt_path=${CYBER_PATH}/../third_party/Qt5.5.1/5.5/gcc_64
+qt_path=/usr/local/Qt5.5.1/5.5/gcc_64
 
 export LD_LIBRARY_PATH=${qt_path}/lib:$LD_LIBRARY_PATH
 export QT_QPA_PLATFORM_PLUGIN_PATH=${qt_path}/plugins

diff --git a/docker/scripts/dev_start.sh b/docker/scripts/dev_start.sh
@@ -20,7 +20,7 @@ INCHINA="no"
 LOCAL_IMAGE="no"
 VERSION=""
 ARCH=$(uname -m)
-VERSION_X86_64="dev-x86_64-20181023_1600"
+VERSION_X86_64="dev-x86_64-20181026_1200"
 VERSION_AARCH64="dev-aarch64-20170927_1111"
 VERSION_OPT=""
 

diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/assistant b/third_party/Qt5.5.1/5.5/gcc_64/bin/assistant
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/designer b/third_party/Qt5.5.1/5.5/gcc_64/bin/designer
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/fixqt4headers.pl b/third_party/Qt5.5.1/5.5/gcc_64/bin/fixqt4headers.pl
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/lconvert b/third_party/Qt5.5.1/5.5/gcc_64/bin/lconvert
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/licheck64 b/third_party/Qt5.5.1/5.5/gcc_64/bin/licheck64
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/linguist b/third_party/Qt5.5.1/5.5/gcc_64/bin/linguist
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/lrelease b/third_party/Qt5.5.1/5.5/gcc_64/bin/lrelease
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/lupdate b/third_party/Qt5.5.1/5.5/gcc_64/bin/lupdate
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/moc b/third_party/Qt5.5.1/5.5/gcc_64/bin/moc
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/pixeltool b/third_party/Qt5.5.1/5.5/gcc_64/bin/pixeltool
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qcollectiongenerator b/third_party/Qt5.5.1/5.5/gcc_64/bin/qcollectiongenerator
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbus b/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbus
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbuscpp2xml b/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbuscpp2xml
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbusviewer b/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbusviewer
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbusxml2cpp b/third_party/Qt5.5.1/5.5/gcc_64/bin/qdbusxml2cpp
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qdoc b/third_party/Qt5.5.1/5.5/gcc_64/bin/qdoc
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qhelpconverter b/third_party/Qt5.5.1/5.5/gcc_64/bin/qhelpconverter
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qhelpgenerator b/third_party/Qt5.5.1/5.5/gcc_64/bin/qhelpgenerator
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qlalr b/third_party/Qt5.5.1/5.5/gcc_64/bin/qlalr
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmake b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmake
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qml b/third_party/Qt5.5.1/5.5/gcc_64/bin/qml
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmleasing b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmleasing
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlimportscanner b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlimportscanner
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmllint b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmllint
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlmin b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlmin
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlplugindump b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlplugindump
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlprofiler b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlprofiler
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlscene b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmlscene
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qmltestrunner b/third_party/Qt5.5.1/5.5/gcc_64/bin/qmltestrunner
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qt.conf b/third_party/Qt5.5.1/5.5/gcc_64/bin/qt.conf
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qtdiag b/third_party/Qt5.5.1/5.5/gcc_64/bin/qtdiag
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qtpaths b/third_party/Qt5.5.1/5.5/gcc_64/bin/qtpaths
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/qtplugininfo b/third_party/Qt5.5.1/5.5/gcc_64/bin/qtplugininfo
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/rcc b/third_party/Qt5.5.1/5.5/gcc_64/bin/rcc
diff --git a/third_party/Qt5.5.1/5.5/gcc_64/bin/sdpscanner b/third_party/Qt5.5.1/5.5/gcc_64/bin/sdpscanner