build.py: full ⟶ common

utils/build.bat

@@ -1,3 +1,3 @@
-python build.py --full
+python build.py --common
+python build.py --common --debug
 python build.py --extras
-python build.py --full --debug

utils/build.py

@@ -84,7 +84,7 @@ def build(files, debug, outputFilename):
 	output(addHeader(compress(text), outputFilename), outputFilename)
 
 
-def buildExtras(debug):
+def buildCommon(debug):
 	files = [
 		'Three.js',
 		'core/Color.js',
@@ -132,21 +132,12 @@ def buildExtras(debug):
 		'renderers/WebGLRenderer.js',
 		'renderers/renderables/RenderableFace3.js',
 		'renderers/renderables/RenderableParticle.js',
-		'renderers/renderables/RenderableLine.js',
-		'extras/GeometryUtils.js',
-		'extras/ImageUtils.js',
-		'extras/SceneUtils.js',
-		'extras/ShaderUtils.js',
-		'extras/primitives/Cube.js',
-		'extras/primitives/Cylinder.js',
-		'extras/primitives/Plane.js',
-		'extras/primitives/Sphere.js',
-		'extras/io/Loader.js'
+		'renderers/renderables/RenderableLine.js'
 	]
 
-	build(files, debug, 'ThreeExtras')
+	build(files, debug, 'Three')
 
-def buildFull(debug):
+def buildExtras(debug):
 	files = [
 		'Three.js',
 		'core/Color.js',
@@ -194,11 +185,19 @@ def buildFull(debug):
 		'renderers/WebGLRenderer.js',
 		'renderers/renderables/RenderableFace3.js',
 		'renderers/renderables/RenderableParticle.js',
-		'renderers/renderables/RenderableLine.js'
+		'renderers/renderables/RenderableLine.js',
+		'extras/GeometryUtils.js',
+		'extras/ImageUtils.js',
+		'extras/SceneUtils.js',
+		'extras/ShaderUtils.js',
+		'extras/primitives/Cube.js',
+		'extras/primitives/Cylinder.js',
+		'extras/primitives/Plane.js',
+		'extras/primitives/Sphere.js',
+		'extras/io/Loader.js'
 	]
 
-	build(files, debug, 'Three')
-
+	build(files, debug, 'ThreeExtras')
 
 def buildCanvas(debug):
 
@@ -375,8 +374,8 @@ def parse_args():
 
 	if ap:
 		parser = argparse.ArgumentParser(description='Build and compress Three.js')
+		parser.add_argument('--common', help='Build Three.js', action='store_const', const=True)
 		parser.add_argument('--extras', help='Build ThreeExtras.js', action='store_const', const=True)
-		parser.add_argument('--full', help='Build Three.js', action='store_const', const=True)
 		parser.add_argument('--canvas', help='Build ThreeCanvas.js', action='store_true')
 		parser.add_argument('--webgl', help='Build ThreeWebGL.js', action='store_true')
 		parser.add_argument('--svg', help='Build ThreeSVG.js', action='store_true')
@@ -388,8 +387,8 @@ def parse_args():
 
 	else:
 		parser = optparse.OptionParser(description='Build and compress Three.js')
+		parser.add_option('--common', dest='common', help='Build Three.js', action='store_const', const=True)
 		parser.add_option('--extras', dest='extras', help='Build ThreeExtras.js', action='store_const', const=True)
-		parser.add_option('--full', dest='full', help='Build Three.js', action='store_const', const=True)
 		parser.add_option('--canvas', dest='canvas', help='Build ThreeCanvas.js', action='store_true')
 		parser.add_option('--webgl', dest='webgl', help='Build ThreeWebGL.js', action='store_true')
 		parser.add_option('--svg', dest='svg', help='Build ThreeSVG.js', action='store_true')
@@ -413,8 +412,8 @@ def main(argv=None):
 
 	debug = args.debug
 
-	if args.full or args.all:
-		buildFull(debug)
+	if args.common or args.all:
+		buildCommon(debug)
 
 	if args.extras:
 		buildExtras(debug)

utils/build.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-python build.py --full 
+python build.py --common 
+python build.py --common --debug
 python build.py --extras
-python build.py --full --debug
-
-# python build.py --help