Skip to content

Compatibility for better simulator reloads #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yofreke wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Compatibility for better simulator reloads #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
def3895
added individualCompile option
yofreke Jul 19, 2015
282953d
updates for preloading
yofreke Jul 20, 2015
120f7cb
move jsio path cache to its own file
yofreke Jul 20, 2015
9fb2e4f
checkpoint - ~0.6 second simulator builds
yofreke Jul 21, 2015
132bc03
remove old comments
yofreke Jul 23, 2015
a4e2677
partial load (for preloading only and then waiting)
yofreke Jul 23, 2015
48b50ee
use FileGenerator for index.html and native-ios.js
yofreke Jul 23, 2015
f500a0a
support for new simulator (fake) spritesheet maps
yofreke Jul 24, 2015
8059d06
clean up + ensure broswer and native builds work
yofreke Jul 28, 2015
64fc51b
moved jsio dependency back to package.json
yofreke Jul 28, 2015
8ddc085
update spritesheetmapgenerator comments
yofreke Jul 28, 2015
86a4226
Merge branch 'master' into feature-individualCompile
yofreke Jul 28, 2015
3ec9fd5
doThings -> loadTargetJS
yofreke Jul 31, 2015
e655fa4
lower case FileGenerator
yofreke Jul 31, 2015
2b88f49
normal convention
yofreke Jul 31, 2015
9132381
normal import Promise
yofreke Jul 31, 2015
b859881
osx being bad at capitals
yofreke Jul 31, 2015
7b4cdbc
remove promise
yofreke Aug 4, 2015
473350d
mkdirp -> fs-extra.mkdirp
yofreke Aug 5, 2015
0bbfc52
no more server side compilation
yofreke Aug 5, 2015
8620a31
remove separateJsio option and replace it with simulator only functio…
yofreke Aug 5, 2015
c83a22d
use only top level dirs in pathCache instead of each individual file
yofreke Aug 5, 2015
9e8b8fd
use relative (no sym link resolution) jsio path
yofreke Aug 20, 2015
91f11c0
native: add a debugpath for native jsio env
Sep 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use relative (no sym link resolution) jsio path
  • Loading branch information
@yofreke
yofreke authored and weeby-producer-user committed Aug 20, 2015
commit 9e8b8fdcdc836c63bf52bece79ab8623776828cd
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"stylus": "0.48.1",
"uglify-js": "^2.4.17",
"vinyl": "^0.4.6",
"vinyl-fs": "^1.0.0"
"vinyl-fs": "^1.0.0",
"resolve": "1.1.6"
},
"scripts": {
"preinstall": "sh scripts/preinstall.sh"
Expand Down
15 changes: 13 additions & 2 deletions src/build/common/jsCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var path = require('path');
var fs = require('fs-extra');
var crypto = require('crypto');
var resolve = require('resolve');

var argv = require('optimist').argv;
var EventEmitter = require('events').EventEmitter;
Expand Down Expand Up @@ -238,7 +239,9 @@ function replaceSlashes(str) {
* @return {Object} object with path and pathCache variables
*/
exports.getPathAndCache = function(app, config) {
var jsioPath = jsio.__env.getPath();
var devkitCorePath = path.join(app.paths.root, 'modules', 'devkit-core');
var jsioPath = path.dirname(resolve.sync('jsio', { basedir: devkitCorePath }));

var _path = [];
var _pathCache = {
jsio: jsioPath
Expand Down Expand Up @@ -284,7 +287,15 @@ exports.writeJsioPath = function(opts) {

var util = jsio.__jsio.__util;

_path = [jsio.__env.getPath(), '.', 'lib'].concat(_path);
var jsioPath;
if (opts.cwd) {
var devkitCorePath = path.join(opts.cwd, 'modules', 'devkit-core');
jsioPath = path.dirname(resolve.sync('jsio', { basedir: devkitCorePath }));
} else {
jsioPath = jsio.__env.getPath();
}

_path = [jsioPath, '.', 'lib'].concat(_path);

var cache = {};
Object.keys(pathCache).forEach(function (key) {
Expand Down