Skip to content

Commit 78011ce

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents bcf92d0 + 53be260 commit 78011ce

File tree

901 files changed

+1808
-20985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

901 files changed

+1808
-20985
lines changed

.travis.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
language: shell
2+
sudo: required
3+
addons:
4+
apt:
5+
packages:
6+
- ninja
7+
- cmake
8+
- clang
9+
- qtbase5-dev
210
script:
311
- bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
412
- bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
13+
- cd system/cpp-src/mkalteriso
14+
- mkdir -p build
15+
- cd build
16+
- cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
17+
- make
18+
519
git:
620
submodules: false
21+
language: bash

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARCH_i686 := --arch i686
77
CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
88

99
full:mkalteriso
10-
@sudo ${CURRENT_DIR}/tools/fullbuild.sh
10+
@sudo ${CURRENT_DIR}/tools/fullbuild.sh -d
1111
@make clean
1212

1313
xfce-64 xfce-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 cinnamon-64 cinnamon-32 deepin-64 gnome-64 gnomemac-64 i3-64 i3-32:mkalteriso

0 commit comments

Comments
 (0)