Correction for the support scaladoc

Author: Dedelweiss

dist/bin/common

@@ -131,9 +131,34 @@ fi
 #/*--------------------------------------------------
 # * The code below is for Dotty
 # *-------------------------------------------------*/
+# Try to autodetect real location of the script
+if [ -z "${PROG_HOME-}" ] ; then
+  ## resolve links - $0 may be a link to PROG_HOME
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  PROG_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  PROG_HOME=`cd "$PROG_HOME" && pwd`
+
+  cd "$saveddir"
+fi
 
 find_lib () {
-  for lib in "$PROG_HOME"/lib/$1 ; do
+  for lib in $saveddir/dist/target/pack/lib/$1 ; do
     if [[ -f "$lib" ]]; then
       if [ -n "$CYGPATHCMD" ]; then
         "$CYGPATHCMD" -am "$lib"
@@ -220,4 +245,4 @@ addResidual () {
 }
 addScript () {
   script_args+=("'$1'")
-}
+}

dist/bin/scaladoc

@@ -28,7 +28,7 @@ if [ -z "${PROG_HOME-}" ] ; then
   cd "$saveddir"
 fi
 
-source "$PROG_HOME/bin/common"
+source "$saveddir/dist/bin/common"
 default_java_opts="-Xmx768m -Xms768m"
 withCompiler=true
 
@@ -129,14 +129,14 @@ echo "----------"
 echo $jvm_cp_args | grep tables
 echo "----------"
 
-eval "\"$JAVACMD\"" \
-     ${JAVA_OPTS:-$default_java_opts} \
-     "${java_args[@]}" \
-     "${jvm_cp_args-}" \
-      -Dscala.usejavacp=true \
-     "dotty.tools.scaladoc.Main"  \
-     "${scala_args[@]}" \
-     "${residual_args[@]}" \
-     "${scripting_string-}"
-scala_exit_status=$?
-onExit
+# eval "\"$JAVACMD\"" \
+#      ${JAVA_OPTS:-$default_java_opts} \
+#      "${java_args[@]}" \
+#      "${jvm_cp_args-}" \
+#       -Dscala.usejavacp=true \
+#      "dotty.tools.scaladoc.Main"  \
+#      "${scala_args[@]}" \
+#      "${residual_args[@]}" \
+#      "${scripting_string-}"
+# scala_exit_status=$?
+# onExit

project/scripts/cmdScaladocTests

@@ -1,5 +1,31 @@
 #!/usr/bin/env bash
 
+# Try to autodetect real location of the script
+if [ -z "${PROG_HOME-}" ] ; then
+  ## resolve links - $0 may be a link to PROG_HOME
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  PROG_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  PROG_HOME=`cd "$PROG_HOME" && pwd`
+
+  cd "$saveddir"
+fi
+
 source $(dirname $0)/cmdTestsCommon.inc.sh
 
 echo "testing scaladoc script"
@@ -20,8 +46,12 @@ SOURCE_LINKS_REPOSITORY="lampepfl/dotty"
 SOURCE_LINKS_VERSION="${GITHUB_SHA:-$DOTTY_BOOTSTRAPPED_VERSION}"
 
 "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"
+
+source "$saveddir/dist/target/pack/bin/scaladoc"
+
 dist/target/pack/bin/scaladoc \
   -d "$OUT1" \
+  $jvm_cp_args \
   -project "scaladoc testcases" \
   -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/scala-library-src=github://scala/scala/v"${STDLIB_VERSION}"#src/library \
   -source-links:out/bootstrap/stdlib-bootstrapped/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/src_managed/main/dotty-library-src=github://"${SOURCE_LINKS_REPOSITORY}"/"${SOURCE_LINKS_VERSION}"\#library/src \
@@ -42,4 +72,4 @@ dist/target/pack/bin/scaladoc \
   -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \
   "-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find A Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/," \
   out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
-diff -rq "$OUT1" "scaladoc/output/testcases"
+diff -rq "$OUT1" "scaladoc/output/testcases"