Commit Graph

215 Commits

Author SHA1 Message Date
Jukka Jylänki
3e251bebd8 Fix path delimiter normalization issue on Windows - .emscripten must feed
forward slashes to Emscripten even on Windows. #40
2015-10-06 21:54:14 -07:00
mhenschel
a8146983fe Make .emscripten config file relocatable when using the --embedded flag
I'd like to copy the emsdk directory around freely. This will derive the location of all the tools from the location of the .emscripten file.
2015-10-06 19:13:18 +02:00
Jukka Jylänki
340543a46a Fix Emscripten optimizer build when both VS2013 and VS2015 are present and sufficiently new CMake is being used. Fix Emscripten optimizer build to be performed as 64-bit when current system is 64-bit. Fixes https://github.com/kripken/emscripten/issues/3814. 2015-10-04 21:31:23 -07:00
Jukka Jylänki
8d1ad85366 Remove Windows-specific help message in emsdk list. 2015-09-25 17:09:21 +03:00
Jukka Jylänki
31da81ff3f Fix typo in returned linux_url. 2015-09-25 17:01:44 +03:00
Jukka Jylänki
013997daac Add support for linux_url in emsdk. 2015-09-25 16:58:45 +03:00
Jukka Jylänki
a5521d4e17 Rename Emscripten temp directory from "/path/to/emsdk/.tmp" to "/path/to/emsdk/tmp" since otherwise make tool breaks when processing the Makefiles for test_lua. This fixes https://github.com/kripken/emscripten/issues/3779 . 2015-09-16 01:49:35 +03:00
Jukka Jylänki
aebcc04dc7 Add --build-tests command line option. 2015-09-15 16:14:08 +03:00
Jukka Jylänki
4f5cbc4ea8 Allow multiple tools to be passed to the install command. 2015-09-15 14:36:05 +03:00
Jukka Jylänki
9bcd44da58 Unify construct_env() code for Windows and Unix. Fixes an issue with EM_CONFIG and EM_CACHE not being set on Unixes. 2015-09-14 20:54:06 +03:00
Jukka Jylänki
8697dff5c3 Prefer 'nodejs' as Node fallback if it exists. Closes #20. Don't redundantly duplicate Node.js and SpiderMonkey specifiers. 2015-09-14 20:44:47 +03:00
Jukka Jylänki
7d21d4737a Sort versions in emscripten-tags.txt in version order instead of lexicographic order. 2015-07-03 01:10:02 +03:00
Jukka Jylänki
9cee94ad5e Download the list of tags directly from Emscripten github repository, instead of having a hardcoded list of tags. 2015-07-03 01:05:23 +03:00
Jukka Jylänki
e71d80bd0f Add the --shallow option to the 'emsdk install' command to perform a shallow git clone. Closes https://github.com/kripken/emscripten/issues/3587. 2015-07-02 22:39:54 +03:00
Jukka Jylänki
4fc43e7b78 Fix fastcomp_build_bin_dir() on Windows. 2015-07-02 22:11:24 +03:00
Jukka Jylänki
e797e5641e Implement support for downloading and building specific tagged releases. 2015-07-02 21:52:03 +03:00
Jukka Jylanki
fe55d0fd19 Fix name of Win32 x86 build platform. Do temp workaround for optimizer build on Windows. 2015-06-21 23:59:07 +03:00
Jukka Jylanki
0aabc1ed8b Temp workaround for previous commit. 2015-06-21 23:57:24 +03:00
Jukka Jylanki
6fa116ebad Work around crazy HP EasySetup laptop issue when building Emscripten compiler on a HP laptop, where HP systems predefine a global environment variable BNB that conflicts with msbuild. http://stackoverflow.com/questions/2507856/why-is-my-platform-environment-variable-defined-as-bnb 2015-06-21 21:16:09 +03:00
Jukka Jylänki
bc56d6eee0 Work around OS X Xcode(?) build bug by adding -stdlib=libc++ to CXXFLAGS when building. 2015-06-18 13:31:34 +03:00
Jukka Jylänki
b03859dcdb Add an explicit -DPYTHON_EXECUTABLE=x specifier when invoking python to locate it to CMake. Closes https://github.com/kripken/emscripten/issues/3388 . 2015-04-23 11:00:20 +03:00
Jukka Jylanki
3bea227bf9 When activating environment, make sure the new PATH items come first before existing ones. 2015-04-12 17:52:13 +03:00
Jukka Jylänki
42d7b34bb9 Improve progress prints when installing tools and SDKs. 2015-04-12 17:13:15 +03:00
Jukka Jylänki
fd67c1fb15 Adjust emsdk to build optimizer to a sibling directory of emscripten instead to a subdirectory, to allow git clean. 2015-04-12 17:04:46 +03:00
Jukka Jylänki
c7f3f2ff51 Fix case insensitivity check for --build=type 2015-04-10 14:40:54 +03:00
Tasuku SUENAGA a.k.a. gunyarakun
5e463e0824 Allow path separator characters in branch names 2015-04-09 18:37:10 -07:00
Jukka Jylänki
321f0ea46c Don't pass /maxcpucount parameter to msbuild, since it already spawns the full number of cl.exe instances by itself. 2015-04-09 16:00:55 +03:00
Jukka Jylänki
1170e55abd Add new --build=type option that allows customizing whether to build Debug, Release, MinSizeRel or RelWithDebInfo targets of LLVM and Emscripten optimizer. Closes #19. 2015-04-08 17:14:33 +03:00
Jukka Jylänki
04c3e37909 Fix python 3 incompatibility. 2015-04-08 16:16:44 +03:00
Jukka Jylänki
b928162681 Fix more instances of python 3 incompatibility after previous merge. 2015-04-08 16:07:17 +03:00
Jukka Jylänki
b0dcb8159e Merge remote-tracking branch 'remotes/gagern/python3'
Conflicts:
	emsdk
2015-04-08 16:04:28 +03:00
Jukka Jylänki
4957c20d72 Add support for specifying the number of cores to use when building tools in the SDK, with the -jX command line option to 'emsdk install'. Fixes #28. 2015-04-08 15:52:36 +03:00
Jukka Jylänki
766b656206 Enable cmdline param parsing on 'install' to accept options. 2015-04-08 15:39:01 +03:00
Jukka Jylänki
9a8ad4764c Remove stale code. 2015-04-08 15:36:12 +03:00
Jukka Jylänki
4fa8dcd696 Fix activation of sdk-master-64bit on Windows. 2015-04-07 18:15:52 +03:00
Martin von Gagern
a425415003 Undo one change from str to unicode
This change was introduced by 2to3, but since the line is intended for
Python 2 only, it should still refer to unicode.
2015-03-31 22:31:45 +02:00
Martin von Gagern
44df6dcec5 Fix some Python 3 problems with bytes versus string 2015-03-31 16:40:12 +02:00
Martin von Gagern
b634d55a8f Make emsdk script compatible with Python 3 2015-03-31 15:44:34 +02:00
Jukka Jylänki
dda257ce65 Abort on build_fastcomp_tool() failures early. Fixes https://github.com/kripken/emscripten/issues/3267 . 2015-03-18 14:22:48 +02:00
Deepti Gandluri
bf7863f411 Adding error checking on install 2015-03-17 16:03:43 -07:00
Jukka Jylänki
0b2638d59d Add more clear instructions for when CMake is not present, https://github.com/kripken/emscripten/issues/3262 . 2015-03-17 14:27:03 +02:00
Jukka Jylänki
18b56ab7e0 Update vs-tool message to state it currently depends on VS2010. 2015-02-15 19:52:54 +02:00
Jukka Jylänki
81aaba9b4e Decode unicode strings to ascii strings when loading the manifest json file. Fixes https://github.com/kripken/emscripten/issues/3147 2015-01-26 11:40:01 +02:00
Aidan Hobson Sayers
1a98893ff7 Add useful error information on non-http error 2015-01-26 00:04:15 +00:00
Jukka Jylänki
ef17aeb616 Add new option '--embedded' to emsdk activate to bundle all Emscripten configuration, temp, cache and ports directories inside the emsdk root directory. 2015-01-23 16:21:21 +02:00
Jukka Jylänki
a9ba3a857a Make the optimizer build path optionally specified so that it points to correct location on OSX and Linux as well. 2015-01-19 09:42:00 +02:00
Jukka Jylänki
b79fb12ec7 Update fastcomp_build_bin_dir() to understand new LLVM 3.5 build output directory structure, which has changed from LLVM 3.4. 2015-01-15 00:18:16 +02:00
Jukka Jylänki
7f57edd02e Refactor CMake generator as a top level option CMAKE_GENERATOR to avoid code duplication. 2015-01-15 00:18:15 +02:00
Jukka Jylänki
319ccb1caf As part of Emscripten incoming and master installations, build Emscripten native optimizer tool. Also enable VS2012 and VS2013 builds. 2015-01-15 00:18:15 +02:00
Jukka Jylänki
a179b57e82 Refactor fastcomp build script to separate cmake and make calls so that they can be reused for building other tools. 2015-01-15 00:18:15 +02:00