From c6c16936588352790ee3c63312587a2b1206ec06 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Mon, 20 Jul 2015 19:58:04 -0700 Subject: [PATCH 01/25] a origin2upstream script in order to set the origin to personal forks and disable the push url on the upstream --- CI/origin2upstream.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 CI/origin2upstream.sh diff --git a/CI/origin2upstream.sh b/CI/origin2upstream.sh new file mode 100755 index 0000000..c330040 --- /dev/null +++ b/CI/origin2upstream.sh @@ -0,0 +1,40 @@ +# https://github.com/PlayScriptRedux/playscriptredux.git + +echo "For org members, all changes come through pull-requests, never direct push\n\n" + +export regex= +# Export as the foreach via git is a new shell +export GITHUBREDUX=${GITHUBREDUX:=PlayScriptRedux} +export GITHUBUSERNAME=${GITHUBUSERNAME:=`git config --global user.name`} + +# Disable pushing to upstream +git remote rename origin upstream +git remote set-url --push upstream DISABLE + +# Create new origins based on the github forks that you should have ;-) +GITHUBURI=`git config remote.upstream.url` +NEWGITHUBURI=${GITHUBURI/${GITHUBREDUX}/${GITHUBUSERNAME}} +git remote add origin ${NEWGITHUBURI} + +# no recursive for each +git submodule foreach --quiet ' \ + echo "\nUpstream change: ${name}"; \ + git remote rename origin upstream; \ + GITHUBURI=`git config remote.upstream.url`; \ + echo " Upstream URI:\t ${GITHUBURI}"; \ + echo " Disabling push:\t ${GITHUBURI}"; \ + git remote set-url --push upstream DISABLE; \ + echo "Set new origin info:"; \ + echo " Upstream URI:\t ${GITHUBURI}"; \ + foo=${GITHUBURI#https://*/}; ORGUSER=${foo%/*}; \ + NEWGITHUBURI=${GITHUBURI/${ORGUSER}/${GITHUBUSERNAME}}; \ + echo " Origin URI:\t ${NEWGITHUBURI}"; \ + git remote add origin ${NEWGITHUBURI}; \ + # the following is to fixup failed runs...and to exit with a return of zero \ + git remote set-url origin ${NEWGITHUBURI}; \ +' + +git submodule foreach --quiet ' \ + git remote -v +' + From 761ed17aede59266a08fabe4495ff909033d664e Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Wed, 22 Jul 2015 21:44:39 -0700 Subject: [PATCH 02/25] More submodule updating to bring the whole project under control --- .gitmodules | 10 ++++++++++ CI/build.monodevelop.sh | 10 ++++++++++ CI/build.monomac.sh | 5 +++++ PlayScriptRedux/PlayScriptRedux.mdw | 8 ++++++++ Whack | 1 + away3d-core-fp11 | 2 +- away3d-examples-fp11 | 1 + monomac | 1 + playscript | 2 +- 9 files changed, 38 insertions(+), 2 deletions(-) create mode 100755 CI/build.monodevelop.sh create mode 100755 CI/build.monomac.sh create mode 100644 PlayScriptRedux/PlayScriptRedux.mdw create mode 160000 Whack create mode 160000 away3d-examples-fp11 create mode 160000 monomac diff --git a/.gitmodules b/.gitmodules index 53ac8db..a963c5c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,19 @@ [submodule "playscriptredux.github.io"] path = playscriptredux.github.io url = https://github.com/PlayScriptRedux/playscriptredux.github.io.git +[submodule "away3d-examples-fp11"] + path = away3d-examples-fp11 + url = https://github.com/PlayScriptRedux/away3d-examples-fp11.git [submodule "Make2CSProjUpdater"] path = Make2CSProjUpdater url = https://github.com/PlayScriptRedux/Make2CSProjUpdater.git [submodule "away3d-core-fp11"] path = away3d-core-fp11 url = https://github.com/PlayScriptRedux/away3d-core-fp11.git +[submodule "monomac"] + path = monomac + url = https://github.com/PlayScriptRedux/monomac.git +[submodule "Whack"] + path = Whack + url = https://github.com/PlayScriptRedux/Whack.git + diff --git a/CI/build.monodevelop.sh b/CI/build.monodevelop.sh new file mode 100755 index 0000000..ddff98d --- /dev/null +++ b/CI/build.monodevelop.sh @@ -0,0 +1,10 @@ + +pushd monodevelop +./configure --profile=mac + +# Packaging for OS X +cd main/build/MacOSX +make + +popd + diff --git a/CI/build.monomac.sh b/CI/build.monomac.sh new file mode 100755 index 0000000..2c9fc80 --- /dev/null +++ b/CI/build.monomac.sh @@ -0,0 +1,5 @@ +#!/bin/bash +pushd monomac/src +make $@ +popd + diff --git a/PlayScriptRedux/PlayScriptRedux.mdw b/PlayScriptRedux/PlayScriptRedux.mdw new file mode 100644 index 0000000..10433ad --- /dev/null +++ b/PlayScriptRedux/PlayScriptRedux.mdw @@ -0,0 +1,8 @@ + + + ../Make2CSProjUpdater/Make2CSProjUpdater.sln + ../away3d-core-fp11/away3d-core-monomac.sln + ../away3d-examples-fp11/away3d-examples.sln + ../playscript-base/PlayScript.Application.OSX/PlayScript.Application.OSX.sln + + \ No newline at end of file diff --git a/Whack b/Whack new file mode 160000 index 0000000..09ee587 --- /dev/null +++ b/Whack @@ -0,0 +1 @@ +Subproject commit 09ee587afd6acff6a9c7c18799bb16b0fa25705d diff --git a/away3d-core-fp11 b/away3d-core-fp11 index d5f09fa..5951a7b 160000 --- a/away3d-core-fp11 +++ b/away3d-core-fp11 @@ -1 +1 @@ -Subproject commit d5f09fa2f457832f4279b46f8f626975efe25ed2 +Subproject commit 5951a7becefdd0e1bf2445dce1cf5de69556205b diff --git a/away3d-examples-fp11 b/away3d-examples-fp11 new file mode 160000 index 0000000..9fb5d7d --- /dev/null +++ b/away3d-examples-fp11 @@ -0,0 +1 @@ +Subproject commit 9fb5d7dba09e698db9e0ce53d8dfb893a0ca1169 diff --git a/monomac b/monomac new file mode 160000 index 0000000..1833e7a --- /dev/null +++ b/monomac @@ -0,0 +1 @@ +Subproject commit 1833e7a0f3a99753bd42242e0572a631d7137615 diff --git a/playscript b/playscript index 5ab84d0..b1f47d9 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 5ab84d00465c858bddafd4f3463d02e72036d809 +Subproject commit b1f47d956c358bf26939900c8b93c18d46637c49 From ce2be86b6f04610cb26cc308988cbc0bdb4c70d4 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Wed, 22 Jul 2015 23:40:07 -0700 Subject: [PATCH 03/25] Add Starling-framework (sync'd with upstream and the origin playscript version that is now on the playscript branch --- .gitmodules | 3 +++ Starling-Framework | 1 + 2 files changed, 4 insertions(+) create mode 160000 Starling-Framework diff --git a/.gitmodules b/.gitmodules index a963c5c..2b2d438 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,4 +22,7 @@ [submodule "Whack"] path = Whack url = https://github.com/PlayScriptRedux/Whack.git +[submodule "Starling-Framework"] + path = Starling-Framework + url = https://github.com/PlayScriptRedux/Starling-Framework.git diff --git a/Starling-Framework b/Starling-Framework new file mode 160000 index 0000000..26e904b --- /dev/null +++ b/Starling-Framework @@ -0,0 +1 @@ +Subproject commit 26e904b45869c04d71a5ed58fc633499e91f551e From c27a9b64c1346dd9c26808332fc903228fee62b7 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Wed, 29 Jul 2015 12:59:06 -0700 Subject: [PATCH 04/25] Update submodules to match play-3.2.3001 --- Make2CSProjUpdater | 2 +- PlayScriptRedux/PlayScriptRedux.mdw | 1 + away3d-core-fp11 | 2 +- away3d-examples-fp11 | 2 +- playscript | 2 +- playscriptredux.github.io | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Make2CSProjUpdater b/Make2CSProjUpdater index d2c0052..a7eec13 160000 --- a/Make2CSProjUpdater +++ b/Make2CSProjUpdater @@ -1 +1 @@ -Subproject commit d2c00527693f23564086ff8ff72ea53221d626c3 +Subproject commit a7eec13d90f9d91079df5cc8d8c8239dff2db70b diff --git a/PlayScriptRedux/PlayScriptRedux.mdw b/PlayScriptRedux/PlayScriptRedux.mdw index 10433ad..628aa58 100644 --- a/PlayScriptRedux/PlayScriptRedux.mdw +++ b/PlayScriptRedux/PlayScriptRedux.mdw @@ -4,5 +4,6 @@ ../away3d-core-fp11/away3d-core-monomac.sln ../away3d-examples-fp11/away3d-examples.sln ../playscript-base/PlayScript.Application.OSX/PlayScript.Application.OSX.sln + ../playscript/mcs/class/Mono.PlayScript/Mono.PlayScript.sln \ No newline at end of file diff --git a/away3d-core-fp11 b/away3d-core-fp11 index 5951a7b..a36a1f4 160000 --- a/away3d-core-fp11 +++ b/away3d-core-fp11 @@ -1 +1 @@ -Subproject commit 5951a7becefdd0e1bf2445dce1cf5de69556205b +Subproject commit a36a1f4850b2544df3387b40b8d2d7191221379f diff --git a/away3d-examples-fp11 b/away3d-examples-fp11 index 9fb5d7d..77bf33e 160000 --- a/away3d-examples-fp11 +++ b/away3d-examples-fp11 @@ -1 +1 @@ -Subproject commit 9fb5d7dba09e698db9e0ce53d8dfb893a0ca1169 +Subproject commit 77bf33ec68da9cf671630de3708e2c6921b6be07 diff --git a/playscript b/playscript index b1f47d9..964d7ed 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit b1f47d956c358bf26939900c8b93c18d46637c49 +Subproject commit 964d7ed885c748337855a1cd2d3b77e2afb6c79d diff --git a/playscriptredux.github.io b/playscriptredux.github.io index b51c4ad..24308bd 160000 --- a/playscriptredux.github.io +++ b/playscriptredux.github.io @@ -1 +1 @@ -Subproject commit b51c4ad13c11dcb6de49123099359fc44cd20b11 +Subproject commit 24308bd5a47e333649280ab4b24328f90b7d5151 From 87e4e93b13fbb0908d89437efcd668a8680896ad Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 31 Jul 2015 20:26:11 -0700 Subject: [PATCH 05/25] submodule updates --- .gitmodules | 3 --- CI/build.monodevelop.sh | 10 --------- CI/build.monomac.sh | 5 ----- CI/monodevelop.build.Darwin.sh | 15 +++++++++++++ CI/origin2upstream.sh | 40 ---------------------------------- CI/setup.sh | 3 --- Whack | 1 - playscript | 2 +- 8 files changed, 16 insertions(+), 63 deletions(-) delete mode 100755 CI/build.monodevelop.sh delete mode 100755 CI/build.monomac.sh create mode 100755 CI/monodevelop.build.Darwin.sh delete mode 100755 CI/origin2upstream.sh delete mode 100755 CI/setup.sh delete mode 160000 Whack diff --git a/.gitmodules b/.gitmodules index 2b2d438..285ffd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "monomac"] path = monomac url = https://github.com/PlayScriptRedux/monomac.git -[submodule "Whack"] - path = Whack - url = https://github.com/PlayScriptRedux/Whack.git [submodule "Starling-Framework"] path = Starling-Framework url = https://github.com/PlayScriptRedux/Starling-Framework.git diff --git a/CI/build.monodevelop.sh b/CI/build.monodevelop.sh deleted file mode 100755 index ddff98d..0000000 --- a/CI/build.monodevelop.sh +++ /dev/null @@ -1,10 +0,0 @@ - -pushd monodevelop -./configure --profile=mac - -# Packaging for OS X -cd main/build/MacOSX -make - -popd - diff --git a/CI/build.monomac.sh b/CI/build.monomac.sh deleted file mode 100755 index 2c9fc80..0000000 --- a/CI/build.monomac.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -pushd monomac/src -make $@ -popd - diff --git a/CI/monodevelop.build.Darwin.sh b/CI/monodevelop.build.Darwin.sh new file mode 100755 index 0000000..abcfbed --- /dev/null +++ b/CI/monodevelop.build.Darwin.sh @@ -0,0 +1,15 @@ + +pushd monodevelop +git fetch mono +git reset --hard +git checkout origin/master +git pull mono master +git submodule update --init --recursive +./configure --profile=mac --prefix=${HOME}/mono/monodevelop +make +pushd main/build/MacOSX +make +./make-dmg-bundle.sh +popd +popd + diff --git a/CI/origin2upstream.sh b/CI/origin2upstream.sh deleted file mode 100755 index c330040..0000000 --- a/CI/origin2upstream.sh +++ /dev/null @@ -1,40 +0,0 @@ -# https://github.com/PlayScriptRedux/playscriptredux.git - -echo "For org members, all changes come through pull-requests, never direct push\n\n" - -export regex= -# Export as the foreach via git is a new shell -export GITHUBREDUX=${GITHUBREDUX:=PlayScriptRedux} -export GITHUBUSERNAME=${GITHUBUSERNAME:=`git config --global user.name`} - -# Disable pushing to upstream -git remote rename origin upstream -git remote set-url --push upstream DISABLE - -# Create new origins based on the github forks that you should have ;-) -GITHUBURI=`git config remote.upstream.url` -NEWGITHUBURI=${GITHUBURI/${GITHUBREDUX}/${GITHUBUSERNAME}} -git remote add origin ${NEWGITHUBURI} - -# no recursive for each -git submodule foreach --quiet ' \ - echo "\nUpstream change: ${name}"; \ - git remote rename origin upstream; \ - GITHUBURI=`git config remote.upstream.url`; \ - echo " Upstream URI:\t ${GITHUBURI}"; \ - echo " Disabling push:\t ${GITHUBURI}"; \ - git remote set-url --push upstream DISABLE; \ - echo "Set new origin info:"; \ - echo " Upstream URI:\t ${GITHUBURI}"; \ - foo=${GITHUBURI#https://*/}; ORGUSER=${foo%/*}; \ - NEWGITHUBURI=${GITHUBURI/${ORGUSER}/${GITHUBUSERNAME}}; \ - echo " Origin URI:\t ${NEWGITHUBURI}"; \ - git remote add origin ${NEWGITHUBURI}; \ - # the following is to fixup failed runs...and to exit with a return of zero \ - git remote set-url origin ${NEWGITHUBURI}; \ -' - -git submodule foreach --quiet ' \ - git remote -v -' - diff --git a/CI/setup.sh b/CI/setup.sh deleted file mode 100755 index cb6757a..0000000 --- a/CI/setup.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -git submodule update -init -recursive - diff --git a/Whack b/Whack deleted file mode 160000 index 09ee587..0000000 --- a/Whack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 09ee587afd6acff6a9c7c18799bb16b0fa25705d diff --git a/playscript b/playscript index 964d7ed..a31747f 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 964d7ed885c748337855a1cd2d3b77e2afb6c79d +Subproject commit a31747f6e3a19ef19a2413ffccf3f8ea51901b3c From 14953e26fbf4ecaceee57661ba00655cd3591195 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Thu, 6 Aug 2015 15:39:24 -0700 Subject: [PATCH 06/25] Play 3.2.6002 updates --- CI/{monodevelop.build.Darwin.sh => monodevelop.osx.build.sh} | 0 away3d-examples-fp11 | 2 +- monodevelop | 2 +- playscript | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename CI/{monodevelop.build.Darwin.sh => monodevelop.osx.build.sh} (100%) diff --git a/CI/monodevelop.build.Darwin.sh b/CI/monodevelop.osx.build.sh similarity index 100% rename from CI/monodevelop.build.Darwin.sh rename to CI/monodevelop.osx.build.sh diff --git a/away3d-examples-fp11 b/away3d-examples-fp11 index 77bf33e..ebcc2c9 160000 --- a/away3d-examples-fp11 +++ b/away3d-examples-fp11 @@ -1 +1 @@ -Subproject commit 77bf33ec68da9cf671630de3708e2c6921b6be07 +Subproject commit ebcc2c9433987ec69acb27d14f28d32fff67dca3 diff --git a/monodevelop b/monodevelop index 6208cfa..7071800 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 6208cfa904cf5336b5a9f0b53110683cff49969f +Subproject commit 707180055e4aa755a381e71c016c43779a668b4b diff --git a/playscript b/playscript index a31747f..4bf7ccb 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit a31747f6e3a19ef19a2413ffccf3f8ea51901b3c +Subproject commit 4bf7ccbdc26211cb26321524eb58407ec1f4cf65 From cea3d7d55331681bf0b7b64d5d19fe4bbe6b1a87 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sat, 8 Aug 2015 16:11:17 -0700 Subject: [PATCH 07/25] Update playscript (3.2.7+) and monodevelop (upstream/master) --- monodevelop | 2 +- playscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monodevelop b/monodevelop index 7071800..baa8c34 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 707180055e4aa755a381e71c016c43779a668b4b +Subproject commit baa8c3458cf01d00e548164b8817123f6569b334 diff --git a/playscript b/playscript index 4bf7ccb..2c790f8 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 4bf7ccbdc26211cb26321524eb58407ec1f4cf65 +Subproject commit 2c790f898a2a9c16b598c5ddf144ff62a904f805 From 2fc44d214b8d2f629c5742765b2bb580419feea3 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sun, 16 Aug 2015 14:36:31 -0700 Subject: [PATCH 08/25] Sync with play-3.4.1003 --- away3d-examples-fp11 | 2 +- playscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/away3d-examples-fp11 b/away3d-examples-fp11 index ebcc2c9..baa69a2 160000 --- a/away3d-examples-fp11 +++ b/away3d-examples-fp11 @@ -1 +1 @@ -Subproject commit ebcc2c9433987ec69acb27d14f28d32fff67dca3 +Subproject commit baa69a229e04dee83385f7b58ad01fad55d5dea8 diff --git a/playscript b/playscript index 2c790f8..7dd44e4 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 2c790f898a2a9c16b598c5ddf144ff62a904f805 +Subproject commit 7dd44e4ce6bb5a028c00973af380d69812795439 From 6bead7b160291fe28a62f410bc710f7994220623 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sun, 16 Aug 2015 16:49:11 -0700 Subject: [PATCH 09/25] Bump for starling submodule --- Starling-Framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Starling-Framework b/Starling-Framework index 26e904b..b785d64 160000 --- a/Starling-Framework +++ b/Starling-Framework @@ -1 +1 @@ -Subproject commit 26e904b45869c04d71a5ed58fc633499e91f551e +Subproject commit b785d648908dc32572150372e5875194dca2762e From dc0214fb8b70481c45867eff5c6d01ac758a80a6 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sat, 31 Oct 2015 03:59:12 -0700 Subject: [PATCH 10/25] Update super project with new MD bindings and versions --- .gitmodules | 3 +++ Starling-Framework | 2 +- monodevelop | 2 +- playscript | 2 +- playscript-binding | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) create mode 160000 playscript-binding diff --git a/.gitmodules b/.gitmodules index 285ffd3..d0d06b4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,6 @@ path = Starling-Framework url = https://github.com/PlayScriptRedux/Starling-Framework.git +[submodule "playscript-binding"] + path = playscript-binding + url = ./playscript-binding diff --git a/Starling-Framework b/Starling-Framework index b785d64..fa1ae33 160000 --- a/Starling-Framework +++ b/Starling-Framework @@ -1 +1 @@ -Subproject commit b785d648908dc32572150372e5875194dca2762e +Subproject commit fa1ae334a375b188cbf33271582b71fdbbcaab33 diff --git a/monodevelop b/monodevelop index baa8c34..1dc7781 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit baa8c3458cf01d00e548164b8817123f6569b334 +Subproject commit 1dc778126381fd40fc8c538a30ad62edad1ae9d4 diff --git a/playscript b/playscript index 7dd44e4..c7777f7 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 7dd44e4ce6bb5a028c00973af380d69812795439 +Subproject commit c7777f75f4f6b523239d246ba0283f7cddb3b96b diff --git a/playscript-binding b/playscript-binding new file mode 160000 index 0000000..7a96762 --- /dev/null +++ b/playscript-binding @@ -0,0 +1 @@ +Subproject commit 7a967626be5e81e2767a33511f64077132b5d8f4 From 8ac3a63f6351afbc74b8cf453e375872c6924c25 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Thu, 3 Dec 2015 06:43:09 -0800 Subject: [PATCH 11/25] Remove Make2CSProjUpdater submodule --- .gitmodules | 3 --- Make2CSProjUpdater | 1 - 2 files changed, 4 deletions(-) delete mode 160000 Make2CSProjUpdater diff --git a/.gitmodules b/.gitmodules index d0d06b4..a892114 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "away3d-examples-fp11"] path = away3d-examples-fp11 url = https://github.com/PlayScriptRedux/away3d-examples-fp11.git -[submodule "Make2CSProjUpdater"] - path = Make2CSProjUpdater - url = https://github.com/PlayScriptRedux/Make2CSProjUpdater.git [submodule "away3d-core-fp11"] path = away3d-core-fp11 url = https://github.com/PlayScriptRedux/away3d-core-fp11.git diff --git a/Make2CSProjUpdater b/Make2CSProjUpdater deleted file mode 160000 index a7eec13..0000000 --- a/Make2CSProjUpdater +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a7eec13d90f9d91079df5cc8d8c8239dff2db70b From fe57c1050a36b5b00ec5c874331f340a7e236d27 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Thu, 3 Dec 2015 06:44:59 -0800 Subject: [PATCH 12/25] Add CI for initial git submodule population --- CI/git.submodules.initial.setup.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 CI/git.submodules.initial.setup.sh diff --git a/CI/git.submodules.initial.setup.sh b/CI/git.submodules.initial.setup.sh new file mode 100755 index 0000000..f2a3f61 --- /dev/null +++ b/CI/git.submodules.initial.setup.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git submodule update --init --recursive + From c8618f0f0299d1963be2ec4f8eb9b2bc75b086de Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 4 Dec 2015 17:38:06 -0800 Subject: [PATCH 13/25] Update CI files and submodules --- .gitmodules | 9 ++++++--- CI/git.fork.setup.sh | 33 ++++++++++++++++++++++++++++++++ CI/git.update.mono2playscript.sh | 28 +++++++++++++++++++++++++++ CI/git.update.monodevelop.sh | 23 ++++++++++++++++++++++ CI/monodevelop.osx.build.sh | 4 ++-- mono | 1 + mono-llvm | 1 + monodevelop | 2 +- playscript | 2 +- playscript-binding | 1 - 10 files changed, 96 insertions(+), 8 deletions(-) create mode 100755 CI/git.fork.setup.sh create mode 100755 CI/git.update.mono2playscript.sh create mode 100755 CI/git.update.monodevelop.sh create mode 160000 mono create mode 160000 mono-llvm delete mode 160000 playscript-binding diff --git a/.gitmodules b/.gitmodules index a892114..627106d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,6 +20,9 @@ path = Starling-Framework url = https://github.com/PlayScriptRedux/Starling-Framework.git -[submodule "playscript-binding"] - path = playscript-binding - url = ./playscript-binding +[submodule "mono"] + path = mono + url = https://github.com/mono/mono.git +[submodule "mono-llvm"] + path = mono-llvm + url = git://github.com/mono/llvm.git diff --git a/CI/git.fork.setup.sh b/CI/git.fork.setup.sh new file mode 100755 index 0000000..8f9a179 --- /dev/null +++ b/CI/git.fork.setup.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +# mono +pushd playscript +git remote add mono https://github.com/mono/mono.git +git remote set-url --push mono DISABLE + +git remote rename origin upstream + +# if this is a dev setup, add origin +if [ -z ${GIT_USER+x} ]; then + echo "No GIT_USER assigned" +else + git remote add origin https://github.com/${GIT_USER}/playscript.git +fi +popd + +# monodevelop +pushd monodevelop +git remote add mono https://github.com/mono/monodevelop.git +git remote set-url --push mono DISABLE + +git remote rename origin upstream + +# if this is a dev setup, add origin +if [ -z ${GIT_USER+x} ]; then + echo "No GIT_USER assigned" +else + git remote add origin https://github.com/${GIT_USER}/playscript.git +fi +popd + + diff --git a/CI/git.update.mono2playscript.sh b/CI/git.update.mono2playscript.sh new file mode 100755 index 0000000..de0db54 --- /dev/null +++ b/CI/git.update.mono2playscript.sh @@ -0,0 +1,28 @@ +#!/bin/bash +pushd playscript + +# Danger, this is for sync'ing the master redux, not a dev's repo +git reset --hard +git clean -d -f + +git fetch mono +git fetch upstream master # avoid the initial: src refspec master does not match any. +# Following needed to setup the initial master tracking branch +git checkout -t -b master remotes/upstream/master +git checkout master +git merge mono/master +git push upstream master +if [ -z ${GIT_USER+x} ]; then + echo "No GIT_USER assigned" +else + git push origin master +fi +# Checkout playscript branch back out so super project commits tracks that branch +git checkout playscript + +popd + +pushd mono +git fetch origin +popd + diff --git a/CI/git.update.monodevelop.sh b/CI/git.update.monodevelop.sh new file mode 100755 index 0000000..317457c --- /dev/null +++ b/CI/git.update.monodevelop.sh @@ -0,0 +1,23 @@ +#!/bin/bash +pushd monodevelop + +# Danger, this is for sync'ing a master +git reset --hard +git clean -d -f + +git fetch mono +git fetch upstream master # avoid the initial: src refspec master does not match any. +# Following needed to setup the initial master tracking branch +git checkout -t -b master remotes/upstream/master +git checkout master +git merge mono/master +git push upstream master +if [ -z ${GIT_USER+x} ]; then + echo "No GIT_USER assigned" +else + git push origin master +fi + +popd + + diff --git a/CI/monodevelop.osx.build.sh b/CI/monodevelop.osx.build.sh index abcfbed..26b0e45 100755 --- a/CI/monodevelop.osx.build.sh +++ b/CI/monodevelop.osx.build.sh @@ -1,8 +1,8 @@ - +#!/bin/bash pushd monodevelop git fetch mono git reset --hard -git checkout origin/master +git checkout upstream/master git pull mono master git submodule update --init --recursive ./configure --profile=mac --prefix=${HOME}/mono/monodevelop diff --git a/mono b/mono new file mode 160000 index 0000000..38aa91b --- /dev/null +++ b/mono @@ -0,0 +1 @@ +Subproject commit 38aa91b1af44f63b72fa7f29a015296029cee167 diff --git a/mono-llvm b/mono-llvm new file mode 160000 index 0000000..9f79399 --- /dev/null +++ b/mono-llvm @@ -0,0 +1 @@ +Subproject commit 9f79399f87282524fee099b328bd8cbf07929daf diff --git a/monodevelop b/monodevelop index 1dc7781..4eae12a 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 1dc778126381fd40fc8c538a30ad62edad1ae9d4 +Subproject commit 4eae12a980be57aba65f32a34d9596e6aa8fd4ae diff --git a/playscript b/playscript index c7777f7..36721f5 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit c7777f75f4f6b523239d246ba0283f7cddb3b96b +Subproject commit 36721f5b35ac14abfa555de508d61cbedb46612c diff --git a/playscript-binding b/playscript-binding deleted file mode 160000 index 7a96762..0000000 --- a/playscript-binding +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7a967626be5e81e2767a33511f64077132b5d8f4 From f5bc6d98c0234972920a1079433812c94b2fc200 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sat, 5 Dec 2015 20:43:01 -0800 Subject: [PATCH 14/25] Adding mono's llvm to CI --- CI/ccache.enable.sh | 9 +++++++++ CI/mono.llvm.osx.32bit.build.sh | 15 +++++++++++++++ CI/mono.llvm.osx.64bit.build.sh | 14 ++++++++++++++ 3 files changed, 38 insertions(+) create mode 100755 CI/ccache.enable.sh create mode 100755 CI/mono.llvm.osx.32bit.build.sh create mode 100755 CI/mono.llvm.osx.64bit.build.sh diff --git a/CI/ccache.enable.sh b/CI/ccache.enable.sh new file mode 100755 index 0000000..95a3257 --- /dev/null +++ b/CI/ccache.enable.sh @@ -0,0 +1,9 @@ +[[ "${BASH_SOURCE[0]}" != "${0}" ]] && SOURCED=1 || SOURCED=0 +if [ $SOURCED -eq 1 ] +then + # use ccache + export PATH=/usr/local/opt/ccache/libexec:${PATH} +else + echo This script needs to be called via "source" +fi + diff --git a/CI/mono.llvm.osx.32bit.build.sh b/CI/mono.llvm.osx.32bit.build.sh new file mode 100755 index 0000000..113faa7 --- /dev/null +++ b/CI/mono.llvm.osx.32bit.build.sh @@ -0,0 +1,15 @@ +#!/bin/bash +pushd mono-llvm + +git fetch --all +git reset --hard +git checkout mono/master +git merge origin master +./configure --prefix=${HOME}/mono/llvm32 \ + --enable-optimized \ + --enable-targets="x86 x86_64" \ + --target=i386-apple-darwin15.0.0 +make clean +make && make install + +popd diff --git a/CI/mono.llvm.osx.64bit.build.sh b/CI/mono.llvm.osx.64bit.build.sh new file mode 100755 index 0000000..c1a2b21 --- /dev/null +++ b/CI/mono.llvm.osx.64bit.build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +pushd mono-llvm + +git fetch --all +git reset --hard +git checkout mono/master +git merge origin master +./configure --prefix=${HOME}/mono/llvm64 \ + --enable-optimized \ + --enable-targets="x86 x86_64" +make clean +make && make install + +popd From 32dd3e3ecafc020567fbb006c34f24b4d58be9f0 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Sun, 6 Dec 2015 08:41:45 -0800 Subject: [PATCH 15/25] Add llvm to CI builds --- ...mono.llvm.osx.32bit.build.sh => mono.llvm.osx.i386.sh} | 2 +- ...no.llvm.osx.64bit.build.sh => mono.llvm.osx.x86_64.sh} | 0 CI/{monodevelop.osx.build.sh => monodevelop.osx.i386.sh} | 0 CI/play.llvm.osx.build.small.i386.sh | 8 ++++++++ CI/play.llvm.osx.build.small.x86_64.sh | 8 ++++++++ playscript | 2 +- 6 files changed, 18 insertions(+), 2 deletions(-) rename CI/{mono.llvm.osx.32bit.build.sh => mono.llvm.osx.i386.sh} (87%) rename CI/{mono.llvm.osx.64bit.build.sh => mono.llvm.osx.x86_64.sh} (100%) rename CI/{monodevelop.osx.build.sh => monodevelop.osx.i386.sh} (100%) create mode 100755 CI/play.llvm.osx.build.small.i386.sh create mode 100755 CI/play.llvm.osx.build.small.x86_64.sh diff --git a/CI/mono.llvm.osx.32bit.build.sh b/CI/mono.llvm.osx.i386.sh similarity index 87% rename from CI/mono.llvm.osx.32bit.build.sh rename to CI/mono.llvm.osx.i386.sh index 113faa7..882f2ce 100755 --- a/CI/mono.llvm.osx.32bit.build.sh +++ b/CI/mono.llvm.osx.i386.sh @@ -8,7 +8,7 @@ git merge origin master ./configure --prefix=${HOME}/mono/llvm32 \ --enable-optimized \ --enable-targets="x86 x86_64" \ - --target=i386-apple-darwin15.0.0 + --host=i386-apple-darwin15.0.0 make clean make && make install diff --git a/CI/mono.llvm.osx.64bit.build.sh b/CI/mono.llvm.osx.x86_64.sh similarity index 100% rename from CI/mono.llvm.osx.64bit.build.sh rename to CI/mono.llvm.osx.x86_64.sh diff --git a/CI/monodevelop.osx.build.sh b/CI/monodevelop.osx.i386.sh similarity index 100% rename from CI/monodevelop.osx.build.sh rename to CI/monodevelop.osx.i386.sh diff --git a/CI/play.llvm.osx.build.small.i386.sh b/CI/play.llvm.osx.build.small.i386.sh new file mode 100755 index 0000000..4fcbe2e --- /dev/null +++ b/CI/play.llvm.osx.build.small.i386.sh @@ -0,0 +1,8 @@ +#!/bin/bash +source CI/ccache.enable.sh +CI/mono.llvm.osx.32bit.build.sh +pushd playscript +git submodule update --init --recursive +CI/play.llvm.osx.build.small.i386.sh +make install +popd diff --git a/CI/play.llvm.osx.build.small.x86_64.sh b/CI/play.llvm.osx.build.small.x86_64.sh new file mode 100755 index 0000000..53c9632 --- /dev/null +++ b/CI/play.llvm.osx.build.small.x86_64.sh @@ -0,0 +1,8 @@ +#!/bin/bash +source CI/ccache.enable.sh +CI/mono.llvm.osx.64bit.build.sh +pushd playscript +git submodule update --init --recursive +CI/play.llvm.osx.build.small.x86_64.sh +make install +popd diff --git a/playscript b/playscript index 36721f5..e2a6a29 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 36721f5b35ac14abfa555de508d61cbedb46612c +Subproject commit e2a6a2940240cd6ac75144f95279998f9c409c28 From a6a70512566339dbde16cc806709a996f38e7fb7 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Mon, 7 Dec 2015 00:25:33 -0800 Subject: [PATCH 16/25] git gc the entire superproject --- CI/git.gc.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 CI/git.gc.sh diff --git a/CI/git.gc.sh b/CI/git.gc.sh new file mode 100755 index 0000000..34d8f84 --- /dev/null +++ b/CI/git.gc.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git submodule foreach --recursive git gc + From ed2e9bb8761d5e42b430faf99a73ee0f00c84dbe Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Mon, 7 Dec 2015 07:15:39 -0800 Subject: [PATCH 17/25] Update mono & playscript repos --- CI/git.update.mono.sh | 10 ++++++++++ CI/git.update.mono2playscript.sh | 5 +---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100755 CI/git.update.mono.sh diff --git a/CI/git.update.mono.sh b/CI/git.update.mono.sh new file mode 100755 index 0000000..5072a52 --- /dev/null +++ b/CI/git.update.mono.sh @@ -0,0 +1,10 @@ +#!/bin/bash +pushd mono + +# Danger, this is for sync'ing the master redux, not a dev's repo +git reset --hard +git clean -d -f +git checkout master +git pull + +popd diff --git a/CI/git.update.mono2playscript.sh b/CI/git.update.mono2playscript.sh index de0db54..acc2d59 100755 --- a/CI/git.update.mono2playscript.sh +++ b/CI/git.update.mono2playscript.sh @@ -19,10 +19,7 @@ else fi # Checkout playscript branch back out so super project commits tracks that branch git checkout playscript +git pull popd -pushd mono -git fetch origin -popd - From aeadaaea2a1ba53a3bedc19449e98b4f51b83f8f Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Wed, 9 Dec 2015 22:30:04 -0800 Subject: [PATCH 18/25] Bump mono, monodevelop --- CI/git.update-all.sh | 3 +++ mono | 2 +- monodevelop | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100755 CI/git.update-all.sh diff --git a/CI/git.update-all.sh b/CI/git.update-all.sh new file mode 100755 index 0000000..78b701f --- /dev/null +++ b/CI/git.update-all.sh @@ -0,0 +1,3 @@ +#!/bin/bash +find . -name "git.update.*" -print0 | xargs -0 -n 1 -J % sh -c % + diff --git a/mono b/mono index 38aa91b..4f9c74a 160000 --- a/mono +++ b/mono @@ -1 +1 @@ -Subproject commit 38aa91b1af44f63b72fa7f29a015296029cee167 +Subproject commit 4f9c74a2c4dbfed27d09dcb99d4d590a036d6f69 diff --git a/monodevelop b/monodevelop index 4eae12a..cde2746 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 4eae12a980be57aba65f32a34d9596e6aa8fd4ae +Subproject commit cde2746ac6ce6506dcfbc59654ec90eaf8d8ab27 From 5dae5e3e620068add76d6e86e590d781c3ec974f Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Thu, 10 Dec 2015 16:06:21 -0800 Subject: [PATCH 19/25] Fix broken monodevelop build --- CI/monodevelop.osx.i386.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CI/monodevelop.osx.i386.sh b/CI/monodevelop.osx.i386.sh index 26b0e45..7802aa7 100755 --- a/CI/monodevelop.osx.i386.sh +++ b/CI/monodevelop.osx.i386.sh @@ -4,11 +4,22 @@ git fetch mono git reset --hard git checkout upstream/master git pull mono master +gut submodule sync git submodule update --init --recursive -./configure --profile=mac --prefix=${HOME}/mono/monodevelop +./configure --prefix=${HOME}/mono/monodevelop +make clean + +# Quick fix for broken build +pushd monodevelop//main/external/fsharpbinding/ +git reset --hard +./configure.sh make -pushd main/build/MacOSX +popd + make +pushd main/build/MacOSX +make render.exe +make app ./make-dmg-bundle.sh popd popd From cf14a91544bf7b884e7a39df66d01a23f3ae2242 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Thu, 10 Dec 2015 18:55:14 -0800 Subject: [PATCH 20/25] Bump mono and monodevelop (6.0) Add some CI scripts --- CI/mono-llvm32.enable.sh | 8 +++++ CI/mono-llvm64.enable.sh | 8 +++++ CI/mono.osx.build.small.i386.sh | 46 +++++++++++++++++++++++++ CI/monoWithllvm.osx.build.small.i386.sh | 6 ++++ monodevelop | 2 +- 5 files changed, 69 insertions(+), 1 deletion(-) create mode 100755 CI/mono-llvm32.enable.sh create mode 100755 CI/mono-llvm64.enable.sh create mode 100755 CI/mono.osx.build.small.i386.sh create mode 100755 CI/monoWithllvm.osx.build.small.i386.sh diff --git a/CI/mono-llvm32.enable.sh b/CI/mono-llvm32.enable.sh new file mode 100755 index 0000000..70ae0d3 --- /dev/null +++ b/CI/mono-llvm32.enable.sh @@ -0,0 +1,8 @@ +[[ "${BASH_SOURCE[0]}" != "${0}" ]] && SOURCED=1 || SOURCED=0 +if [ $SOURCED -eq 1 ] +then + export PATH=${HOME}/mono/llvm32/bin:$PATH +else + echo This script needs to be called via "source" +fi + diff --git a/CI/mono-llvm64.enable.sh b/CI/mono-llvm64.enable.sh new file mode 100755 index 0000000..f5d0491 --- /dev/null +++ b/CI/mono-llvm64.enable.sh @@ -0,0 +1,8 @@ +[[ "${BASH_SOURCE[0]}" != "${0}" ]] && SOURCED=1 || SOURCED=0 +if [ $SOURCED -eq 1 ] +then + export PATH=${HOME}/mono/llvm64/bin:$PATH +else + echo This script needs to be called via "source" +fi + diff --git a/CI/mono.osx.build.small.i386.sh b/CI/mono.osx.build.small.i386.sh new file mode 100755 index 0000000..9ad2129 --- /dev/null +++ b/CI/mono.osx.build.small.i386.sh @@ -0,0 +1,46 @@ +#!/bin/bash +pushd mono +git submodule update --init --recursive + +if [ -z ${MonoInstallPath+x} ] +then + MonoInstallPath=$HOME/mono/mono +else + echo ${MonoInstallPath} +fi + +echo "Building mono framework to `${MonoInstallPath}` folder" + +# Fix for 2.2.4 vs 2.4.6 glibtool +rm libgc/aclocal.m4 + +# If rebuilding and you fail, you can not do a make clean as it trys to rebuild +# the basic.exe bootstrap compiler which causes it just to fail again..., +# so manually delete the jay generated .cs files to prevent other build failures +find . -name "*.jay" | while read f; do dn="$(dirname "$f")"; fn="$(basename "$f" ".jay")"; echo $dn/$fn.cs | xargs -I genfile rm genfile ; done + +./autogen.sh \ + --with-tls=posix \ + --enable-nls=no \ + --with-mcs-docs=no \ + --with-profile2=no \ + --with-profile4=no \ + --with-profile4_5=yes \ + --with-moonlight=no \ + --host=i386-apple-darwin15.0.0 \ + --with-glib=embedded \ + --prefix=${MonoInstallPath} +# --enable-loadedllvm=yes +make clean + +if [ ! -f ${PWD}/mcs/class/lib/monolite/basic.exe ]; then + make get-monolite-latest +fi + +# Fix for 2.2.4 vs 2.4.6 glibtool +rm libgc/aclocal.m4 + +make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe + +popd +#exit $? diff --git a/CI/monoWithllvm.osx.build.small.i386.sh b/CI/monoWithllvm.osx.build.small.i386.sh new file mode 100755 index 0000000..e520a8b --- /dev/null +++ b/CI/monoWithllvm.osx.build.small.i386.sh @@ -0,0 +1,6 @@ +#!/bin/bash +source CI/ccache.enable.sh +CI/mono.llvm.osx.i386.sh +source CI/mono-llvm32.enable.sh +CI/mono.osx.build.small.i386.sh +make install diff --git a/monodevelop b/monodevelop index cde2746..05f1254 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit cde2746ac6ce6506dcfbc59654ec90eaf8d8ab27 +Subproject commit 05f1254418ef9a84fdf904d84533e903bb15621c From 7996e088fc1605772d3acc7ffe0f3ac9f7066831 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 18 Dec 2015 18:11:50 -0800 Subject: [PATCH 21/25] Fix typo in script --- .gitmodules | 3 +++ CI/monodevelop.osx.i386.sh | 2 +- openfl | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 openfl diff --git a/.gitmodules b/.gitmodules index 627106d..d267211 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,3 +26,6 @@ [submodule "mono-llvm"] path = mono-llvm url = git://github.com/mono/llvm.git +[submodule "openfl"] + path = openfl + url = https://github.com/openfl/openfl.git diff --git a/CI/monodevelop.osx.i386.sh b/CI/monodevelop.osx.i386.sh index 7802aa7..389fe3e 100755 --- a/CI/monodevelop.osx.i386.sh +++ b/CI/monodevelop.osx.i386.sh @@ -4,7 +4,7 @@ git fetch mono git reset --hard git checkout upstream/master git pull mono master -gut submodule sync +git submodule sync git submodule update --init --recursive ./configure --prefix=${HOME}/mono/monodevelop make clean diff --git a/openfl b/openfl new file mode 160000 index 0000000..b1e6cb7 --- /dev/null +++ b/openfl @@ -0,0 +1 @@ +Subproject commit b1e6cb798f3f12df9597455420d9d78fc0e10ede From 179f0911ef3b96a28d1a3d46be2feddfe571519d Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 18 Dec 2015 18:37:50 -0800 Subject: [PATCH 22/25] Bump submodules CI script fixes --- .gitignore | 2 ++ .gitmodules | 3 --- CI/mono.osx.build.small.i386.sh | 2 +- CI/monodevelop.osx.i386.sh | 5 +++-- PlayScriptRedux/PlayScriptRedux.mdw | 9 --------- mono | 2 +- monodevelop | 2 +- openfl | 1 - playscript | 2 +- 9 files changed, 9 insertions(+), 19 deletions(-) create mode 100644 .gitignore delete mode 100644 PlayScriptRedux/PlayScriptRedux.mdw delete mode 160000 openfl diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ca0973 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.DS_Store + diff --git a/.gitmodules b/.gitmodules index d267211..627106d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,6 +26,3 @@ [submodule "mono-llvm"] path = mono-llvm url = git://github.com/mono/llvm.git -[submodule "openfl"] - path = openfl - url = https://github.com/openfl/openfl.git diff --git a/CI/mono.osx.build.small.i386.sh b/CI/mono.osx.build.small.i386.sh index 9ad2129..5f8eecf 100755 --- a/CI/mono.osx.build.small.i386.sh +++ b/CI/mono.osx.build.small.i386.sh @@ -4,7 +4,7 @@ git submodule update --init --recursive if [ -z ${MonoInstallPath+x} ] then - MonoInstallPath=$HOME/mono/mono + MonoInstallPath=$HOME/mono/mono32 else echo ${MonoInstallPath} fi diff --git a/CI/monodevelop.osx.i386.sh b/CI/monodevelop.osx.i386.sh index 389fe3e..3a5c0e8 100755 --- a/CI/monodevelop.osx.i386.sh +++ b/CI/monodevelop.osx.i386.sh @@ -1,5 +1,6 @@ #!/bin/bash pushd monodevelop + git fetch mono git reset --hard git checkout upstream/master @@ -10,7 +11,7 @@ git submodule update --init --recursive make clean # Quick fix for broken build -pushd monodevelop//main/external/fsharpbinding/ +pushd main/external/fsharpbinding/ git reset --hard ./configure.sh make @@ -22,5 +23,5 @@ make render.exe make app ./make-dmg-bundle.sh popd -popd +popd diff --git a/PlayScriptRedux/PlayScriptRedux.mdw b/PlayScriptRedux/PlayScriptRedux.mdw deleted file mode 100644 index 628aa58..0000000 --- a/PlayScriptRedux/PlayScriptRedux.mdw +++ /dev/null @@ -1,9 +0,0 @@ - - - ../Make2CSProjUpdater/Make2CSProjUpdater.sln - ../away3d-core-fp11/away3d-core-monomac.sln - ../away3d-examples-fp11/away3d-examples.sln - ../playscript-base/PlayScript.Application.OSX/PlayScript.Application.OSX.sln - ../playscript/mcs/class/Mono.PlayScript/Mono.PlayScript.sln - - \ No newline at end of file diff --git a/mono b/mono index 4f9c74a..f13b642 160000 --- a/mono +++ b/mono @@ -1 +1 @@ -Subproject commit 4f9c74a2c4dbfed27d09dcb99d4d590a036d6f69 +Subproject commit f13b642d7fe5d1a55dd493986a99103971c45918 diff --git a/monodevelop b/monodevelop index 05f1254..e3b463f 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 05f1254418ef9a84fdf904d84533e903bb15621c +Subproject commit e3b463fbb9caa912b83f8f0b72c913a8626437bf diff --git a/openfl b/openfl deleted file mode 160000 index b1e6cb7..0000000 --- a/openfl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b1e6cb798f3f12df9597455420d9d78fc0e10ede diff --git a/playscript b/playscript index e2a6a29..e41af04 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit e2a6a2940240cd6ac75144f95279998f9c409c28 +Subproject commit e41af04e771b9a34f964472f226575cb5996a93f From a8ee9d3fe814f071207535a6ddcbf4d6103097dc Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 8 Jan 2016 20:23:37 -0800 Subject: [PATCH 23/25] Bump submodules --- .gitignore | 4 +- CI/monomac.all.osx.i386.sh | 6 +++ CI/monomac.osx.i386.sh | 6 +++ CI/osx.dsstore.clean.sh | 3 ++ PlayScript.Master.sln | 86 ++++++++++++++++++++++++++++++++++++++ mono | 2 +- monodevelop | 2 +- monomac | 2 +- playscript | 2 +- 9 files changed, 108 insertions(+), 5 deletions(-) create mode 100755 CI/monomac.all.osx.i386.sh create mode 100755 CI/monomac.osx.i386.sh create mode 100755 CI/osx.dsstore.clean.sh create mode 100644 PlayScript.Master.sln diff --git a/.gitignore b/.gitignore index 5ca0973..c8f9e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .DS_Store - +*.*.userperfs +*.userperfs +packages diff --git a/CI/monomac.all.osx.i386.sh b/CI/monomac.all.osx.i386.sh new file mode 100755 index 0000000..aa0d854 --- /dev/null +++ b/CI/monomac.all.osx.i386.sh @@ -0,0 +1,6 @@ +#!/bin/bash +pushd monomac +make clean +make +popd + diff --git a/CI/monomac.osx.i386.sh b/CI/monomac.osx.i386.sh new file mode 100755 index 0000000..32f592e --- /dev/null +++ b/CI/monomac.osx.i386.sh @@ -0,0 +1,6 @@ +#!/bin/bash +pushd monomac +DIRS=src make clean +DIRS=src make +popd + diff --git a/CI/osx.dsstore.clean.sh b/CI/osx.dsstore.clean.sh new file mode 100755 index 0000000..609b8c4 --- /dev/null +++ b/CI/osx.dsstore.clean.sh @@ -0,0 +1,3 @@ +#!/bin/bash +find . -name ".DS_Store*" -print0 | xargs -0 -n 1 rm + diff --git a/PlayScript.Master.sln b/PlayScript.Master.sln new file mode 100644 index 0000000..18be01a --- /dev/null +++ b/PlayScript.Master.sln @@ -0,0 +1,86 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.Core", "PlayScript.Core", "{0EC4986C-F5D2-4709-A87D-C1B82AC94447}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib", "playscript\mcs\class\pscorlib\pscorlib.psproj", "{EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib.AOT", "playscript\mcs\class\pscorlib_aot\pscorlib.AOT.psproj", "{ADBAC91B-2817-479E-8DDF-B24ADDA563A6}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib.AOT.MonoMac", "playscript\mcs\class\pscorlib_aot\pscorlib.AOT.MonoMac.psproj", "{EDBAC91B-2817-479E-8DDF-B24ADDA563A6}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib.AOT.Xamarin.Mac", "playscript\mcs\class\pscorlib_aot\pscorlib.AOT.Xamarin.Mac.psproj", "{568ACFC0-B52E-4507-99BD-2050E3F3D4E8}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib.AOT.Xamarin.iOS", "playscript\mcs\class\pscorlib_aot\pscorlib.AOT.Xamarin.iOS.psproj", "{876BFFD1-CEFA-44DD-9243-A50958EF65DD}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.Dynamic", "PlayScript.Dynamic", "{F2CC95CD-3D23-4F59-8F98-E8466CDBA732}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Dynamic.AOT", "playscript\mcs\class\PlayScript.Dynamic_aot\PlayScript.Dynamic.AOT.csproj", "{0BACBE20-34DD-4E24-8B91-87970E8A23B9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Dynamic", "playscript\mcs\class\PlayScript.Dynamic\PlayScript.Dynamic.csproj", "{5F7F9AF6-CE83-4F13-A25F-355DB2861D43}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + Debug+MonoMac|Any CPU = Debug+MonoMac|Any CPU + Release+MonoMac|Any CPU = Release+MonoMac|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.Build.0 = Debug+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.Build.0 = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.Build.0 = Release+MonoMac|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release|Any CPU.Build.0 = Release|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release|Any CPU.Build.0 = Release|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.Build.0 = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.Build.0 = Release+MonoMac|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.Build.0 = Release|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} + {876BFFD1-CEFA-44DD-9243-A50958EF65DD} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} + {0BACBE20-34DD-4E24-8B91-87970E8A23B9} = {F2CC95CD-3D23-4F59-8F98-E8466CDBA732} + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43} = {F2CC95CD-3D23-4F59-8F98-E8466CDBA732} + EndGlobalSection +EndGlobal diff --git a/mono b/mono index f13b642..1625a45 160000 --- a/mono +++ b/mono @@ -1 +1 @@ -Subproject commit f13b642d7fe5d1a55dd493986a99103971c45918 +Subproject commit 1625a45791e165ac48ed15be5782ed9af82768ad diff --git a/monodevelop b/monodevelop index e3b463f..8e14767 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit e3b463fbb9caa912b83f8f0b72c913a8626437bf +Subproject commit 8e1476763f49932ee7520643793fe4550c2be231 diff --git a/monomac b/monomac index 1833e7a..9c75e3b 160000 --- a/monomac +++ b/monomac @@ -1 +1 @@ -Subproject commit 1833e7a0f3a99753bd42242e0572a631d7137615 +Subproject commit 9c75e3be4e1d2d151519d06b3b74ac097db9db59 diff --git a/playscript b/playscript index e41af04..7e21346 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit e41af04e771b9a34f964472f226575cb5996a93f +Subproject commit 7e213465ba980d203e6baf2157360049e239848f From 679d991280be7cb94502ae91b87a6f5821686426 Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 22 Jan 2016 09:11:58 -0800 Subject: [PATCH 24/25] Bump submodules --- .gitignore | 4 +- CI/mono.osx.build.small.x86_64.sh | 51 +++++++++++ PlayScript.Compiler.sln | 142 ++++++++++++++++++++++++++++++ PlayScript.Master.mdw | 7 ++ PlayScript.Master.sln | 106 +++++++++++++++++++++- mono | 2 +- monodevelop | 2 +- playscript | 2 +- 8 files changed, 310 insertions(+), 6 deletions(-) create mode 100755 CI/mono.osx.build.small.x86_64.sh create mode 100644 PlayScript.Compiler.sln create mode 100644 PlayScript.Master.mdw diff --git a/.gitignore b/.gitignore index c8f9e9a..a47fccf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .DS_Store -*.*.userperfs -*.userperfs +*.*.userprefs +*.userprefs packages diff --git a/CI/mono.osx.build.small.x86_64.sh b/CI/mono.osx.build.small.x86_64.sh new file mode 100755 index 0000000..791ee0b --- /dev/null +++ b/CI/mono.osx.build.small.x86_64.sh @@ -0,0 +1,51 @@ +#!/bin/bash +pushd mono +git submodule update --init --recursive + +# clean old ARCH type +pushd mono +make clean +popd + + +if [ -z ${MonoInstallPath+x} ] +then + MonoInstallPath=$HOME/mono/mono64 +else + echo ${MonoInstallPath} +fi + +echo "Building mono framework to `${MonoInstallPath}` folder" + +# Fix for 2.2.4 vs 2.4.6 glibtool +rm libgc/aclocal.m4 + +# If rebuilding and you fail, you can not do a make clean as it trys to rebuild +# the basic.exe bootstrap compiler which causes it just to fail again..., +# so manually delete the jay generated .cs files to prevent other build failures +find . -name "*.jay" | while read f; do dn="$(dirname "$f")"; fn="$(basename "$f" ".jay")"; echo $dn/$fn.cs | xargs -I genfile rm genfile ; done + +./autogen.sh \ + --with-tls=posix \ + --enable-nls=no \ + --with-mcs-docs=no \ + --with-profile2=no \ + --with-profile4=no \ + --with-profile4_5=yes \ + --with-moonlight=no \ + --with-glib=embedded \ + --prefix=${MonoInstallPath} +# --enable-loadedllvm=yes +make clean + +if [ ! -f ${PWD}/mcs/class/lib/monolite/basic.exe ]; then + make get-monolite-latest +fi + +# Fix for 2.2.4 vs 2.4.6 glibtool +rm libgc/aclocal.m4 + +make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe + +popd +#exit $? diff --git a/PlayScript.Compiler.sln b/PlayScript.Compiler.sln new file mode 100644 index 0000000..fa40718 --- /dev/null +++ b/PlayScript.Compiler.sln @@ -0,0 +1,142 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Optimization", "playscript\mcs\class\PlayScript.Optimization\PlayScript.Optimization.csproj", "{4069FC26-5839-4E53-B50C-B7AAF7CD3227}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "psc", "playscript\mcs\psc\psc.csproj", "{08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Dynamic.AOT", "playscript\mcs\class\PlayScript.Dynamic_aot\PlayScript.Dynamic.AOT.csproj", "{0BACBE20-34DD-4E24-8B91-87970E8A23B9}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib.AOT", "playscript\mcs\class\pscorlib_aot\pscorlib.AOT.psproj", "{ADBAC91B-2817-479E-8DDF-B24ADDA563A6}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "PlayScript.Compiler.Tests", "playscript\mcs\psc_tests\PlayScript.Compiler.Tests.psproj", "{DCD5CCF3-05C2-4D77-9427-7E282A449672}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayCompilerTester", "playscript\mcs\tools\playc-tester\PlayCompilerTester.csproj", "{DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "PlayScript.Framework.Test", "playscript\mcs\class\PlayScript.Framework.Test\PlayScript.Framework.Test.psproj", "{27487810-4E81-425E-9D3F-DBF396F86711}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Parser", "playscript\mcs\class\PlayScript.Parser\PlayScript.Parser.csproj", "{A17E048F-C73D-4975-851A-DC5B1BB94054}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + Debug - AST|Any CPU = Debug - AST|Any CPU + Debug+MonoMac|Any CPU = Debug+MonoMac|Any CPU + Release+MonoMac|Any CPU = Release+MonoMac|Any CPU + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug - AST|Any CPU.ActiveCfg = Debug - AST|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug - AST|Any CPU.Build.0 = Debug - AST|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug|x86.ActiveCfg = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug|x86.Build.0 = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release|Any CPU.Build.0 = Release|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release|x86.ActiveCfg = Release|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release|x86.Build.0 = Release|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {08B5AD8B-5F1C-48F4-8B7D-A5D18208281B}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|x86.Build.0 = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.Build.0 = Debug+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.Build.0 = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|x86.ActiveCfg = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|x86.Build.0 = Release|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.Build.0 = Release+MonoMac|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug|x86.ActiveCfg = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug|x86.Build.0 = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release|Any CPU.Build.0 = Release|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release|x86.ActiveCfg = Release|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release|x86.Build.0 = Release|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {27487810-4E81-425E-9D3F-DBF396F86711}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug|x86.ActiveCfg = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug|x86.Build.0 = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release|Any CPU.Build.0 = Release|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release|x86.ActiveCfg = Release|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release|x86.Build.0 = Release|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {4069FC26-5839-4E53-B50C-B7AAF7CD3227}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug|x86.ActiveCfg = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug|x86.Build.0 = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release|Any CPU.Build.0 = Release|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release|x86.ActiveCfg = Release|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release|x86.Build.0 = Release|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {A17E048F-C73D-4975-851A-DC5B1BB94054}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|x86.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|x86.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.Build.0 = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|x86.ActiveCfg = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|x86.Build.0 = Release|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug - AST|Any CPU.ActiveCfg = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug - AST|Any CPU.Build.0 = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug|Any CPU.ActiveCfg = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug|Any CPU.Build.0 = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug|x86.ActiveCfg = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug|x86.Build.0 = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Debug+MonoMac|Any CPU.Build.0 = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release|Any CPU.ActiveCfg = Release|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release|Any CPU.Build.0 = Release|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release|x86.ActiveCfg = Release|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release|x86.Build.0 = Release|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release+MonoMac|Any CPU.ActiveCfg = Debug|x86 + {DBC05DF8-EDCC-4CCE-BE9F-01FC2D566D73}.Release+MonoMac|Any CPU.Build.0 = Debug|x86 + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug - AST|Any CPU.ActiveCfg = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug - AST|Any CPU.Build.0 = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug|x86.ActiveCfg = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug|x86.Build.0 = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Release|x86.ActiveCfg = Release|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Release|x86.Build.0 = Release|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {DCD5CCF3-05C2-4D77-9427-7E282A449672}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + EndGlobalSection +EndGlobal diff --git a/PlayScript.Master.mdw b/PlayScript.Master.mdw new file mode 100644 index 0000000..313fe9a --- /dev/null +++ b/PlayScript.Master.mdw @@ -0,0 +1,7 @@ + + + PlayScript.Master.sln + PlayScript.Addin/PlayScript.Addin.sln + PlayScript.Compiler.sln + + diff --git a/PlayScript.Master.sln b/PlayScript.Master.sln index 18be01a..8f03fc0 100644 --- a/PlayScript.Master.sln +++ b/PlayScript.Master.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.Core", "PlayScript.Core", "{0EC4986C-F5D2-4709-A87D-C1B82AC94447}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.AOT", "PlayScript.AOT", "{0EC4986C-F5D2-4709-A87D-C1B82AC94447}" EndProject Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "pscorlib", "playscript\mcs\class\pscorlib\pscorlib.psproj", "{EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}" EndProject @@ -19,58 +19,156 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Dynamic.AOT", "p EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Dynamic", "playscript\mcs\class\PlayScript.Dynamic\PlayScript.Dynamic.csproj", "{5F7F9AF6-CE83-4F13-A25F-355DB2861D43}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.Starling", "PlayScript.Starling", "{1B33577A-6A68-481D-AE07-09C934BD22F9}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "PlayScript.Starling.MonoMac", "Starling-Framework\starling\src\PlayScript.Starling.MonoMac.psproj", "{3B3DD626-A7FA-430E-85FB-C4E553900934}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{2DBB556E-194E-4BB8-B53F-62585C7E1D3D}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "Starling.Demo.MonoMac", "Starling-Framework\samples\Starling.Demo.MonoMac\Starling.Demo.MonoMac.psproj", "{45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "Starling.PlayGround.MonoMac", "Starling-Framework\samples\Starling.PlayGround.MonoMac\Starling.PlayGround.MonoMac.psproj", "{BEBC82DB-86C4-4C02-AF94-4B3488217403}" +EndProject +Project("{464403d2-eb41-442a-a1f1-9bf858b8865f}") = "PlayScript.Starlingv1.7.MonoMac", "Starling-v1.7\starling\src\PlayScript.Starlingv1.7.MonoMac.psproj", "{3C70D36E-8F50-43BA-B56A-1693C7655157}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlayScript.HostApp", "PlayScript.HostApp", "{34152BB5-DE87-4FE6-9A3D-AEAEDF0E8DAD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayScript.Application.MonoMac", "PlayScript.HostApp\PlayScript.Application.MonoMac\PlayScript.Application.MonoMac.csproj", "{3829D8CC-3505-48B2-B5A9-18CD9DCCA192}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU Debug+MonoMac|Any CPU = Debug+MonoMac|Any CPU Release+MonoMac|Any CPU = Release+MonoMac|Any CPU + AppStore|Any CPU = AppStore|Any CPU + Debug-MonoMac|Any CPU = Debug-MonoMac|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.AppStore|Any CPU.Build.0 = Debug|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug|Any CPU.Build.0 = Debug|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug+MonoMac|Any CPU.Build.0 = Debug+MonoMac|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.ActiveCfg = Release|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release|Any CPU.Build.0 = Release|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU {0BACBE20-34DD-4E24-8B91-87970E8A23B9}.Release+MonoMac|Any CPU.Build.0 = Release+MonoMac|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.AppStore|Any CPU.ActiveCfg = AppStore|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.AppStore|Any CPU.Build.0 = AppStore|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug-MonoMac|Any CPU.ActiveCfg = Debug-MonoMac|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Debug-MonoMac|Any CPU.Build.0 = Debug-MonoMac|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Release|Any CPU.Build.0 = Release|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Release|Any CPU.Build.0 = Release|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3B3DD626-A7FA-430E-85FB-C4E553900934}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Release|Any CPU.Build.0 = Release|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {3C70D36E-8F50-43BA-B56A-1693C7655157}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C}.Release|Any CPU.Build.0 = Release|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.AppStore|Any CPU.Build.0 = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release|Any CPU.Build.0 = Release|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {568ACFC0-B52E-4507-99BD-2050E3F3D4E8}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.AppStore|Any CPU.Build.0 = Debug|Any CPU {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F7F9AF6-CE83-4F13-A25F-355DB2861D43}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.AppStore|Any CPU.Build.0 = Debug|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release|Any CPU.Build.0 = Release|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {876BFFD1-CEFA-44DD-9243-A50958EF65DD}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.AppStore|Any CPU.Build.0 = Debug|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.Build.0 = Release|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU {ADBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.Build.0 = Release+MonoMac|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Release|Any CPU.Build.0 = Release|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {BEBC82DB-86C4-4C02-AF94-4B3488217403}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.AppStore|Any CPU.Build.0 = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release|Any CPU.Build.0 = Release|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.ActiveCfg = Debug|Any CPU {EDBAC91B-2817-479E-8DDF-B24ADDA563A6}.Release+MonoMac|Any CPU.Build.0 = Debug|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.AppStore|Any CPU.Build.0 = Debug|Any CPU {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug+MonoMac|Any CPU.ActiveCfg = Debug+MonoMac|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug-MonoMac|Any CPU.ActiveCfg = Debug|Any CPU + {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Debug-MonoMac|Any CPU.Build.0 = Debug|Any CPU {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Release|Any CPU.ActiveCfg = Release|Any CPU {EDBACFCB-2817-4A2E-8DDF-B24AEFA56352}.Release+MonoMac|Any CPU.ActiveCfg = Release+MonoMac|Any CPU EndGlobalSection @@ -82,5 +180,11 @@ Global {876BFFD1-CEFA-44DD-9243-A50958EF65DD} = {0EC4986C-F5D2-4709-A87D-C1B82AC94447} {0BACBE20-34DD-4E24-8B91-87970E8A23B9} = {F2CC95CD-3D23-4F59-8F98-E8466CDBA732} {5F7F9AF6-CE83-4F13-A25F-355DB2861D43} = {F2CC95CD-3D23-4F59-8F98-E8466CDBA732} + {3B3DD626-A7FA-430E-85FB-C4E553900934} = {1B33577A-6A68-481D-AE07-09C934BD22F9} + {2DBB556E-194E-4BB8-B53F-62585C7E1D3D} = {1B33577A-6A68-481D-AE07-09C934BD22F9} + {3C70D36E-8F50-43BA-B56A-1693C7655157} = {1B33577A-6A68-481D-AE07-09C934BD22F9} + {45B828B4-E5F7-484E-B5F2-22D0ED0A9B3C} = {2DBB556E-194E-4BB8-B53F-62585C7E1D3D} + {BEBC82DB-86C4-4C02-AF94-4B3488217403} = {2DBB556E-194E-4BB8-B53F-62585C7E1D3D} + {3829D8CC-3505-48B2-B5A9-18CD9DCCA192} = {34152BB5-DE87-4FE6-9A3D-AEAEDF0E8DAD} EndGlobalSection EndGlobal diff --git a/mono b/mono index 1625a45..71a04c0 160000 --- a/mono +++ b/mono @@ -1 +1 @@ -Subproject commit 1625a45791e165ac48ed15be5782ed9af82768ad +Subproject commit 71a04c0cb78a56b0dc1db5e90213094c8dda7dc6 diff --git a/monodevelop b/monodevelop index 8e14767..815030a 160000 --- a/monodevelop +++ b/monodevelop @@ -1 +1 @@ -Subproject commit 8e1476763f49932ee7520643793fe4550c2be231 +Subproject commit 815030aabbb2636372a10a212c30c307da2e4b5f diff --git a/playscript b/playscript index 7e21346..3298373 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 7e213465ba980d203e6baf2157360049e239848f +Subproject commit 329837318fd5f3495f61f5a04585ca5156938a85 From 64836711f5c0c90de68a67339f32fdf2cf9ad82a Mon Sep 17 00:00:00 2001 From: SushiHangover Date: Fri, 22 Jan 2016 12:59:46 -0800 Subject: [PATCH 25/25] Bump playscript to correct branch in submodule --- playscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playscript b/playscript index 3298373..a2b7c04 160000 --- a/playscript +++ b/playscript @@ -1 +1 @@ -Subproject commit 329837318fd5f3495f61f5a04585ca5156938a85 +Subproject commit a2b7c04e176ddb0ddbc16999e5a5902a1e15b563