Skip to content

Commit 08fb9f7

Browse files
bryanjosbryanjos
committed
moved javascript folder from priv to src. included built elixir.js in priv
1 parent b7bb757 commit 08fb9f7

66 files changed

Lines changed: 2944 additions & 25 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ erl_crash.dump
55
ex2js
66
elixirscript
77
node_modules
8-
priv/test_project/dest
9-
priv/javascript/build
10-
priv/javascript/test_build
11-
priv/javascript/dist
12-
priv/javascript/dist_build
8+
src/javascript/build
9+
src/javascript/test_build
10+
src/javascript/dist
11+
src/javascript/dist_build
1312
/dist
1413
deploy.sh
1514
.DS_Store
16-
priv/javascript/scratchpad.js
1715
sample/dest
1816
fprof.trace
1917
index.js

‎gulpfile.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ var sourcemaps = require('gulp-sourcemaps');
88

99
require("babel/polyfill");
1010

11-
var path = './priv/javascript';
11+
var path = './src/javascript';
1212
var stdLibPath = path + '/lib/**/*.js';
1313
var testPath = path + '/test_build/tests/**/*.spec.js';
1414
var libPath = path + '/lib';
1515

1616
gulp.task('test_build', function() {
17-
return gulp.src(['./priv/javascript/lib/**/*.js'])
17+
return gulp.src([path + '/lib/**/*.js'])
1818
.pipe(babel({sourceMap: false, modules:'common'}))
19-
.pipe(gulp.dest('./priv/javascript/test_build/lib'));
19+
.pipe(gulp.dest(path + '/test_build/lib'));
2020
});
2121

2222
gulp.task('test_build_tests', function() {
23-
return gulp.src(['./priv/javascript/tests/**/*.spec.js'])
23+
return gulp.src([path + '/tests/**/*.spec.js'])
2424
.pipe(babel({sourceMap: false, modules:'common'}))
25-
.pipe(gulp.dest('./priv/javascript/test_build/tests'));
25+
.pipe(gulp.dest(path + '/test_build/tests'));
2626
});
2727

2828
gulp.task('test', ['test_build', 'test_build_tests'], function () {
@@ -31,23 +31,23 @@ gulp.task('test', ['test_build', 'test_build_tests'], function () {
3131
});
3232

3333
gulp.task('lint', function () {
34-
return gulp.src([stdLibPath, testPath, '!./priv/javascript/build/**/*.js'])
34+
return gulp.src([stdLibPath, testPath, '!' + path + '/build/**/*.js'])
3535
.pipe(eslint())
3636
.pipe(eslint.format())
3737
.pipe(eslint.failOnError());
3838
});
3939

4040
gulp.task('dist_build', function() {
41-
return gulp.src(['./priv/javascript/**/*.js', '!./priv/javascript/build/**/*.js', '!./priv/javascript/dist/**/*.js', '!./priv/javascript/dist_build/**/*.js', '!./priv/javascript/tests/**/*.js'])
41+
return gulp.src([path + '/**/*.js', '!' + path + '/build/**/*.js', '!' + path + '/dist/**/*.js', '!' + path + '/dist_build/**/*.js', '!' + path + '/tests/**/*.js'])
4242
.pipe(babel({whitelist: ['flow'], optional: ["minification.deadCodeElimination"]}))
43-
.pipe(gulp.dest('./priv/javascript/dist_build'));
43+
.pipe(gulp.dest(path + '/dist_build'));
4444
});
4545

4646
gulp.task('dist_add_source_map', function() {
47-
return gulp.src(['./priv/javascript/dist/elixir.js'])
47+
return gulp.src(['./priv/elixir.js'])
4848
.pipe(sourcemaps.init())
4949
.pipe(sourcemaps.write())
50-
.pipe(gulp.dest('./priv/javascript/dist'));
50+
.pipe(gulp.dest('./priv'));
5151
});
5252

5353

‎lib/elixir_script.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ defmodule ElixirScript do
126126
to the specified location
127127
"""
128128
def copy_standard_libs_to_destination(destination) do
129-
File.cp_r!(operating_path <> "/dist", destination)
129+
File.cp_r!(operating_path, destination)
130130
end
131131

132132
@doc """
133133
Returns the standard lib js code
134134
"""
135135
def standard_libs() do
136-
File.read!(operating_path <> "/dist/elixir.js")
136+
File.read!(operating_path <> "/elixir.js")
137137
end
138138

139139
defp convert_to_code(js_ast, root, include_path, env, import_standard_libs) do
@@ -201,7 +201,7 @@ defmodule ElixirScript do
201201

202202
defp operating_path() do
203203
try do
204-
Mix.Project.build_path <> "/lib/elixir_script/priv/javascript"
204+
Mix.Project.build_path <> "/lib/elixir_script/priv"
205205
rescue
206206
UndefinedFunctionError ->
207207
split_path = Path.split(Application.app_dir(:elixirscript))

‎mix.exs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ defmodule ElixirScript.Mixfile do
5151

5252
defp package do
5353
[
54-
files: ["lib", "priv/javascript/dist", "mix.exs", "README*", "readme*", "LICENSE*", "license*", "CHANGELOG*"],
54+
files: ["lib", "priv/elixir.js", "mix.exs", "README*", "readme*", "LICENSE*", "license*", "CHANGELOG*"],
5555
maintainers: ["Bryan Joseph"],
5656
licenses: ["MIT"],
5757
links: %{
@@ -73,22 +73,20 @@ defmodule ElixirScript.Mixfile do
7373
folder_name = "#{dist_folder}/elixirscript"
7474
archive_file_name = "#{dist_folder}/elixirscript.tar.gz"
7575

76-
File.mkdir_p("priv/javascript/dist")
77-
7876
Mix.Tasks.Escript.Build.run([])
7977

8078
if File.exists?(dist_folder) do
8179
File.rm_rf(dist_folder)
8280
end
8381

8482
{ _ , _ } = System.cmd("node", ["node_modules/gulp/bin/gulp.js", "dist_build"])
85-
{ elixir_js, _ } = System.cmd("node", ["node_modules/rollup/bin/rollup", "./priv/javascript/dist_build/elixir.js"])
86-
File.write!("priv/javascript/dist/elixir.js", elixir_js)
83+
{ elixir_js, _ } = System.cmd("node", ["node_modules/rollup/bin/rollup", "./src/javascript/dist_build/elixir.js"])
84+
File.write!("priv/elixir.js", elixir_js)
8785
{ _ , _ } = System.cmd("node", ["node_modules/gulp/bin/gulp.js", "dist_add_source_map"])
8886

8987
File.mkdir_p(folder_name <> "/bin")
9088
File.cp!("elixirscript", "#{folder_name}/bin/elixirscript")
91-
File.cp_r!("priv/javascript/dist", "#{folder_name}/dist")
89+
File.cp_r!("priv", "#{folder_name}")
9290
File.cp_r!("LICENSE", "#{folder_name}/LICENSE")
9391

9492
System.cmd("tar", ["czf", archive_file_name, folder_name])

0 commit comments

Comments
 (0)