Skip to content

Commit

Permalink
Bump to v0.9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexAltea committed Feb 1, 2017
1 parent ab7720f commit 70eb5a6
Show file tree
Hide file tree
Showing 5 changed files with 190 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Dependencies NodeJS
node_modules/
debug.log

# Emscripten builds
*.out.js

# Keystone.js
/dist/*.js
/dist/keystone-*.js
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ To build the Keystone.js library, clone the *master* branch of this repository,

1. Initialize the original Keystone submodule: `git submodule update --init`.

2. Install the development and client dependencies with: `npm install` and `bower install`.
2. Install the latest [Python 2.x (64-bit)](https://www.python.org/downloads/), [CMake](http://www.cmake.org/download/) and the [Emscripten SDK](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). Follow the respective instructions and make sure all environment variables are configured correctly. Under Windows [MinGW](http://www.mingw.org/) (specifically *mingw32-make*) is required.

3. Install the latest [Python 2.x (64-bit)](https://www.python.org/downloads/), [CMake](http://www.cmake.org/download/) and the [Emscripten SDK](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). Follow the respective instructions and make sure all environment variables are configured correctly. Under Windows [MinGW](http://www.mingw.org/) (specifically *mingw32-make*) is required.
3. Install the development dependencies with: `npm install`.

4. Finally, build the source with: `grunt build`.
2 changes: 2 additions & 0 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ def compileKeystone(targets):
cmd += ' -DCMAKE_CXX_FLAGS="-Os"'
if targets:
cmd += ' -DLLVM_TARGETS_TO_BUILD="%s"' % (';'.join(targets))
else:
cmd += ' -DLLVM_TARGETS_TO_BUILD="all"'
if os.name == 'nt':
cmd += ' -DMINGW=ON'
cmd += ' -G \"MinGW Makefiles\"'
Expand Down
177 changes: 177 additions & 0 deletions dist/keystone.min.js

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h1>Keystone.js</h1>
</div>

<div class="container">

<h2>Demo</h2>
<p>
Before going to the Installation / Tutorial panels below, you might want to see how Keystone.js works.
Expand Down Expand Up @@ -200,19 +200,18 @@ <h2>Tutorial</h2>
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.5/angular.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.10.0/js/bootstrap-select.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/snippets/glsl.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/highlight.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/languages/javascript.min.js"></script>
<script src="externals/download.js"></script>

<!-- KeystoneJS -->
<script src="//github.com/AlexAltea/keystone.js/releases/download/v0.9/keystone.min.js"></script>
<script src="dist/keystone.min.js"></script>

<!-- Simple demo of KeystoneJS -->
<script>
// Highlight.JS
hljs.initHighlightingOnLoad();

// Ace editor: Assembly
var editorInput = ace.edit("editorInput");
editorInput.$blockScrolling = Infinity;
Expand All @@ -234,14 +233,14 @@ <h2>Tutorial</h2>
editorOutput.setOption("showPrintMargin", false);
editorOutput.setOption("displayIndentGuides", false);
editorOutput.setOption("readOnly", true);

// Utils
function hexByte(value) {
value = value < 0 ? (value + 0x100) : (value);
var str = '00' + value.toString(16).toUpperCase();
return str.slice(-2);
};

function downloadBinary() {
var scope = angular.element(document.getElementById("editorOutput")).scope();
scope.$apply(function () {
Expand All @@ -260,7 +259,7 @@ <h2>Tutorial</h2>
function keystoneRender($scope) {
$scope.mc = kst.asm($scope.assembly, $scope.offset);
var mcLen = $scope.mc.length;

var output = "";
switch ($scope.preview) {
case 'bin':
Expand Down

0 comments on commit 70eb5a6

Please sign in to comment.