From ffe84d6ec76c058e94be1a07e8b3487225f43116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 26 Sep 2019 20:08:47 +0200 Subject: [PATCH] NOISSUE remove some dead things --- .arcconfig | 5 ----- .clang-format | 25 ------------------------- .gitignore | 5 ++--- .travis.yml | 38 -------------------------------------- 4 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 .arcconfig delete mode 100644 .clang-format delete mode 100644 .travis.yml diff --git a/.arcconfig b/.arcconfig deleted file mode 100644 index ab5cbe892..000000000 --- a/.arcconfig +++ /dev/null @@ -1,5 +0,0 @@ -{ - "project_id": "MultiMC5", - "conduit_uri": "http://ph.multimc.org" -} - diff --git a/.clang-format b/.clang-format deleted file mode 100644 index f4732803d..000000000 --- a/.clang-format +++ /dev/null @@ -1,25 +0,0 @@ -UseTab: false -IndentWidth: 4 -TabWidth: 4 -ConstructorInitializerIndentWidth: 4 -AccessModifierOffset: -4 -IndentCaseLabels: false -IndentFunctionDeclarationAfterType: false -NamespaceIndentation: None - -BreakBeforeBraces: Allman -AllowShortIfStatementsOnASingleLine: false -AllowShortFunctionsOnASingleLine: None -ColumnLimit: 160 -MaxEmptyLinesToKeep: 1 - -Standard: Cpp11 -Cpp11BracedListStyle: true - -SpacesInParentheses: false -SpaceInEmptyParentheses: false -SpacesInCStyleCastParentheses: false -SpaceAfterControlStatementKeyword: true - -AlignTrailingComments: true -SpacesBeforeTrailingComments: 1 diff --git a/.gitignore b/.gitignore index a2c7ec410..496c382e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ Thumbs.db -.kdev4 +*.kdev4 .user .directory resources/CMakeFiles @@ -9,8 +9,7 @@ resources/MultiMCLauncher.jar html/ # Project Files -MultiMC5.kdev4 -MultiMC.pro.user +*.pro.user CMakeLists.txt.user CMakeLists.txt.user.* /.project diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 19f39c2fa..000000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -# General set up -language: cpp -cache: apt - -matrix: - include: - - os: linux - dist: precise - sudo: required - compiler: gcc - env: TRAVIS_DIST=precise QT_VERSION=5.4.2 - - os: linux - dist: precise - sudo: required - compiler: gcc - env: TRAVIS_DIST=precise QT_VERSION=5.6.2 - - os: linux - dist: trusty - sudo: required - compiler: gcc - env: TRAVIS_DIST=trusty QT_VERSION=5.4.2 - - os: linux - dist: trusty - sudo: required - compiler: gcc - env: TRAVIS_DIST=trusty QT_VERSION=5.6.2 - -# Install dependencies -install: - - source travis/prepare.sh # installs qt and cmake. need to source because some env vars are set from there - -# Actual work -before_script: - - mkdir build - - cd build - - cmake -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH .. -script: - - make -j4 && make test ARGS="-V"