prepare to transition toolchain/packaging

  * removed packaging from travis.yml
  * removed codeblocks project files

Author: bill-auger

.gitignore

@@ -1,5 +1,15 @@
+
 build/*
-!build/debian
-!build/Makefile
 !build/generate-makefile.sh
 !build/loopidity.cbp
+obs/*
+!obs/debian.changelog
+!obs/debian.compat
+!obs/debian.control
+!obs/debian.copyright
+!obs/debian.rules
+!obs/loopidity.dsc
+!obs/loopidity.spec
+!obs/PKGBUILD
+!obs/README.md
+!obs/_service

.travis.yml

@@ -1,37 +1,14 @@
 language:       cpp
 compiler:       gcc
+dist:           trusty
 before_install:
-  - VERSION=0.14.000
-  - BUILD_DIR=/home/travis/build/bill-auger/loopidity/build
-  - DEB_DIR=$BUILD_DIR/debian
-  - BIN_DIR=$DEB_DIR/usr/bin
-  - DEB_PKG=loopidity_"$VERSION"_amd64.deb
   - sudo apt-get update -qq
   - sudo apt-get install -y libsdl1.2-dev libsdl-gfx1.2-dev libsdl-ttf2.0-dev
                             libx11-dev libjack-jackd2-dev
-  - gem install fpm package_cloud --no-rdoc --no-ri
-  - sudo cp $DEB_DIR/SDL_ttf.pc /usr/lib/x86_64-linux-gnu/pkgconfig/SDL_ttf.pc
-script:         >
-  cd $BUILD_DIR                                                     &&
-  make && mkdir -p $BIN_DIR && mv bin/loopidity $BIN_DIR/loopidity  &&
-  fpm -s dir -t deb --name loopidity --version $VERSION              \
-    -C              $DEB_DIR                                         \
-    --package       $DEB_DIR/loopidity_VERSION_ARCH.deb              \
-    --license       'GPL3'                                           \
-    --maintainer    'bill-auger@programmer.net'                      \
-    --vendor        'https://github.com/bill-auger/loopidity'        \
-    --url           'https://github.com/bill-auger/loopidity'        \
-    --depends       'libsdl1.2debian'                                \
-    --depends       'libsdl-gfx1.2-4'                                \
-    --depends       'libsdl-ttf2.0-0'                                \
-    --description   'loopidity
-                    \n\nA multi-track multi-channel audio looper
-                    designed for live handsfree use.'                \
-    --deb-changelog $DEB_DIR/changelog                               \
-    --deb-priority  'optional'                                       \
-    --category      'sound'                                          \
-    usr/                                                            &&
-  echo "$DEB_PKG deb package built successfully"
-after_success:
-  - package_cloud yank ninjam/loopidity/ubuntu/trusty          $DEB_PKG
-  - package_cloud push ninjam/loopidity/ubuntu/trusty $DEB_DIR/$DEB_PKG
+script:
+  - make -C src/
+  - stat build/bin/loopidity                          > /dev/null
+  - stat build/share/loopidity/histogram_gradient.bmp > /dev/null
+  - stat build/share/loopidity/loop_gradient.argb.bmp > /dev/null
+  - stat build/share/loopidity/scope_gradient.bmp     > /dev/null
+  - stat build/share/loopidity/Purisa.ttf             > /dev/null

build/debian/README-DEBIAN.md

@@ -1,11 +1,15 @@
 
+VERSION = v0.14.003
+
 ifndef DESTDIR
   DESTDIR =
 endif
 ifndef PREFIX
   PREFIX = /usr/local
 endif
-BINDIR     = ./bin
+BUILDDIR   = ../build
+BINDIR     = bin
+DATADIR    = share/loopidity
 ASSETSDIR  = ../assets
 INSTALLDIR = $(DESTDIR)$(PREFIX)
 ifeq (${MSYSTEM},MINGW32)
@@ -19,16 +23,16 @@ CXX = g++
 AR  = ar
 LD  = g++
 
-CFLAGS = -std=gnu++0x -Wall -MMD
+CFLAGS = -std=gnu++0x -MMD -Wall -Werror -Wextra -DVERSION=$(VERSION)
 ifeq ($(CONFIG),debug)
   CFLAGS  += -g -DDEBUG=1
   LDFLAGS  =
-  OBJDIR   = ./obj/Debug/__/src
+  OBJDIR   = $(BUILDDIR)/obj/debug/src
   TARGET   = loopidity-dbg
 else
   CFLAGS  += -O3
   LDFLAGS  = -s
-  OBJDIR   = ./obj/Release/__/src
+  OBJDIR   = $(BUILDDIR)/obj/release/src
   TARGET   = loopidity
   CONFIG   = 'release'
 endif
@@ -58,44 +62,45 @@ all: before out after
 
 before:
 	@echo "building $(CONFIG) configuration"
-	@test -d $(BINDIR) || mkdir -p $(BINDIR)
-	@test -d $(OBJDIR) || mkdir -p $(OBJDIR)
+	@test -d $(BUILDDIR)/$(BINDIR)  || mkdir -p $(BUILDDIR)/$(BINDIR)
+	@test -d $(BUILDDIR)/$(DATADIR) || mkdir -p $(BUILDDIR)/$(DATADIR)
+	@test -d $(BUILDDIR)/$(OBJDIR)  || mkdir -p $(BUILDDIR)/$(OBJDIR)
 
 out: before $(OBJECTS)
 	@echo "linking $(CONFIG) binary"
-	@$(LD) -o $(BINDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS)
-
-after: before $(ASSETS)
-	@echo "copying assets to bin directory"
-	@cp --no-clobber $(ASSETS) $(BINDIR)/
-
+	@$(LD) -o $(BUILDDIR)/$(BINDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS)
 
 $(OBJECTS): $(OBJDIR)/%.o: ../src/%.cpp
 	@echo "  -> compiling $*.cpp"
-	@$(CXX) $(CFLAGS) -c $< -o $@
+	@$(CXX) $(CFLAGS) -c $(BUILDDIR)/$< -o $@
+
+after: before out $(ASSETS)
+	@echo "copying assets to data directory"
+	@cp --no-clobber $(ASSETS) $(BUILDDIR)/$(DATADIR)/
 
 
 clean:
-	@echo "cleaning $(CONFIG) configuration"
-	@rm -rf $(BINDIR)
-	@rm -rf $(OBJDIR)/*.o
+	@echo "cleaning all configurations"
+	rm -rf $(BUILDDIR)/$(BINDIR)/
+	rm -rf $(BUILDDIR)/$(DATADIR)/
+	rm -rf $(BUILDDIR)/$(OBJDIR)/
 
 
 assert-writable:
-	@mkdir -p $(INSTALLDIR)/bin
-	@mkdir -p $(INSTALLDIR)/share/loopidity
-	@touch $(INSTALLDIR)/bin/$(TARGET) 2> /dev/null || \
+	@mkdir -p $(INSTALLDIR)/$(BINDIR)
+	@mkdir -p $(INSTALLDIR)/$(DATADIR)
+	@touch $(INSTALLDIR)/$(BINDIR)/$(TARGET) 2> /dev/null || \
           (echo '\nsuperuser privileges required - exiting\n' && exit 255)
 
 install: all assert-writable
 	@echo installing loopidity
-	@install -Dm 755 $(BINDIR)/$(TARGET) $(INSTALLDIR)/bin/
-	@install -Dm 644 $(ASSETS)           $(INSTALLDIR)/share/loopidity/
+	@install -Dm 755 $(BINDIR)/$(TARGET) $(INSTALLDIR)/$(BINDIR)/
+	@install -Dm 644 $(ASSETS)           $(INSTALLDIR)/$(DATADIR)/
 
 uninstall: assert-writable
 	@echo uninstalling loopidity
-	@rm     $(INSTALLDIR)/bin/$(TARGET)    2> /dev/null
-	@rm -rf $(INSTALLDIR)/share/loopidity/ 2> /dev/null
+	@rm     $(INSTALLDIR)/$(BINDIR)/$(TARGET) 2> /dev/null
+	@rm -rf $(INSTALLDIR)/$(DATADIR)/         2> /dev/null
 
 
 -include $(OBJECTS:%.o=%.d)