Skip to content

Commit 926e5df

Browse files
bill-augerbill-auger
committed
prepare to transition toolchain/packaging
 * removed packaging from travis.yml * removed codeblocks project files
1 parent ca29434 commit 926e5df

8 files changed

Lines changed: 49 additions & 159 deletions

File tree

‎.gitignore‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
12
build/*
2-
!build/debian
3-
!build/Makefile
43
!build/generate-makefile.sh
54
!build/loopidity.cbp
5+
obs/*
6+
!obs/debian.changelog
7+
!obs/debian.compat
8+
!obs/debian.control
9+
!obs/debian.copyright
10+
!obs/debian.rules
11+
!obs/loopidity.dsc
12+
!obs/loopidity.spec
13+
!obs/PKGBUILD
14+
!obs/README.md
15+
!obs/_service

‎.travis.yml‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
11
language: cpp
22
compiler: gcc
3+
dist: trusty
34
before_install:
4-
- VERSION=0.14.000
5-
- BUILD_DIR=/home/travis/build/bill-auger/loopidity/build
6-
- DEB_DIR=$BUILD_DIR/debian
7-
- BIN_DIR=$DEB_DIR/usr/bin
8-
- DEB_PKG=loopidity_"$VERSION"_amd64.deb
95
- sudo apt-get update -qq
106
- sudo apt-get install -y libsdl1.2-dev libsdl-gfx1.2-dev libsdl-ttf2.0-dev
117
libx11-dev libjack-jackd2-dev
12-
- gem install fpm package_cloud --no-rdoc --no-ri
13-
- sudo cp $DEB_DIR/SDL_ttf.pc /usr/lib/x86_64-linux-gnu/pkgconfig/SDL_ttf.pc
14-
script: >
15-
cd $BUILD_DIR &&
16-
make && mkdir -p $BIN_DIR && mv bin/loopidity $BIN_DIR/loopidity &&
17-
fpm -s dir -t deb --name loopidity --version $VERSION \
18-
-C $DEB_DIR \
19-
--package $DEB_DIR/loopidity_VERSION_ARCH.deb \
20-
--license 'GPL3' \
21-
--maintainer 'bill-auger@programmer.net' \
22-
--vendor 'https://github.com/bill-auger/loopidity' \
23-
--url 'https://github.com/bill-auger/loopidity' \
24-
--depends 'libsdl1.2debian' \
25-
--depends 'libsdl-gfx1.2-4' \
26-
--depends 'libsdl-ttf2.0-0' \
27-
--description 'loopidity
28-
\n\nA multi-track multi-channel audio looper
29-
designed for live handsfree use.' \
30-
--deb-changelog $DEB_DIR/changelog \
31-
--deb-priority 'optional' \
32-
--category 'sound' \
33-
usr/ &&
34-
echo "$DEB_PKG deb package built successfully"
35-
after_success:
36-
- package_cloud yank ninjam/loopidity/ubuntu/trusty $DEB_PKG
37-
- package_cloud push ninjam/loopidity/ubuntu/trusty $DEB_DIR/$DEB_PKG
8+
script:
9+
- make -C src/
10+
- stat build/bin/loopidity > /dev/null
11+
- stat build/share/loopidity/histogram_gradient.bmp > /dev/null
12+
- stat build/share/loopidity/loop_gradient.argb.bmp > /dev/null
13+
- stat build/share/loopidity/scope_gradient.bmp > /dev/null
14+
- stat build/share/loopidity/Purisa.ttf > /dev/null

‎build/debian/README-DEBIAN.md‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎build/debian/SDL_ttf.pc‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎build/debian/changelog‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎build/generate-makefile.sh‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎build/loopidity.cbp‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

build/Makefile renamed to src/Makefile

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11

2+
VERSION = v0.14.003
3+
24
ifndef DESTDIR
35
DESTDIR =
46
endif
57
ifndef PREFIX
68
PREFIX = /usr/local
79
endif
8-
BINDIR = ./bin
10+
BUILDDIR = ../build
11+
BINDIR = bin
12+
DATADIR = share/loopidity
913
ASSETSDIR = ../assets
1014
INSTALLDIR = $(DESTDIR)$(PREFIX)
1115
ifeq (${MSYSTEM},MINGW32)
@@ -18,18 +22,18 @@ CC = gcc
1822
CXX = g++
1923
AR = ar
2024
LD = g++
21-
CFLAGS = -std=gnu++0x -Wall -MMD \
22-
-DLOOPIDITY_BINDIR=\"$(INSTALLDIR)/bin\" \
25+
CFLAGS = -std=gnu++0x -MMD -Wall -Werror -Wextra -DVERSION=$(VERSION) \
26+
-DLOOPIDITY_BINDIR=\"$(INSTALLDIR)/bin\" \
2327
-DLOOPIDITY_DATADIR=\"$(INSTALLDIR)/share/loopidity\"
2428
ifeq ($(CONFIG),debug)
2529
CFLAGS += -g -DDEBUG=1
2630
LDFLAGS =
27-
OBJDIR = ./obj/Debug/__/src
31+
OBJDIR = $(BUILDDIR)/obj/debug/src
2832
TARGET = loopidity-dbg
2933
else
3034
CFLAGS += -O3
3135
LDFLAGS = -s
32-
OBJDIR = ./obj/Release/__/src
36+
OBJDIR = $(BUILDDIR)/obj/release/src
3337
TARGET = loopidity
3438
CONFIG = 'release'
3539
endif
@@ -59,44 +63,45 @@ all: before out after
5963

6064
before:
6165
@echo "building $(CONFIG) configuration"
62-
@test -d $(BINDIR) || mkdir -p $(BINDIR)
63-
@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
66+
@test -d $(BUILDDIR)/$(BINDIR) || mkdir -p $(BUILDDIR)/$(BINDIR)
67+
@test -d $(BUILDDIR)/$(DATADIR) || mkdir -p $(BUILDDIR)/$(DATADIR)
68+
@test -d $(BUILDDIR)/$(OBJDIR) || mkdir -p $(BUILDDIR)/$(OBJDIR)
6469

6570
out: before $(OBJECTS)
6671
@echo "linking $(CONFIG) binary"
67-
@$(LD) -o $(BINDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS)
68-
69-
after: before $(ASSETS)
70-
@echo "copying assets to bin directory"
71-
@cp --no-clobber $(ASSETS) $(BINDIR)/
72-
72+
@$(LD) -o $(BUILDDIR)/$(BINDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS)
7373

7474
$(OBJECTS): $(OBJDIR)/%.o: ../src/%.cpp
7575
@echo " -> compiling $*.cpp"
76-
@$(CXX) $(CFLAGS) -c $< -o $@
76+
@$(CXX) $(CFLAGS) -c $(BUILDDIR)/$< -o $@
77+
78+
after: before out $(ASSETS)
79+
@echo "copying assets to data directory"
80+
@cp --no-clobber $(ASSETS) $(BUILDDIR)/$(DATADIR)/
7781

7882

7983
clean:
80-
@echo "cleaning $(CONFIG) configuration"
81-
@rm -rf $(BINDIR)
82-
@rm -rf $(OBJDIR)/*.o
84+
@echo "cleaning all configurations"
85+
rm -rf $(BUILDDIR)/$(BINDIR)/
86+
rm -rf $(BUILDDIR)/$(DATADIR)/
87+
rm -rf $(BUILDDIR)/$(OBJDIR)/
8388

8489

8590
assert-writable:
86-
@mkdir -p $(INSTALLDIR)/bin
87-
@mkdir -p $(INSTALLDIR)/share/loopidity
88-
@touch $(INSTALLDIR)/bin/$(TARGET) 2> /dev/null || \
91+
@mkdir -p $(INSTALLDIR)/$(BINDIR)
92+
@mkdir -p $(INSTALLDIR)/$(DATADIR)
93+
@touch $(INSTALLDIR)/$(BINDIR)/$(TARGET) 2> /dev/null || \
8994
(echo '\nsuperuser privileges required - exiting\n' && exit 255)
9095

9196
install: all assert-writable
9297
@echo installing loopidity
93-
@install -Dm 755 $(BINDIR)/$(TARGET) $(INSTALLDIR)/bin/
94-
@install -Dm 644 $(ASSETS) $(INSTALLDIR)/share/loopidity/
98+
@install -Dm 755 $(BINDIR)/$(TARGET) $(INSTALLDIR)/$(BINDIR)/
99+
@install -Dm 644 $(ASSETS) $(INSTALLDIR)/$(DATADIR)/
95100

96101
uninstall: assert-writable
97102
@echo uninstalling loopidity
98-
@rm $(INSTALLDIR)/bin/$(TARGET) 2> /dev/null
99-
@rm -rf $(INSTALLDIR)/share/loopidity/ 2> /dev/null
103+
@rm $(INSTALLDIR)/$(BINDIR)/$(TARGET) 2> /dev/null
104+
@rm -rf $(INSTALLDIR)/$(DATADIR)/ 2> /dev/null
100105

101106

102107
-include $(OBJECTS:%.o=%.d)

0 commit comments

Comments
 (0)