[gnome-ostree] ostbuild: Move builtins into separate directory

[Colin Walters <walters src gnome org>]

commit cc9be335270cdec6c4fe4ccfd20e4d53459a3cfd
Author: Colin Walters <walters verbum org>
Date:   Sun Jan 6 09:35:09 2013 -0500

    ostbuild: Move builtins into separate directory
    
    This is just clearer.

 Makefile-ostbuild.am                          |   16 ++++++++++------
 src/ostbuild/js/{ => builtins}/autobuilder.js |    0
 src/ostbuild/js/{ => builtins}/build.js       |    0
 src/ostbuild/js/{ => builtins}/checkout.js    |    0
 src/ostbuild/js/{ => builtins}/git_mirror.js  |    0
 src/ostbuild/js/{ => builtins}/prefix.js      |    0
 src/ostbuild/js/{ => builtins}/resolve.js     |    0
 src/ostbuild/js/main.js                       |    2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 6e09062..7a685c4 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -38,23 +38,27 @@ utilsdir = $(pkglibdir)
 jsostbuilddir=$(pkgdatadir)/js
 jsostbuild_DATA= \
 	src/ostbuild/js/argparse.js \
-	src/ostbuild/js/autobuilder.js \
-	src/ostbuild/js/build.js \
 	src/ostbuild/js/buildutil.js \
-	src/ostbuild/js/checkout.js \
 	src/ostbuild/js/config.js \
-	src/ostbuild/js/git_mirror.js \
 	src/ostbuild/js/jsondb.js \
 	src/ostbuild/js/jsonutil.js \
 	src/ostbuild/js/main.js \
 	src/ostbuild/js/params.js \
-	src/ostbuild/js/prefix.js \
 	src/ostbuild/js/procutil.js \
-	src/ostbuild/js/resolve.js \
 	src/ostbuild/js/snapshot.js \
 	src/ostbuild/js/streamutil.js \
 	src/ostbuild/js/task.js \
 	src/ostbuild/js/vcs.js \
 	$(NULL)
 
+jsostbuiltinsdir=$(jsostbuilddir)/builtins
+jsostbuiltins_DATA= \
+	src/ostbuild/js/builtins/autobuilder.js \
+	src/ostbuild/js/builtins/build.js \
+	src/ostbuild/js/builtins/checkout.js \
+	src/ostbuild/js/builtins/git_mirror.js \
+	src/ostbuild/js/builtins/prefix.js \
+	src/ostbuild/js/builtins/resolve.js \
+	$(NULL)
+
 endif
diff --git a/src/ostbuild/js/autobuilder.js b/src/ostbuild/js/builtins/autobuilder.js
similarity index 100%
rename from src/ostbuild/js/autobuilder.js
rename to src/ostbuild/js/builtins/autobuilder.js
diff --git a/src/ostbuild/js/build.js b/src/ostbuild/js/builtins/build.js
similarity index 100%
rename from src/ostbuild/js/build.js
rename to src/ostbuild/js/builtins/build.js
diff --git a/src/ostbuild/js/checkout.js b/src/ostbuild/js/builtins/checkout.js
similarity index 100%
rename from src/ostbuild/js/checkout.js
rename to src/ostbuild/js/builtins/checkout.js
diff --git a/src/ostbuild/js/git_mirror.js b/src/ostbuild/js/builtins/git_mirror.js
similarity index 100%
rename from src/ostbuild/js/git_mirror.js
rename to src/ostbuild/js/builtins/git_mirror.js
diff --git a/src/ostbuild/js/prefix.js b/src/ostbuild/js/builtins/prefix.js
similarity index 100%
rename from src/ostbuild/js/prefix.js
rename to src/ostbuild/js/builtins/prefix.js
diff --git a/src/ostbuild/js/resolve.js b/src/ostbuild/js/builtins/resolve.js
similarity index 100%
rename from src/ostbuild/js/resolve.js
rename to src/ostbuild/js/builtins/resolve.js
diff --git a/src/ostbuild/js/main.js b/src/ostbuild/js/main.js
index ee7ae01..55ed988 100755
--- a/src/ostbuild/js/main.js
+++ b/src/ostbuild/js/main.js
@@ -44,7 +44,7 @@ if (ARGV.length < 1) {
     }
     let args = ARGV.concat();
     args.shift();
-    imports[name.replace(/-/g, '_')].main(args);
+    imports.builtins[name.replace(/-/g, '_')].main(args);
 }