From b0c06bcfffef737f20cbe73ee3be7862b182ea12 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 3 Dec 2019 18:36:56 +0000 Subject: [PATCH] build on osx using homebrew --- .travis.yml.off => .travis.yml | 20 ++++++++++++-------- LICENSE | 28 +++++++++++++++------------- 2 files changed, 27 insertions(+), 21 deletions(-) rename .travis.yml.off => .travis.yml (91%) diff --git a/.travis.yml.off b/.travis.yml similarity index 91% rename from .travis.yml.off rename to .travis.yml index c2c1291..08ef055 100644 --- a/.travis.yml.off +++ b/.travis.yml @@ -2,7 +2,6 @@ language: cpp sudo: true - # for windows *test* of AppImage # see https://docs.travis-ci.com/user/build-matrix/#using-different-programming-languages-per-job # and https://discourse.appimage.org/t/run-appimage-on-windows/177 @@ -45,8 +44,10 @@ branches: # - liblcms2-dev # - libxml2-dev # - libuninameslist-dev -# homebrew: -# packages: + homebrew: + taps: pdf2htmlEX/homebrew-brewTap + packages: + - pdf2html-new # - autoconf # - pkg-config # - git @@ -77,17 +78,20 @@ matrix: jobs: include: - - stage: build + - stage: build-linux os: - linux dist: bionic script: ./buildScripts/doItAllTravis - - stage: test - os: - - linux + - stage: build-osx + os: + - osx +# - stage: test +# os: +# - linux #- osx #- windows - script: ./testScripts/doItAllTravis +# script: ./testScripts/doItAllTravis #deploy: # provider: releases # api_key: diff --git a/LICENSE b/LICENSE index 0665c92..90c48ff 100644 --- a/LICENSE +++ b/LICENSE @@ -1,23 +1,25 @@ pdf2htmlEX (https://github.com/coolwanglu/pdf2htmlEX) Copyright (c) 2012-2014 Lu Wang and other contributors -pdf2htmlEX, as a whole package, is licensed under GPLv3 (or any later version). +pdf2htmlEX, as a whole package, is licensed under GPLv3 (or any later +version). -Files in share/ and logo/ are released under relaxed licenses, -read the respective `LICENSE` file in the folders for details. +Files in pdf2htmlEX/share/ pdf2htmlEX/logo/ and pdf2htmlEX/brewFormual are +released under relaxed licenses, read the respective `LICENSE` file in +these folders for details. ----- GPLv3 -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the Free +Software Foundation, either version 3 of the License, or (at your option) +any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +This program is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +more details. -You should have received a copy of the GNU General Public License -along with this program. If not, see . +You should have received a copy of the GNU General Public License along +with this program. If not, see .