From f82287e7872f58e7f5935a5565362e3643ed4dbe Mon Sep 17 00:00:00 2001 From: Matt Tytel Date: Wed, 14 Jun 2017 18:27:47 -0400 Subject: [PATCH] Maybe one day I'll use fpm for full builds. --- .travis.yml | 35 +++-------------------------------- Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16810ad8b0..e951ba9832 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,42 +13,13 @@ matrix: - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" before_install: - - VERSION=0.9.0 - > - sudo apt-get update -qq - eval "${MATRIX_EVAL}" - sudo apt-get install -y mesa-common-dev libasound2-dev libfreetype6-dev libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev freeglut3-dev libxcomposite-dev libjack-dev - libcurl4-gnutls-dev g++-4.8 gcc-4.8 gzip - - gem install --no-rdoc --no-ri fpm package_cloud - - mkdir dest -script: > - export COMMONFLAGS=' - --name "helm" - --description "Polyphonic\ synthesizer" - --version $VERSION - --package helm_VERSION_ARCH.deb - --license "GPLv3" - --maintainer "matthewtytel@gmail.com" - --vendor "Matt\ Tytel" - --url "http://tytel.org/helm" - --depends "mesa-common" - --depends "libasound2" - --depends "libfreetype6" - --depends "libx11" - --depends "libxrandr" - --depends "libxinerama" - --depends "libxcursor" - --depends "freeglut3" - --depends "libxcomposite" - --depends "libjack" - --depends "libcurl4-gnutls" - --category "sound"' && - make CONFIG=Release install_standalone DESTDIR=dest && - fpm -s dir -t deb --name helm $COMMONFLAGS \ - --deb-changelog debian/changelog \ - --deb-priority 'optional' \ - dest/ && - echo "deb package built successfully" + libcurl4-gnutls-dev g++-4.8 gcc-4.8 +script: + - make CONFIG=Release after_success: diff --git a/Makefile b/Makefile index bf88a11729..0d8f965f3d 100644 --- a/Makefile +++ b/Makefile @@ -54,10 +54,10 @@ install_standalone: standalone install_patches install -d $(BIN) $(ICONS) $(MAN) $(CHANGES) install standalone/builds/linux/build/$(PROGRAM) $(BIN) install -m644 images/* $(ICONS) - cp ChangeLog changes - gzip -n -9 ChangeLog - mv changes ChangeLog - mv ChangeLog.gz $(CHANGES)/changelog.gz + cp changelog changes + gzip -n -9 changelog + mv changes changelog + mv changelog.gz $(CHANGES)/changelog.gz cp docs/helm.1.gz $(MAN) install_lv2: lv2 install_patches