From ccefec92e857dd5bc2d8f7afc26d3c66d7d95bef Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 23 Aug 2016 01:35:02 -0400 Subject: [PATCH] releng: Move scripts to a subfolder As scripts accumulate, it's better to have them under a folder. Change-Id: I53cbb08c19e0ae43c8529f2b3dcbb42a935e187b Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/79475 Reviewed-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann --- .../{ => scripts}/check_mvn_plugin_versions.sh | 2 +- releng/{ => scripts}/master_to_stable_release.sh | 0 releng/{ => scripts}/set_automatic_updates.sh | 2 +- releng/{ => scripts}/set_stable_update_site.sh | 2 +- .../{ => scripts}/update_parent_pom_versions.py | 0 releng/{ => scripts}/update_root_pom_versions.py | 0 releng/{ => scripts}/update_version.sh | 16 ++++++++-------- 7 files changed, 11 insertions(+), 11 deletions(-) rename releng/{ => scripts}/check_mvn_plugin_versions.sh (93%) rename releng/{ => scripts}/master_to_stable_release.sh (100%) rename releng/{ => scripts}/set_automatic_updates.sh (92%) rename releng/{ => scripts}/set_stable_update_site.sh (92%) rename releng/{ => scripts}/update_parent_pom_versions.py (100%) rename releng/{ => scripts}/update_root_pom_versions.py (100%) rename releng/{ => scripts}/update_version.sh (54%) diff --git a/releng/check_mvn_plugin_versions.sh b/releng/scripts/check_mvn_plugin_versions.sh similarity index 93% rename from releng/check_mvn_plugin_versions.sh rename to releng/scripts/check_mvn_plugin_versions.sh index fb4d75173a..5a68d036c4 100755 --- a/releng/check_mvn_plugin_versions.sh +++ b/releng/scripts/check_mvn_plugin_versions.sh @@ -14,7 +14,7 @@ # Point ourselves to the script's directory (so it can be run "out-of-tree") DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -output=`mvn versions:display-plugin-updates -U -f $DIR/../pom.xml` +output=`mvn versions:display-plugin-updates -U -f $DIR/../../pom.xml` #filter only updates and show unique summary=`echo "${output}" | grep "\\->" | sort | uniq` diff --git a/releng/master_to_stable_release.sh b/releng/scripts/master_to_stable_release.sh similarity index 100% rename from releng/master_to_stable_release.sh rename to releng/scripts/master_to_stable_release.sh diff --git a/releng/set_automatic_updates.sh b/releng/scripts/set_automatic_updates.sh similarity index 92% rename from releng/set_automatic_updates.sh rename to releng/scripts/set_automatic_updates.sh index 748315d177..91e1a30b45 100755 --- a/releng/set_automatic_updates.sh +++ b/releng/scripts/set_automatic_updates.sh @@ -12,7 +12,7 @@ # default. This sets the preference through plugin_customization.ini # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=499247 -PATH_TO_PREFERENCE_FILE="../rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini" +PATH_TO_PREFERENCE_FILE="../../rcp/org.eclipse.tracecompass.rcp.branding/plugin_customization.ini" OUTPUT=$(cat $PATH_TO_PREFERENCE_FILE | grep org.eclipse.equinox.p2.ui.sdk.scheduler | grep enabled) if [[ -z "$OUTPUT" ]]; diff --git a/releng/set_stable_update_site.sh b/releng/scripts/set_stable_update_site.sh similarity index 92% rename from releng/set_stable_update_site.sh rename to releng/scripts/set_stable_update_site.sh index 3a00ccf8f0..00be49acfa 100755 --- a/releng/set_stable_update_site.sh +++ b/releng/scripts/set_stable_update_site.sh @@ -12,7 +12,7 @@ # meant to be used when the master branch is being branched into a stable # branch. -PATH_TO_PRODUCT_FILE="../rcp/org.eclipse.tracecompass.rcp.product/tracing.product" +PATH_TO_PRODUCT_FILE="../../rcp/org.eclipse.tracecompass.rcp.product/tracing.product" OUTPUT=$(cat $PATH_TO_PRODUCT_FILE | grep " tag with the new version of the root pom -find .. -name "pom.xml" -type f -exec python update_parent_pom_versions.py {} $oldVersion $newVersion \; +find ../.. -name "pom.xml" -type f -exec python update_parent_pom_versions.py {} $oldVersion $newVersion \; #Update doc plugin versions -find ../doc -name "MANIFEST.MF" -exec sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g {} \; +find ../../doc -name "MANIFEST.MF" -exec sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g {} \; #Update feature versions (feature.xml) -find .. -name "feature.xml" -exec sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g {} \; +find ../.. -name "feature.xml" -exec sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g {} \; #Update branding plugin manifest.MF -sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g ../rcp/org.eclipse.tracecompass.rcp.branding/META-INF/MANIFEST.MF +sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g ../../rcp/org.eclipse.tracecompass.rcp.branding/META-INF/MANIFEST.MF #rcp/org.eclipse.tracecompass.rcp.branding/plugin.xml aboutText -sed -i -e s/$oldVersion/$newVersion/g ../rcp/org.eclipse.tracecompass.rcp.branding/plugin.xml +sed -i -e s/$oldVersion/$newVersion/g ../../rcp/org.eclipse.tracecompass.rcp.branding/plugin.xml #Update .product rcp/org.eclipse.tracecompass.rcp.product/tracing.product -sed -i -e s/$oldVersion/$newVersion/g ../rcp/org.eclipse.tracecompass.rcp.product/tracing.product +sed -i -e s/$oldVersion/$newVersion/g ../../rcp/org.eclipse.tracecompass.rcp.product/tracing.product #Update rcp.ui plugin rcp/org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF -sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g ../rcp/org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF +sed -i -e s/$oldVersion.qualifier/$newVersion.qualifier/g ../../rcp/org.eclipse.tracecompass.rcp.ui/META-INF/MANIFEST.MF -- 2.34.1