Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2020-10-14 14:57:01 +0000
committerJonah Graham2020-10-14 15:01:30 +0000
commit939e8c2279836e205c1a0c0a5f42c11b73c039ee (patch)
treed7ec0a6a920acdeeabd00fd82f127499a2d39278
parent61e7450285af938c4127449d30301f7b20d6af93 (diff)
downloadorg.eclipse.epp.packages-939e8c2279836e205c1a0c0a5f42c11b73c039ee.tar.gz
org.eclipse.epp.packages-939e8c2279836e205c1a0c0a5f42c11b73c039ee.tar.xz
org.eclipse.epp.packages-939e8c2279836e205c1a0c0a5f42c11b73c039ee.zip
Bug 567877: Remove assumption that package names are not substrings of other names
-rw-r--r--packages/org.eclipse.epp.package.common/a0
-rwxr-xr-xreleng/org.eclipse.epp.config/tools/createSettings.sh26
2 files changed, 17 insertions, 9 deletions
diff --git a/packages/org.eclipse.epp.package.common/a b/packages/org.eclipse.epp.package.common/a
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/org.eclipse.epp.package.common/a
diff --git a/releng/org.eclipse.epp.config/tools/createSettings.sh b/releng/org.eclipse.epp.config/tools/createSettings.sh
index 1b8ee915..5cd4ea53 100755
--- a/releng/org.eclipse.epp.config/tools/createSettings.sh
+++ b/releng/org.eclipse.epp.config/tools/createSettings.sh
@@ -53,19 +53,23 @@ echo " </mirrors>" >>$SETTINGS_FILE
echo " <activeProfiles>" >>$SETTINGS_FILE
-### use the HEAD commit to find out which package directories contain a change
+## PACKAGES contains the list of packages that have been examined already. Start
+## by preloading with IGNORED_PACKAGES so that none of them are added
PACKAGES="${IGNORED_PACKAGES}"
+
+
+### use the HEAD commit to find out which package directories contain a change
cd ${WORKSPACE}/${GIT_REPOSITORY}
for II in `git diff-tree --name-only --no-commit-id -r HEAD | cut -d "/" -f 2 | cut -d "." -f 5 | sort | uniq`; do
- if [[ "common" =~ ${II} ]]
+ if [[ "common" == ${II} ]]
then
- echo "${II} found; will trigger a full package build."
+ echo "Change detected in common bundles found; will trigger a full package build."
FULL_BUILD="true"
continue
fi
if [[ ${IGNORED_PACKAGES} =~ ${II} ]]
then
- echo "${II} contains changes, but is ignored or a duplicate."
+ echo "${II} contains changes, but is ignored or already added."
continue
fi
PACKAGE="epp.package.${II}"
@@ -81,21 +85,25 @@ OTHERCHANGES="xxx`git diff-tree --name-only --no-commit-id -r HEAD | grep -v "^p
if [ "${OTHERCHANGES}" != "xxxxxx" ] || [ "${FULL_BUILD}" == "true" ]
then
echo "Full build required. Adding all packages"
- ALLPACKAGES=`ls packages | cut -d "." -f 5 | sort | uniq`
+ ALLPACKAGES="xxx `ls packages | cut -d "." -f 5 | sort | uniq` xxx"
for II in ${ALLPACKAGES}; do
- if [[ "common" =~ ${II} ]]
+ if [[ "xxx" == ${II} ]]
+ then
+ continue
+ fi
+ if [[ "common" == ${II} ]]
then
continue
fi
- if [[ ${PACKAGES} =~ ${II} ]]
+ if [[ ${PACKAGES} =~ "epp.package.${II} " ]]
then
- echo "${II} should be added for all packages, but it is ignored or a duplicate."
+ echo "${II} should be added for all packages, but it is ignored or already added."
continue
else
PACKAGE="epp.package.${II}"
echo "Adding package $PACKAGE"
echo " <activeProfile>${PACKAGE}</activeProfile>" >>$SETTINGS_FILE
- PACKAGES="${PACKAGES}"
+ PACKAGES="${PACKAGES} ${PACKAGE}"
fi
done
fi

Back to the top