From 1eb53772d4f414e864af60f1ebd76bddf46547cf Mon Sep 17 00:00:00 2001 From: marshworks Date: Mon, 3 Aug 2015 08:05:33 -0700 Subject: [PATCH 1/3] Addition of windows .bat files for closure compiler --- utils/compile-all.bat | 4 ++++ utils/compile-debug.bat | 46 +++++++++++++++++++++++++++++++++++++++++ utils/compile-min.bat | 46 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 utils/compile-all.bat create mode 100644 utils/compile-debug.bat create mode 100644 utils/compile-min.bat diff --git a/utils/compile-all.bat b/utils/compile-all.bat new file mode 100644 index 0000000..e728b02 --- /dev/null +++ b/utils/compile-all.bat @@ -0,0 +1,4 @@ +Echo "Compiling debug..." +compile-debug.bat +Echo "Compiling min..." +compile-min.bat diff --git a/utils/compile-debug.bat b/utils/compile-debug.bat new file mode 100644 index 0000000..73e2ee8 --- /dev/null +++ b/utils/compile-debug.bat @@ -0,0 +1,46 @@ +REM Usage: +REM setup environment variables for CLOSURE_PATH + +SET BUILDDIR=..\build +SET TARGET=%BUILDDIR%\glam-nodeps.js +SET OUTPUT=%BUILDDIR%\glam.js +SET THREEDIR=..\libs\three.js.r68 +SET THREE=%THREEDIR%\three.js +SET STATS=%THREEDIR%\stats.min.js +SET LOADERS=%THREEDIR%\controls\VRControls.js+^ +%THREEDIR%\loaders\ColladaLoader.js+^ +%THREEDIR%\loaders\glTF\glTF-parser.js+^ +%THREEDIR%\loaders\glTF\glTFLoader.js+^ +%THREEDIR%\loaders\glTF\glTFLoaderUtils.js+^ +%THREEDIR%\loaders\glTF\glTFAnimation.js+^ +%THREEDIR%\postprocessing\EffectComposer.js+^ +%THREEDIR%\postprocessing\FilmPass.js+^ +%THREEDIR%\postprocessing\BloomPass.js+^ +%THREEDIR%\postprocessing\MaskPass.js+^ +%THREEDIR%\postprocessing\RenderPass.js+^ +%THREEDIR%\postprocessing\ShaderPass.js+^ +%THREEDIR%\renderers\StereoEffect.js+^ +%THREEDIR%\renderers\VREffect.js+^ +%THREEDIR%\shaders\ConvolutionShader.js+^ +%THREEDIR%\shaders\CopyShader.js+^ +%THREEDIR%\shaders\DotScreenShader.js+^ +%THREEDIR%\shaders\DotScreenRGBShader.js+^ +%THREEDIR%\shaders\FilmShader.js+^ +%THREEDIR%\shaders\FXAAShader.js+^ +%THREEDIR%\shaders\RGBShiftShader.js+^ +%THREEDIR%\ParticleEngine\ShaderParticles.min.js + +SET RAF=..\libs\requestAnimationFrame\RequestAnimationFrame.js +SET TWEEN=..\libs\tween.js\tween.min.js +SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF% +SET NODEPS=..\src\config\nodeps.js +SET FONTS=..\fonts\helvetiker_bold.typeface.js+^ +..\fonts\helvetiker_regular.typeface.js + +SET BASE=%CLOSURE_PATH%\closure\goog\base.js +REM --root=%CLOSURE_PATH% +%CLOSURE_PATH%\closure\bin\build\closurebuilder.py %BASE% --root=..\src\animations --root=..\src\behaviors --root=..\src\cameras --root=..\src\controllers --root=..\src\config --root=..\src\core --root=..\src\dom --root=..\src\events --root=..\src\graphics --root=..\src\helpers --root=..\src\input --root=..\src\lights --root=..\src\loaders --root=..\src\objects --root=..\src\particles --root=..\src\postprocessing --root=..\src\prefabs --root=..\src\scene --root=..\src\scripts --root=..\src\system --root=..\src\time --root=..\src\viewer --namespace="glam" --namespace="glam.Object" --namespace="glam.Modules" --compiler_flags="--language_in=ECMASCRIPT5" --output_mode=script --compiler_jar=compiler.jar --output_file=%TARGET% + +REM type %LIBS% %NODEPS% %FONTS% %TARGET% > %OUTPUT% +copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% %OUTPUT% + diff --git a/utils/compile-min.bat b/utils/compile-min.bat new file mode 100644 index 0000000..1ab35e0 --- /dev/null +++ b/utils/compile-min.bat @@ -0,0 +1,46 @@ +REM Usage: +REM setup environment variables for CLOSURE_PATH + +SET BUILDDIR=..\build +SET TARGET=%BUILDDIR%\glam-nodeps.min.js +SET OUTPUT=%BUILDDIR%\glam.min.js +SET THREEDIR=..\libs\three.js.r68 +SET THREE=%THREEDIR%\three.min.js +SET STATS=%THREEDIR%\stats.min.js +SET LOADERS=%THREEDIR%\controls\VRControls.js+^ +%THREEDIR%\loaders\ColladaLoader.js+^ +%THREEDIR%\loaders\glTF\glTF-parser.js+^ +%THREEDIR%\loaders\glTF\glTFLoader.js+^ +%THREEDIR%\loaders\glTF\glTFLoaderUtils.js+^ +%THREEDIR%\loaders\glTF\glTFAnimation.js+^ +%THREEDIR%\postprocessing\EffectComposer.js+^ +%THREEDIR%\postprocessing\FilmPass.js+^ +%THREEDIR%\postprocessing\BloomPass.js+^ +%THREEDIR%\postprocessing\MaskPass.js+^ +%THREEDIR%\postprocessing\RenderPass.js+^ +%THREEDIR%\postprocessing\ShaderPass.js+^ +%THREEDIR%\renderers\StereoEffect.js+^ +%THREEDIR%\renderers\VREffect.js+^ +%THREEDIR%\shaders\ConvolutionShader.js+^ +%THREEDIR%\shaders\CopyShader.js+^ +%THREEDIR%\shaders\DotScreenShader.js+^ +%THREEDIR%\shaders\DotScreenRGBShader.js+^ +%THREEDIR%\shaders\FilmShader.js+^ +%THREEDIR%\shaders\FXAAShader.js+^ +%THREEDIR%\shaders\RGBShiftShader.js+^ +%THREEDIR%\ParticleEngine\ShaderParticles.min.js + +SET RAF=..\libs\requestAnimationFrame\RequestAnimationFrame.js +SET TWEEN=..\libs\tween.js\tween.min.js +SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF% +SET NODEPS=..\src\config\nodeps.js +SET FLAGS='--language_in=ECMASCRIPT5' +SET FONTS=..\fonts\helvetiker_bold.typeface.js+^ +..\fonts\helvetiker_regular.typeface.js + +SET BASE=%CLOSURE_PATH%\closure\goog\base.js +REM replaced --root=%CLOSURE_PATH% with BASE +%CLOSURE_PATH%\closure\bin\build\closurebuilder.py %BASE% --root=..\src\animations --root=..\src\behaviors --root=..\src\cameras --root=..\src\controllers --root=..\src\config --root=..\src\core --root=..\src\dom --root=..\src\events --root=..\src\graphics --root=..\src\helpers --root=..\src\input --root=..\src\lights --root=..\src\loaders --root=..\src\objects --root=..\src\particles --root=..\src\postprocessing --root=..\src\prefabs --root=..\src\scene --root=..\src\scripts --root=..\src\system --root=..\src\time --root=..\src\viewer --namespace="glam" --namespace="glam.Object" --namespace="glam.Modules" --compiler_flags=%FLAGS% --output_mode=compiled --compiler_jar=compiler.jar --output_file=%TARGET% + +copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% %OUTPUT% + From 1fe9970a224b3229d98c266e35d9d2becbbefb8f Mon Sep 17 00:00:00 2001 From: marshworks Date: Mon, 3 Aug 2015 09:00:06 -0700 Subject: [PATCH 2/3] updating error in compile-min.bat --- .gitignore | 2 +- utils/compile-min.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5a95a97..1c1d02d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ - +.idea .DS_Store .DS_Store diff --git a/utils/compile-min.bat b/utils/compile-min.bat index 1ab35e0..ffde33c 100644 --- a/utils/compile-min.bat +++ b/utils/compile-min.bat @@ -34,7 +34,7 @@ SET RAF=..\libs\requestAnimationFrame\RequestAnimationFrame.js SET TWEEN=..\libs\tween.js\tween.min.js SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF% SET NODEPS=..\src\config\nodeps.js -SET FLAGS='--language_in=ECMASCRIPT5' +SET FLAGS="--language_in=ECMASCRIPT5" SET FONTS=..\fonts\helvetiker_bold.typeface.js+^ ..\fonts\helvetiker_regular.typeface.js From 26926a580682155b902d7a55bdc0ee900eb776da Mon Sep 17 00:00:00 2001 From: marshworks Date: Mon, 3 Aug 2015 09:56:35 -0700 Subject: [PATCH 3/3] another round of bat file changes --- .gitignore | 1 + utils/compile-all.bat | 4 ++-- utils/compile-debug.bat | 9 +++++---- utils/compile-min.bat | 8 ++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1c1d02d..b93e954 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .DS_Store .DS_Store +compile-jm.bat diff --git a/utils/compile-all.bat b/utils/compile-all.bat index e728b02..9021ed2 100644 --- a/utils/compile-all.bat +++ b/utils/compile-all.bat @@ -1,4 +1,4 @@ Echo "Compiling debug..." -compile-debug.bat +call compile-debug.bat Echo "Compiling min..." -compile-min.bat +call compile-min.bat diff --git a/utils/compile-debug.bat b/utils/compile-debug.bat index 73e2ee8..4ac2467 100644 --- a/utils/compile-debug.bat +++ b/utils/compile-debug.bat @@ -32,15 +32,16 @@ SET LOADERS=%THREEDIR%\controls\VRControls.js+^ SET RAF=..\libs\requestAnimationFrame\RequestAnimationFrame.js SET TWEEN=..\libs\tween.js\tween.min.js -SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF% +REM HTML is not used, but is included for now just so the diff will tparisi/glam master will be right +SET HTML=..\libs\html2canvas\html2canvas.js +SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF%+%HTML% SET NODEPS=..\src\config\nodeps.js SET FONTS=..\fonts\helvetiker_bold.typeface.js+^ ..\fonts\helvetiker_regular.typeface.js SET BASE=%CLOSURE_PATH%\closure\goog\base.js -REM --root=%CLOSURE_PATH% +REM replaced --root=%CLOSURE_PATH% with BASE, because there is no need to include the hundreds of google closure files %CLOSURE_PATH%\closure\bin\build\closurebuilder.py %BASE% --root=..\src\animations --root=..\src\behaviors --root=..\src\cameras --root=..\src\controllers --root=..\src\config --root=..\src\core --root=..\src\dom --root=..\src\events --root=..\src\graphics --root=..\src\helpers --root=..\src\input --root=..\src\lights --root=..\src\loaders --root=..\src\objects --root=..\src\particles --root=..\src\postprocessing --root=..\src\prefabs --root=..\src\scene --root=..\src\scripts --root=..\src\system --root=..\src\time --root=..\src\viewer --namespace="glam" --namespace="glam.Object" --namespace="glam.Modules" --compiler_flags="--language_in=ECMASCRIPT5" --output_mode=script --compiler_jar=compiler.jar --output_file=%TARGET% -REM type %LIBS% %NODEPS% %FONTS% %TARGET% > %OUTPUT% -copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% %OUTPUT% +copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% /a %OUTPUT% /b diff --git a/utils/compile-min.bat b/utils/compile-min.bat index ffde33c..c2ea2ba 100644 --- a/utils/compile-min.bat +++ b/utils/compile-min.bat @@ -32,15 +32,15 @@ SET LOADERS=%THREEDIR%\controls\VRControls.js+^ SET RAF=..\libs\requestAnimationFrame\RequestAnimationFrame.js SET TWEEN=..\libs\tween.js\tween.min.js -SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF% +SET HTML=..\libs\html2canvas\html2canvas.js +SET LIBS=%THREE%+%STATS%+%LOADERS%+%TWEEN%+%RAF%+%HTML% SET NODEPS=..\src\config\nodeps.js SET FLAGS="--language_in=ECMASCRIPT5" SET FONTS=..\fonts\helvetiker_bold.typeface.js+^ ..\fonts\helvetiker_regular.typeface.js SET BASE=%CLOSURE_PATH%\closure\goog\base.js -REM replaced --root=%CLOSURE_PATH% with BASE +REM replaced --root=%CLOSURE_PATH% with BASE, because there is no need to include the hundreds of google closure files %CLOSURE_PATH%\closure\bin\build\closurebuilder.py %BASE% --root=..\src\animations --root=..\src\behaviors --root=..\src\cameras --root=..\src\controllers --root=..\src\config --root=..\src\core --root=..\src\dom --root=..\src\events --root=..\src\graphics --root=..\src\helpers --root=..\src\input --root=..\src\lights --root=..\src\loaders --root=..\src\objects --root=..\src\particles --root=..\src\postprocessing --root=..\src\prefabs --root=..\src\scene --root=..\src\scripts --root=..\src\system --root=..\src\time --root=..\src\viewer --namespace="glam" --namespace="glam.Object" --namespace="glam.Modules" --compiler_flags=%FLAGS% --output_mode=compiled --compiler_jar=compiler.jar --output_file=%TARGET% -copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% %OUTPUT% - +copy %LIBS%+%NODEPS%+%FONTS%+%TARGET% /a %OUTPUT% /b