merge mxapi branch (#20)

* mxapi komp-build stuff * mxapi bombe test * the latest crap * mxapi handle divisions changes * mxapi use voice 1 in bombe * mx-version-0.2.0.2 * mx-version-0.2.0.3 * mx-version-0.2.0.4 * mxapi adjust -0 to say 0 instead when stringing decimals * mx-version-0.2.0.5 * mx-version-0.2.0.6 * mxapi save ornaments * mx-version-0.2.0.7 * mxapi working on direction offset problems * mxapi direction mark time bug fixed * mxapi reenable some tests * mxapi pedal start stop working * mxapi disable the core tests * mx-version-0.2.0.8 * mxapi working on order of directions and notes * mxapi directions are now written in a relatively sane order with respect to notes * mxapi tests passing * mx-version-0.2.0.9 * mxapi fix direction position data import and export * mx-version-0.2.0.10 * mxapi compile visual studio * mx-version-0.2.0.11 * mxapi doesnt compile add tremolos * better support for tremolo glyphs * mxapi words are exporting * mxapi finish with words for now * mx-version-0.2.0.12 * mxapi save and load technical marks * mx-version-0.2.0.13 * mxapi turn off cout * mxapi fix bug with other articulation * mx-version-0.2.0.14 * mxapi merge decimal * mxapi score data and tests * mxapi tests * mxapi sort score data before writing * mx-version-0.2.0.17 * mxapi progress on directions robustness * more work on cursor and direction * mxapi directions seem more bulletproof now * mx-version-0.2.0.18 * mxapi fix chord bug * mxapi fix xcode project groups - add enum macros * mxapi add musicxml instrument sound strings * mxapi sound id * mxapi restore compile control * mx-version-0.2.0.20 * sound and general midi work * mxapi begin adding chord support * mxapi chord test simple * mxapi middle of something does not compile * mxapi chord progress * mxapi chord saving works but round trip does not work * mxapi still cannot fix the round trip test * mxapi basic chord support complete * mx-version-0.2.0.21 * mxapi add chord symbol features * mx-version-0.2.0.22 * mxapi add processing instructions * mx-version-0.2.0.23 * more chord symbol work * mx-version-0.2.0.24 * mxapi not much * mxapi Barlines (#12) * mxapi fix broken test * mx-version-0.2.0.25 * Feature/mxapi (#14) mxapi barlines and endings * Feature/repeats (#15) mxapi repeats * mx-version-0.2.0.26 * mxapi add chord positioning * mx-version-0.2.0.27 * mxapi read and write note position data * mx-version-0.2.0.28 * mxapi barline work * mx-version-0.2.0.29 * mxapi fix measure rest writing * mx-version-0.2.0.30 * mxapi fix another measure rest issue * mx-version-0.2.0.31 * mx-version-0.2.0.32 * mxapi add failing freezing pieces test viola measure 7 * mxapi freezing tests * mxapi more freezing tests * mxapi freezing tests * Feature/mxapi (#17) * Smufl flailing * Fat framework * Add missing architectures * Clean up projects * Remove scheme and add stub post-archive script * Track down a memory smasher * Add an additional check * use sparsepp to avoid smufl crash (#18) * Use frozen map * User sparse map for unordered list * Return ref not copy of string * smufl map carnage * version * mx-version-0.3.1.37 * nothing * gitignore * remove sublime workspace * ignore sublime workspace * ci and gcc work * pesky sublime workspace * sublime workspace ignore * ci * ci work * ci work and gcc * circleci * circleci * circleci * test stuff
webern · Apr 7, 2019 · 952715e · 952715e
1 parent d0e94e4
commit 952715e
Show file tree

Hide file tree

Showing 63 changed files with 971 additions and 7,349 deletions.
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -0,0 +1,10 @@
+FROM debian:9.8
+
+RUN apt-get update && apt-get install -y \
+    git \
+    ssh \
+    tar \
+    gzip \
+    ca-certificates \
+    cmake \
+    build-essential
diff --git a/.circleci/Dockerfile.test b/.circleci/Dockerfile.test
@@ -0,0 +1,6 @@
+FROM matthewjamesbriggs/mxci:v001
+
+ENV BASEDIR="/mx"
+WORKDIR $BASEDIR
+COPY . .
+CMD cmake . && make -j12 && ./MxTest
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,59 @@
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: matthewjamesbriggs/mxci:v001
+
+    resource_class: xlarge
+    working_directory: ~/mx
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      # - restore_cache:
+      #     keys:
+      #     - iqcache-{{ checksum ".circleci/cache-lock" }}-{{ checksum "iqtestdata/.cache-lock" }}
+      #     # fallback to using the latest cache if no exact match is found
+      #     - iqcache-
+
+      # - run: yarn install --cache-folder ~/yarn-cache
+
+      # - run:
+      #     name: Install Git LFS
+      #     command: |
+      #       curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | sudo bash
+      #       sudo apt-get update
+      #       sudo apt-get install -y git-lfs openssh-client
+      #       git lfs install
+      #       mkdir -p ~/.ssh
+      #       ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+      #       ssh git@github.com git-lfs-authenticate "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" download
+      #       git lfs pull
+
+      # - save_cache:
+      #     paths:
+      #       - node_modules
+      #       - iqtestdata
+      #       - web/node_modules
+      #       - iqbak/node_modules
+      #       - iqshared/node_modules
+      #       - ~/yarn-cache
+
+      #     key: iqcache-{{ checksum ".circleci/cache-lock" }}-{{ checksum "iqtestdata/.cache-lock" }}
+
+      - run:
+          name: Cmake
+          command: cmake .
+
+      - run:
+          name: Build
+          command: make
+
+      - run:
+          name: Test
+          command: ./MxTest
+
+      # - store_artifacts:
+      #     path: /tmp/coverage/
diff --git a/.circleci/docker.sh b/.circleci/docker.sh
@@ -0,0 +1,18 @@
+THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+MX_DIR="$THIS_DIR/.."
+cd "$THIS_DIR"
+
+docker build \
+    -f "$THIS_DIR/Dockerfile" \
+    -t matthewjamesbriggs/mxci:v001 \
+    "$THIS_DIR"
+
+docker rm -f mxtestcontainer || true;
+docker rmi -f mxtestimage || true;
+
+docker build \
+    -f "$THIS_DIR/Dockerfile.test" \
+    -t mxtestimage \
+    "$MX_DIR"
+
+docker run -it --name mxtestcontainer mxtestimage