Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
70bd46c
mxapi komp-build stuff
webern Mar 17, 2017
77c2b8d
mxapi bombe test
webern Mar 17, 2017
bd330b6
the latest crap
webern Mar 17, 2017
d4f12e7
mxapi handle divisions changes
webern Mar 19, 2017
7da7b3e
mxapi use voice 1 in bombe
webern Mar 19, 2017
afe65d6
mx-version-0.2.0.2
webern Mar 19, 2017
bc6b498
mx-version-0.2.0.3
webern Mar 22, 2017
a032765
mx-version-0.2.0.4
webern Mar 22, 2017
fbb9f24
mxapi adjust -0 to say 0 instead when stringing decimals
webern Mar 23, 2017
76c67e3
mx-version-0.2.0.5
webern Mar 24, 2017
a1099ef
mx-version-0.2.0.6
webern Mar 24, 2017
73b3561
mxapi save ornaments
webern Mar 26, 2017
23a36bb
mx-version-0.2.0.7
webern Mar 26, 2017
990cdd0
mxapi working on direction offset problems
webern Mar 26, 2017
d38ee85
mxapi direction mark time bug fixed
webern Mar 26, 2017
abafdf5
mxapi reenable some tests
webern Mar 26, 2017
6a31abf
mxapi pedal start stop working
webern Mar 26, 2017
67d9e0d
mxapi disable the core tests
webern Mar 26, 2017
57bf7ff
mx-version-0.2.0.8
webern Mar 26, 2017
b214a14
mxapi working on order of directions and notes
webern Mar 27, 2017
8e375b0
mxapi directions are now written in a relatively sane order with resp…
webern Mar 27, 2017
3fee247
mxapi tests passing
webern Mar 27, 2017
708bd56
mx-version-0.2.0.9
webern Mar 27, 2017
cf22ed6
mxapi fix direction position data import and export
webern Mar 27, 2017
1681c3c
mx-version-0.2.0.10
webern Mar 27, 2017
59fccba
mxapi compile visual studio
webern Mar 28, 2017
1800b65
mx-version-0.2.0.11
webern Mar 28, 2017
63b693f
mxapi doesnt compile add tremolos
webern Mar 28, 2017
f5a568b
mxapi merge self
webern Mar 28, 2017
c35f409
better support for tremolo glyphs
webern Mar 28, 2017
6cb6a33
mxapi words are exporting
webern Mar 28, 2017
85a0099
mxapi finish with words for now
webern Mar 28, 2017
f24beee
mx-version-0.2.0.12
webern Mar 28, 2017
85376ba
mxapi save and load technical marks
webern Mar 29, 2017
75c9d31
mx-version-0.2.0.13
webern Mar 29, 2017
a4394d7
mxapi turn off cout
webern Mar 29, 2017
8e905c7
mxapi fix bug with other articulation
webern Mar 29, 2017
2455aa1
mx-version-0.2.0.14
webern Mar 29, 2017
454771f
mxapi merge decimal
webern Apr 27, 2017
c5ae5fa
mxapi score data and tests
webern Apr 29, 2017
53fa0e5
mxapi tests
webern Apr 29, 2017
bfc39d0
mxapi sort score data before writing
webern Apr 29, 2017
8e29bca
mx-version-0.2.0.17
webern Apr 29, 2017
b65b8a6
mxapi progress on directions robustness
webern Jun 4, 2017
c8ab1d3
more work on cursor and direction
webern Jun 4, 2017
6dc78ad
mxapi directions seem more bulletproof now
webern Jun 5, 2017
b438c2f
mx-version-0.2.0.18
webern Jun 5, 2017
b5b82ae
mxapi fix chord bug
webern Jun 12, 2017
7e8c256
mxapi fix xcode project groups - add enum macros
webern Jun 13, 2017
d792f92
mxapi add musicxml instrument sound strings
webern Jun 13, 2017
bb72348
mxapi sound id
webern Jun 13, 2017
cfd43d9
mxapi restore compile control
webern Jun 13, 2017
f7db864
mx-version-0.2.0.20
webern Jun 13, 2017
5572c77
sound and general midi work
webern Jun 20, 2017
4880189
mxapi begin adding chord support
webern Jun 28, 2017
7394b51
mxapi chord test simple
webern Jun 28, 2017
31a9c63
mxapi middle of something does not compile
webern Jun 28, 2017
8c249fe
mxapi chord progress
webern Jun 29, 2017
7660bd5
mxapi chord saving works but round trip does not work
webern Jun 29, 2017
b91aacf
mxapi still cannot fix the round trip test
webern Jun 29, 2017
4f023a4
mxapi basic chord support complete
webern Jun 29, 2017
2ac4711
mx-version-0.2.0.21
webern Jun 29, 2017
af94fc9
mxapi add chord symbol features
webern Jul 6, 2017
aeb6eb5
mx-version-0.2.0.22
webern Jul 6, 2017
4a5a980
mxapi add processing instructions
webern Jul 6, 2017
19f0abf
mx-version-0.2.0.23
webern Jul 6, 2017
0ac9e94
more chord symbol work
webern Jul 6, 2017
a1cf291
mx-version-0.2.0.24
webern Jul 6, 2017
214e37e
mxapi not much
webern Jul 10, 2017
87deb22
mxapi Barlines (#12)
Jul 17, 2017
e889d32
mxapi fix broken test
webern Jul 17, 2017
8f9d185
mx-version-0.2.0.25
webern Jul 17, 2017
d91a3b8
Feature/mxapi (#14)
Jul 20, 2017
c8f48e8
Feature/repeats (#15)
Jul 20, 2017
a9e45a1
Merge branch 'feature/mxapi' of https://github.com/Webern/MusicXML-Cl…
webern Jul 20, 2017
8e015b9
mx-version-0.2.0.26
webern Jul 20, 2017
f7747b9
mxapi add chord positioning
webern Jul 25, 2017
3dbb264
mx-version-0.2.0.27
webern Jul 25, 2017
0838559
mxapi read and write note position data
webern Jul 27, 2017
38cc0b6
mx-version-0.2.0.28
webern Jul 27, 2017
438fe32
mxapi barline work
webern Jul 28, 2017
f8a3cec
mx-version-0.2.0.29
webern Jul 28, 2017
4255f3c
mxapi fix measure rest writing
webern Jul 30, 2017
cbc92e4
mx-version-0.2.0.30
webern Jul 30, 2017
450412f
mxapi fix another measure rest issue
webern Jul 30, 2017
53010d7
mx-version-0.2.0.31
webern Jul 30, 2017
2539aed
mx-version-0.2.0.32
webern Jul 30, 2017
483a775
mxapi add failing freezing pieces test viola measure 7
webern Jul 31, 2017
a05a76e
mxapi freezing tests
webern Aug 17, 2017
390625c
mxapi more freezing tests
webern Aug 17, 2017
0bebaf8
mxapi freezing tests
webern Aug 17, 2017
082227f
mxapi backmerge develop
webern Nov 20, 2017
f58547f
Merge branch 'develop' into feature/mxapi
webern Mar 18, 2018
1f5d434
Feature/mxapi (#17)
Jun 1, 2018
50f6fd2
Merge branch 'develop' into feature/mxapi
webern Jun 25, 2018
3363b2f
Merge branch 'develop' into feature/mxapi Conflicts: Xcode/MxiOS/Info…
webern Jun 25, 2018
18fae52
use sparsepp to avoid smufl crash (#18)
diskzero Sep 17, 2018
a72933d
smufl map carnage
webern Nov 5, 2018
a3a0b81
version
webern Nov 5, 2018
fdbeee1
mx-version-0.3.1.37
webern Nov 5, 2018
6efaff4
nothing
webern Apr 7, 2019
e67104b
gitignore
webern Apr 7, 2019
fc98e20
remove sublime workspace
webern Apr 7, 2019
ea504be
ignore sublime workspace
webern Apr 7, 2019
e611455
ci and gcc work
webern Apr 7, 2019
8f792e7
Merge branch 'master' into develop
webern Apr 7, 2019
890f999
Merge branch 'develop' into feature/mxapi
webern Apr 7, 2019
fd39249
pesky sublime workspace
webern Apr 7, 2019
2466f1e
sublime workspace ignore
webern Apr 7, 2019
0806241
ci
webern Apr 7, 2019
a5aecc2
ci work
webern Apr 7, 2019
ce86d79
ci work and gcc
webern Apr 7, 2019
7dd9b1d
circleci
webern Apr 7, 2019
fd1fdd6
circleci
webern Apr 7, 2019
5ab43e0
circleci
webern Apr 7, 2019
deef5f5
test stuff
webern Apr 7, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions .circleci/Dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM matthewjamesbriggs/mxci:v001

ENV BASEDIR="/mx"
WORKDIR $BASEDIR
COPY . .
CMD cmake . && make -j12 && ./MxTest
59 changes: 59 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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/
18 changes: 18 additions & 0 deletions .circleci/docker.sh
Original file line number Diff line number Diff line change
@@ -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
Loading