diff options
| -rw-r--r-- | www-apps/isso/isso-9999.ebuild | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/www-apps/isso/isso-9999.ebuild b/www-apps/isso/isso-9999.ebuild index 41370826..5b5de306 100644 --- a/www-apps/isso/isso-9999.ebuild +++ b/www-apps/isso/isso-9999.ebuild @@ -61,9 +61,11 @@ if [[ ${PV} == *9999* ]]; then net-libs/nodejs doc? ( dev-python/sphinx )" fi -DEPEND="${HDEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] +DEPEND="${HDEPEND}" +if [[ ${PV} == *9999* ]]; then + DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] ${LIBDEPEND} )" +fi RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${LIBDEPEND}" @@ -91,9 +93,6 @@ src_unpack() { mkdir -p "${S}"/isso/js/components/{requirejs-text,almond} || die cp "${WORKDIR}"/text.git/text.js "${S}"/isso/js/components/requirejs-text/ || die cp "${WORKDIR}"/almond.git/almond.js "${S}"/isso/js/components/almond/ || die - - # TODO: Consider building r.js - cp "${WORKDIR}"/r.js.git/dist/r.js "${S}"/bin/ || die else default fi @@ -101,13 +100,21 @@ src_unpack() { src_compile() { if [[ ${PV} == *9999* ]]; then + # build r.js + pushd "${WORKDIR}"/r.js.git 2>/dev/null + node dist.js || die + popd 2>/dev/null + local RJS=${WORKDIR}/r.js.git/r.js + + # generate css scss isso/css/isso.scss isso/css/isso.css || die - node bin/r.js -o isso/js/build.embed.js || die - node bin/r.js -o isso/js/build.count.js || die + # generate js using r.js + node "${RJS}" -o isso/js/build.embed.js || die + node "${RJS}" -o isso/js/build.count.js || die if use debug; then - node bin/r.js -o isso/js/build.embed.js optimize="none" out="isso/js/embed.dev.js" || die - node bin/r.js -o isso/js/build.count.js optimize="none" out="isso/js/count.dev.js" || die + node "${RJS}" -o isso/js/build.embed.js optimize="none" out="isso/js/embed.dev.js" || die + node "${RJS}" -o isso/js/build.count.js optimize="none" out="isso/js/count.dev.js" || die fi fi distutils-r1_src_compile |
