aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Ferrell <major@homeonderanged.org>2014-03-05 10:38:44 -0800
committerMark Ferrell <major@homeonderanged.org>2014-03-05 10:40:27 -0800
commite61d151b95472c74a005dc0e875e56310e2662b3 (patch)
treec9d4d5c866462bb50fc5868ee5cba8ee08403ac1
parent99a4f44e0a3a7529ed395957c31810a205f5db5a (diff)
Rename the import() routine to load_rules()
* There are plans for a new routined named import() which has nothing to do with loading of packages, or package rules. * The new name better describes the process which is going on.
-rwxr-xr-xbuild6
-rwxr-xr-xbuilder/build-export2
-rwxr-xr-xbuilder/build-package10
-rwxr-xr-xbuilder/build-query2
-rwxr-xr-xbuilder/build-source2
5 files changed, 11 insertions, 11 deletions
diff --git a/build b/build
index d13a453..7471e9c 100755
--- a/build
+++ b/build
@@ -41,9 +41,9 @@ die()
exit 1
}
-## import <package>
-# import a package into the current program space
-import()
+## load_rules <package>
+# load the Buildrules of a package into the current program space
+load_rules()
{
# Evaluate our environment data
# There is a bit of a performance penalty here in that the query
diff --git a/builder/build-export b/builder/build-export
index 732b888..d611088 100755
--- a/builder/build-export
+++ b/builder/build-export
@@ -1,6 +1,6 @@
#!/usr/bin/env build
-import "${1}"
+load_rules "${1}"
if test -z "${LICENSE}"; then
die "no license set in '${1}'"
diff --git a/builder/build-package b/builder/build-package
index 1d02691..020259c 100755
--- a/builder/build-package
+++ b/builder/build-package
@@ -40,7 +40,7 @@ build_compile()
}
pkg_compile() { build_compile; }
-import "${1}"
+load_rules "${1}"
## Cleanup the build build environment
for dir in "${S}" "${D}"; do
@@ -109,9 +109,9 @@ if [ ! -z "${PATCHES}" ]; then
fi
-# Declare compilation variables before import as the package may potentially
-# overwrite this data, in particular the toolchain data is usually rewritten
-# within the toolchain/buildtools rule.
+# Declare compilation variables before loading the rules as the package may
+# potentially overwrite this data, in particular the toolchain data is usually
+# rewritten within the toolchain/buildtools rule.
echo "compiling: ${1}"
eval "$(build-query --toolchain "${CHOST}")"
mkenv "compile"
@@ -126,7 +126,7 @@ export PKG_CONFIG_SYSROOT_DIR
# Don't pass along the builder jobcontrol data to child processes
unset MAKEFLAGS
-import "${1}"
+load_rules "${1}"
## Prep the build environment
# Technically much of this should have been done in build-prep, and this sort
diff --git a/builder/build-query b/builder/build-query
index be168ad..ad9e71f 100755
--- a/builder/build-query
+++ b/builder/build-query
@@ -243,7 +243,7 @@ if test "$#" -eq "0"; then
die "no package specified"
fi
-# We can aquire this data before we bother importing anything
+# We can aquire this data before we bother loading anything
NAME="$(parse_name "${1}")"
CATEGORY="$(parse_category "${1}")"
PKG_NAME="${CATEGORY}/${NAME}"
diff --git a/builder/build-source b/builder/build-source
index 27910cd..843e133 100755
--- a/builder/build-source
+++ b/builder/build-source
@@ -8,7 +8,7 @@ pkg_prep()
return
}
-import "${1}"
+load_rules "${1}"
build_source_clean()
{