Jonathan Protzenko
186b9e1988
Merge remote-tracking branch 'origin/master'
...
Conflicts:
.gitignore
2015-02-04 17:56:24 -08:00
Jonathan Protzenko
774ae1da3d
Cleanup part 2: tsc outputs go into [build/].
...
Also moved the css and stubs tools into their own tools/ directory. Removed a
few files in genStubs that weren't reference anywhere else in the tree.
Simplified the Jakefile a little bit too.
2015-02-04 17:53:03 -08:00
Michal Moskal
21cab6c761
Merge branch 'master' of github.com:Microsoft/TouchDevelop
...
Conflicts:
.gitignore
Jakefile
2015-02-04 17:26:19 -08:00
Michal Moskal
6aeff8c32f
Add vim: comment
2015-02-04 17:24:12 -08:00
Jonathan Protzenko
77507f1259
Cleanup part 1: [generated/] folder.
...
For files that we can re-generate at any time but that are still under version
control because they take a while to re-generate.
2015-02-04 17:10:00 -08:00
Peli de Halleux
8076b410dd
missing assert require
2015-02-04 16:47:33 -08:00
Jonathan Protzenko
a717a72fd5
Merge branch 'master' of github.com:Microsoft/TouchDevelop
2015-02-04 16:36:22 -08:00
Jonathan Protzenko
530cc27464
Revert "Typo"
...
This reverts commit bc61e8a93c
.
2015-02-04 16:36:15 -08:00
Peli de Halleux
1b5869a8b6
Merge branch 'master' of https://github.com/Microsoft/TouchDevelop
2015-02-04 16:32:29 -08:00
Peli de Halleux
16caa9cd5e
adding task for uploading results, displaying test outputs
2015-02-04 16:31:57 -08:00
Jonathan Protzenko
bc61e8a93c
Typo
2015-02-04 16:10:32 -08:00
Jonathan Protzenko
57eac458fd
One more batch file removed.
2015-02-04 15:49:22 -08:00
Jonathan Protzenko
4177e7d40d
Remove one .bat file an add an optional argument to jake run (see README.md).
2015-02-04 15:45:22 -08:00
Jonathan Protzenko
4c9411bfdf
Typescript definitions under version control.
...
Also, improvements to .gitignore and to "jake clean".
2015-02-04 15:13:44 -08:00
Peli de Halleux
3b9c8f8f53
Merge branch 'node-webkit'
...
Conflicts:
Jakefile
2015-02-04 12:03:53 -08:00
Jonathan Protzenko
0b73be2a37
Fix tests. Fix README.
2015-02-04 11:48:06 -08:00
Jonathan Protzenko
ee73953add
Add the right copying of files before running.
2015-02-04 11:39:58 -08:00
Peli de Halleux
fbc23147bc
adding task to launch touchdevelop local
2015-02-04 11:31:42 -08:00
Jonathan Protzenko
500af96fac
Seems to be working for me. Please test.
...
Here's the sequence of steps that *should* work.
npm install
tsd reinstall
jake
cp browser/browser.js .
jake run
2015-02-04 09:27:14 -08:00
Jonathan Protzenko
1bb60b11ea
Sprinkle a few more <any>'s to make things compile. Fix the concatenation issue.
2015-02-04 09:09:17 -08:00
Jonathan Protzenko
d148e8cf74
Current prototype for building with Jake.
...
- Dependencies are all written down properly.
- There's still bugs in concatenation, so it doesn't quite work, yet.
2015-02-04 08:12:08 -08:00