Commit Graph

86 Commits

Author SHA1 Message Date
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
Jukka Jylänki
9feba75928 Fix unix env. var addition issue when the variables may have elements with spaces in them. 2014-11-19 17:26:38 +02:00
Jukka Jylänki
ef541f8ed9 Fix unix path addition issue when the path may have elements with spaces in them. 2014-11-19 17:25:38 +02:00
Jukka Jylänki
79cf18d531 Fix UI print issue where different clang git repository tools would not correctly print if they are installed or not. Fixes #21. 2014-11-18 19:02:12 +02:00
Jukka Jylänki
062f71d255 Clean up the internal temporary file emsdk_set_env.sh/.bat in a more exact manner so that the temp file is not left around. Fixes https://github.com/kripken/emscripten/issues/2918. 2014-11-18 15:24:32 +02:00
Jukka Jylanki
030dc264cc Document --global in more places. 2014-09-17 10:09:18 +03:00
Jukka Jylänki
e26c839e82 Add package for new Portable Git version 1.9.4 to the manifest. Adjust git usage by emsdk to never install git automatically, and prefer using system-provided git if it exists. Improve instructions to guide the user to manually installing git if not found. Fixes #13. 2014-09-07 05:43:14 -04:00
Jukka Jylänki
584d14db3c Improve git lookup by using which() to search PATH if git is not installed in emsdk. 2014-07-28 20:23:10 +03:00
Jukka Jylänki
210400cd9e Fix parallel build of fastcomp. 2014-07-20 04:57:41 -04:00
Jukka Jylänki
46036b5a93 Always perform Emscripten Clang build as a parallel build. 2014-07-08 11:07:19 +03:00
Jukka Jylänki
82407a23dc Fix update mechanism on Linux. 2014-07-07 15:15:43 +03:00
Jukka Jylänki
7f4480a657 Update emsdk activate hint. 2014-07-07 15:09:14 +03:00
Jukka Jylänki
f4afc0accc In generated .emscripten configs, access node by default from PATH, if not set otherwise. 2014-07-07 15:04:48 +03:00
Jukka Jylänki
6600588cc7 Add SDK items for linux and fix an issue with extra tools being shown on linux. 2014-07-07 13:52:45 +03:00
Jukka Jylänki
8992935e30 Remove reference to old bat file. 2014-07-07 12:27:34 +03:00
Jukka Jylänki
baee119231 Add new clang-incoming and clang-master packages that automate git clone and build clang from sources. 2014-07-03 23:39:25 +03:00
Jukka Jylänki
34d478034f Migrate OSX shell activation to work the same way as on Windows: source ./emsdk_env.sh instead of emsdk_add_path. 2014-07-03 18:50:00 +03:00
Jukka Jylänki
1cec00bc38 Fix an issue where windows env. vars could not be read if python is not in user path when running. Closes #7 and #8. 2014-07-03 17:56:57 +03:00
Jukka Jylänki
c3712ad118 Fix active env test when multiple paths are present (git tool on Windows). 2014-07-03 17:38:23 +03:00
Jukka Jylänki
02fd7681fc Remove old unused code. 2014-07-03 17:18:40 +03:00
Jukka Jylänki
745df6c986 Don't touch the slashedness of existing items in user's PATH when adding new items. Fixes #4. Use more consistently backslashes where appropriate on Windows. 2014-07-03 15:14:45 +03:00
Jukka Jylänki
9244ac91f4 Make emsdk aware when running in a shell that doesn't have a particular tool active, but .emscripten has it set up, and print a help message when calling 'emsdk list'. Fix line endings in emcmdprompt.bat. 2014-07-03 14:45:49 +03:00
Jukka Jylänki
2ef37707bc Revise the messages printed during toolchain activation to be more user-friendly. 2014-07-03 14:09:45 +03:00
Jukka Jylänki
ffe8f50e08 Revise emsdk environment setting on Windows. Fixes #9. 2014-07-03 13:43:37 +03:00
Jukka Jylänki
27d01d3078 Filter out historical archived tool and sdk versions. 2014-04-24 13:17:02 +03:00
Jukka Jylänki
13ea503a7f Improve support for registering environment variables and PATH on 'emsdk activate'. Add machinery for hiding old sdk tools and sdks. 2014-04-24 13:10:04 +03:00
Jukka Jylänki
2ed7a605a9 Have 'emsdk activate' always globally activate the Windows environment variables that it needs to set up the active environment. 2014-04-24 00:57:59 +03:00
Jukka Jylänki
351e23df84 Register the needed empty placeholder SPIDERMONKEY_ENGINE string before activating the actual spidermonkey engine path, if it exists. 2014-03-14 13:43:25 +02:00
Jukka Jylänki
f9a46a2927 Properly check for existence of environment variable keys in a manner that does not throw. Fixes https://github.com/juj/emsdk/issues/2 . 2013-11-22 11:16:31 +02:00
Jukka Jylänki
12daea5f59 Make 'emsdk active_path' easier to use by not needing a parameter of which tools/sdks to activate. 2013-11-21 16:56:12 +02:00