Date: Sat, 21 Jul 2012 12:45:14 +0000 (UTC) From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r301274 - in head/java/eclipse-pydev: . files Message-ID: <201207211245.q6LCjEEb033882@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nivit Date: Sat Jul 21 12:45:13 2012 New Revision: 301274 URL: http://svn.freebsd.org/changeset/ports/301274 Log: - Simplify code of files/pkg-install.in, and post-install target Buildlog: http://goo.gl/4U6wb Modified: head/java/eclipse-pydev/Makefile head/java/eclipse-pydev/files/pkg-install.in Modified: head/java/eclipse-pydev/Makefile ============================================================================== --- head/java/eclipse-pydev/Makefile Sat Jul 21 12:36:01 2012 (r301273) +++ head/java/eclipse-pydev/Makefile Sat Jul 21 12:45:13 2012 (r301274) @@ -37,8 +37,7 @@ USE_ZIP= yes DISTDATE= 2012062818 SUB_FILES= pkg-install -SUB_LIST= BUNDLES_INFO=${BUNDLES_INFO} DISTDATE=${DISTDATE} \ - PLUGINDIR=${PLUGINDIR} PORTVERSION=${PORTVERSION} +SUB_LIST= BUNDLES_INFO=${BUNDLES_INFO} PLUGINDIR=${PLUGINDIR} pre-install: @# ignore javashell.py file, because there is a syntax error @@ -46,21 +45,19 @@ pre-install: ${PYTHON_CMD} -m compileall -x javashell.py -f ${WRKSRC}/plugins ${PYTHON_CMD} -O -m compileall -x javashell.py -f ${WRKSRC} -REVDOM= python.pydev -PLUGINDIR= ../../share/eclipse/dropins/pydev/eclipse/plugins +PLUGINDIR= share/eclipse/dropins/pydev/eclipse/plugins BUNDLES_INFO= ${PREFIX}/lib/eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info -COMPONENTS= com com.analysis com.codecompletion com.debug com.fastparser com.refactoring \ - org org.ast org.core org.customizations org.debug org.django org.help org.jython org.parser org.red_core org.refactoring + post-install: @${ECHO_MSG} "===> Updating ${BUNDLES_INFO}" -.for d in com org -. for c in ${COMPONENTS:M${d}*} - @${ECHO_CMD} "${d}.${REVDOM}${c:S,${d},,},${PORTVERSION}.${DISTDATE},${PLUGINDIR}/${d}.${REVDOM}${c:S,${d},,}_${PORTVERSION}.${DISTDATE}/,4,false" >> ${BUNDLES_INFO} -. endfor -.endfor + @PLUGINS=$$(ls -1 ${PREFIX}/${PLUGINDIR}); \ + for d in $${PLUGINS}; do \ + (${ECHO_CMD} "$${d},../../${PLUGINDIR}/$${d}/,4,false" | \ + ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${BUNDLES_INFO}; \ + done @(${SORT} ${BUNDLES_INFO} > ${BUNDLES_INFO}.sort) && \ ${MV} ${BUNDLES_INFO}.sort ${BUNDLES_INFO} - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} add-plist-post: @${ECHO_CMD} "@exec ${MKDIR} %D/share/eclipse/dropins/${PORTNAME}/eclipse/plugins/com.python.pydev.codecompletion_${PORTVERSION}.${DISTDATE}/icons" >> ${TMPPLIST} Modified: head/java/eclipse-pydev/files/pkg-install.in ============================================================================== --- head/java/eclipse-pydev/files/pkg-install.in Sat Jul 21 12:36:01 2012 (r301273) +++ head/java/eclipse-pydev/files/pkg-install.in Sat Jul 21 12:45:13 2012 (r301274) @@ -8,18 +8,15 @@ fi PATH="/bin:/sbin:/usr/bin:/usr/sbin" BUNDLES_INFO=%%BUNDLES_INFO%% -DISTDATE=%%DISTDATE%% PLUGINDIR=%%PLUGINDIR%% -PORTVERSION=%%PORTVERSION%% -REVDOM=python.pydev +PREFIX=%%PREFIX%% if [ "$2" = "POST-INSTALL" ]; then echo "===> Updating ${BUNDLES_INFO}" - for c in '' '.analysis' '.codecompletion' '.debug' '.fastparser' '.refactoring'; do - echo "com.${REVDOM}${c},${PORTVERSION}.${DISTDATE},${PLUGINDIR}/com.${REVDOM}${c}_${PORTVERSION}.${DISTDATE}/,4,false" >> ${BUNDLES_INFO} - done - for c in '' '.ast' '.core' '.customizations' '.debug' '.django' '.help' '.jython' '.parser' '.red_core' '.refactoring'; do - echo "org.${REVDOM}${c},${PORTVERSION}.${DISTDATE},${PLUGINDIR}/org.${REVDOM}${c}_${PORTVERSION}.${DISTDATE}/,4,false" >> ${BUNDLES_INFO} + for d in $(ls -1 ${PREFIX}/${PLUGINDIR}) + do + (echo "${d},../../${PLUGINDIR}/${d}/,4,false" | \ + sed -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${BUNDLES_INFO} done sort ${BUNDLES_INFO} > ${BUNDLES_INFO}.sort && \ mv ${BUNDLES_INFO}.sort ${BUNDLES_INFO}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207211245.q6LCjEEb033882>