From 9bab626cbf3c3740bddfe90c839ccb1286d2842e Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Fri, 8 Jun 2018 11:03:34 -0700 Subject: [PATCH] Removed biicode from repo. Change-Id: I8b517fb8eaf02772052d95ca55bdaa0efbffa65a --- .travis.yml | 10 +++------- biicode.conf | 7 ------- biicode/README.md | 21 --------------------- biicode/cmake/biicode.cmake | 18 ------------------ biicode/support/bii-travis.sh | 30 ------------------------------ 5 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 biicode.conf delete mode 100644 biicode/README.md delete mode 100644 biicode/cmake/biicode.cmake delete mode 100755 biicode/support/bii-travis.sh diff --git a/.travis.yml b/.travis.yml index 6cc6b033c..6336f2b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,8 @@ matrix: env: matrix: - - BUILD_TYPE=Debug BIICODE=false - - BUILD_TYPE=Release BIICODE=false CONAN=true - # biicode .deb files no longer available. - # - BUILD_TYPE=Release BIICODE=true - # - BUILD_TYPE=Debug BIICODE=true + - BUILD_TYPE=Debug + - BUILD_TYPE=Release CONAN=true before_install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi @@ -54,8 +51,7 @@ matrix: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s -v -f $(which gcc-$GCC_VERSION) /usr/bin/gcc; fi script: - - if [ "$BIICODE" == "false" ]; then cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test; fi - - if [ "$BIICODE" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then ./biicode/support/bii-travis.sh $BUILD_TYPE; fi + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE . && make && make test - if [ "$CONAN" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo pip install conan && conan create . flatbuffers/testing -s build_type=$BUILD_TYPE; fi - language: android diff --git a/biicode.conf b/biicode.conf deleted file mode 100644 index b205168be..000000000 --- a/biicode.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Biicode configuration file -[paths] - include -[mains] - !android/* -[tests] - tests/* diff --git a/biicode/README.md b/biicode/README.md deleted file mode 100644 index 8b0a18560..000000000 --- a/biicode/README.md +++ /dev/null @@ -1,21 +0,0 @@ -Biicode C/C++ dependency manager -================================= - -[![Build Status](https://webapi.biicode.com/v1/badges/fenix/fenix/flatbuffers/master)](https://www.biicode.com/fenix/flatbuffers) - -New with biicode? Check the [Getting Started Guide](http://docs.biicode.com/c++/gettingstarted.html). - -How to build it? ------------------- -Building it is too easy: - - $ git clone git@github.com:google/flatbuffers.git - $ cd flatbuffers - $ bii init -L && bii build - $ ./bin/any_executable - -Or run its tests: - - $ bii test - -You can check [the examples/flatbuffers block](https://www.biicode.com/examples/flatbuffers). \ No newline at end of file diff --git a/biicode/cmake/biicode.cmake b/biicode/cmake/biicode.cmake deleted file mode 100644 index 85b15ed92..000000000 --- a/biicode/cmake/biicode.cmake +++ /dev/null @@ -1,18 +0,0 @@ -set(BII_TESTS_WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -# Copying data files to project/bin folder -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/samples") - file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/samples/monster.fbs" - "${CMAKE_CURRENT_SOURCE_DIR}/samples/monsterdata.json" - DESTINATION - "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/samples") -endif() -if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests") - file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/tests" - DESTINATION - "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") -endif() - -ADD_BIICODE_TARGETS() - -string(REPLACE " " ";" REPLACED_FLAGS ${CMAKE_CXX_FLAGS}) -target_compile_options(${BII_BLOCK_TARGET} INTERFACE ${REPLACED_FLAGS}) \ No newline at end of file diff --git a/biicode/support/bii-travis.sh b/biicode/support/bii-travis.sh deleted file mode 100755 index 67854c7ce..000000000 --- a/biicode/support/bii-travis.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# Copyright 2016 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sudo apt-get update -qq -sudo apt-get install libglu1-mesa-dev xorg-dev -wget http://www.biicode.com/downloads/latest/ubuntu64 -mv ubuntu64 bii-ubuntu64.deb -(sudo dpkg -i bii-ubuntu64.deb) && sudo apt-get -f install -rm bii-ubuntu64.deb -wget https://s3.amazonaws.com/biibinaries/thirdparty/cmake-3.0.2-Linux-64.tar.gz -tar -xzf cmake-3.0.2-Linux-64.tar.gz -sudo cp -fR cmake-3.0.2-Linux-64/* /usr -rm -rf cmake-3.0.2-Linux-64 -rm cmake-3.0.2-Linux-64.tar.gz - -cmake --version -bii init -l && bii configure -DCMAKE_BUILD_TYPE=$1 && bii test \ No newline at end of file