[releng] Make it easier to run cleanup scripts out of tree

eclipse-cdt · Feb 16, 2023 · cb367f0 · cb367f0
1 parent 78f437d
commit cb367f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/releng/scripts/do_format_code.sh b/releng/scripts/do_format_code.sh
@@ -16,6 +16,8 @@ set -e
 # This script is reused by other projects, if so, COREPROJECT should be set
 # to the project to use a basis for project settings
 ##
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+CDTDIR=${DIR}/../..
 : ${COREPROJECT:=core/org.eclipse.cdt.core}
 
 ##
@@ -37,6 +39,6 @@ if test -e check_code_cleanliness_workspace; then
 fi
 ${ECLIPSE} \
     -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \
-    -config $PWD/$COREPROJECT/.settings/org.eclipse.jdt.core.prefs \
+    -config $CDTDIR/$COREPROJECT/.settings/org.eclipse.jdt.core.prefs \
     $PWD -data check_code_cleanliness_workspace
 rm -rf check_code_cleanliness_workspace
diff --git a/releng/scripts/do_project_settings.sh b/releng/scripts/do_project_settings.sh
@@ -17,6 +17,8 @@ set -e
 # This script is reused by other projects, if so, COREPROJECT should be set
 # to the project to use a basis for project settings
 ##
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+CDTDIR=${DIR}/../..
 : ${COREPROJECT:=core/org.eclipse.cdt.core}
 
 ##
@@ -47,7 +49,7 @@ git ls-files  -- \*\*/.project ":!$COREPROJECT/.project" | while read i ; do
 
     # JDT
     if [[ $natures == *"org.eclipse.jdt.core.javanature"* ]]; then
-        cp $COREPROJECT/.settings/org.eclipse.jdt.* $d/.settings
+        cp $CDTDIR/$COREPROJECT/.settings/org.eclipse.jdt.* $d/.settings
         # For test plug-ins we are more lenient so don't warn on some items
         if echo $i | grep -E '\.tests?[/\.]' > /dev/null; then
             sed -i \
@@ -78,8 +80,8 @@ git ls-files  -- \*\*/.project ":!$COREPROJECT/.project" | while read i ; do
 
     # PDE
     if [[ $natures == *"org.eclipse.pde.PluginNature"* ]]; then
-        cp $COREPROJECT/.settings/org.eclipse.pde.prefs $d/.settings
-        cp $COREPROJECT/.settings/org.eclipse.pde.api.tools.prefs $d/.settings
+        cp $CDTDIR/$COREPROJECT/.settings/org.eclipse.pde.prefs $d/.settings
+        cp $CDTDIR/$COREPROJECT/.settings/org.eclipse.pde.api.tools.prefs $d/.settings
         if echo $i | grep -E '\.tests?[/\.]' > /dev/null; then
             sed -i \
                 '-es@compilers.p.not-externalized-att=1@compilers.p.not-externalized-att=2@' \