1.0.81 - misc

Author: SlimerDude

extras/adm/bootstrap.fan

@@ -7,6 +7,7 @@
 //   18 Dec 09  Brian Frank  Creation
 //
 
+using concurrent
 using util
 
 **
@@ -240,6 +241,9 @@ class Bootstrap : AbstractMain
     buf := Buf()
     p := Process(cmd) { out = buf.out }
     r := p.run.join
+    // note: i have observed on ubuntu that we need this sleep to
+    // give time for the output to flush to the buf
+    Actor.sleep(500ms)
     return r != 0 ? "" : buf.flip.readAllLines.first
   }
 

fantom/bin/fant

@@ -4,5 +4,9 @@
 # fant: unit tester
 #
 
-. "${0%/*}/fanlaunch" 
-fanlaunch Fant "$@"
+# To run original Java version:
+#   fanlaunch Fant "$@"
+
+. "${0%/*}/fanlaunch"
+fanlaunch Fan "util::TestRunner" "$@"
+

fantom/bin/fant.bat

@@ -4,9 +4,10 @@ REM Copyright (c) 2015, Brian Frank and Andy Frank
 REM Licensed under the Academic Free License version 3.0
 REM
 REM History:
-REM    27 Jul 2015	Matthew Giannini	Creation
+REM    27 Jul 2015  Matthew Giannini  Creation
 REM
 REM fant: unit tester
 REM
 
-call "%~fs0\..\fanlaunch.bat" Fant %*
+call "%~fs0\..\fanlaunch.bat" Fan "util::TestRunner" %*
+

fantom/dockerfile

@@ -18,13 +18,13 @@
 
 ARG JDK_VERSION=17
 
-FROM eclipse-temurin:$JDK_VERSION as bootstrap
+FROM eclipse-temurin:$JDK_VERSION AS bootstrap
 
 ARG SWT_DL_URL=https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/R-4.27-202303020300/swt-4.27-gtk-linux-x86_64.zip&mirror_id=1
 
 # These define the `rel` Fantom version.
-ARG REL_VERSION=fantom-1.0.79
-ARG REL_TAG=v1.0.79
+ARG REL_VERSION=fantom-1.0.80
+ARG REL_TAG=v1.0.80
 
 WORKDIR /work
 
@@ -47,20 +47,13 @@ RUN set -e; \
 
 COPY . ./fan/
 
-# Copy SWT into installations
-#RUN mkdir rel/lib/java/ext/linux-x86_64 \
-#    && cp swt.jar rel/lib/java/ext/linux-x86_64/ \
-#    && mkdir fan/lib/java/ext/linux-x86_64 \
-#    && cp swt.jar fan/lib/java/ext/linux-x86_64/ \
-#    && rm swt.jar
-
-# Populate config.props with jdkHome (to use jdk, not jre) and devHome
-RUN echo -e "\n\njdkHome=$JAVA_HOME/\ndevHome=/work/fan/\n" >> rel/etc/build/config.props \
-    && echo -e "\n\njdkHome=$JAVA_HOME/" >> fan/etc/build/config.props
-
-RUN rel/bin/fan fan/src/buildall.fan superclean \
-    && rel/bin/fan fan/src/buildboot.fan compile \
-    && fan/bin/fan fan/src/buildpods.fan compile
+RUN <<EOF
+  echo "\n\njdkHome=${JAVA_HOME}/\ndevHome=/work/fan/\n" >> rel/etc/build/config.props
+  echo "\n\njdkHome=${JAVA_HOME}/" >> fan/etc/build/config.props
+  rel/bin/fan fan/src/buildall.fan superclean
+  rel/bin/fan fan/src/buildboot.fan compile
+  fan/bin/fan fan/src/buildpods.fan compile
+EOF
 
 # The /work/fan directory now contains a compiled version of the local Fantom
 
@@ -69,11 +62,11 @@ RUN rel/bin/fan fan/src/buildall.fan superclean \
 # ================================
 # This simply copies the new Fantom into a fresh container and sets up the path.
 
-FROM eclipse-temurin:$JDK_VERSION as run
+FROM eclipse-temurin:$JDK_VERSION AS run
 
 COPY --from=bootstrap /work/fan/ /opt/fan/
 
-ENV PATH $PATH:/opt/fan/bin
+ENV PATH=$PATH:/opt/fan/bin
 
 # Return Fantom's version
 CMD ["fan","-version"]

fantom/etc/build/config.props

@@ -11,7 +11,7 @@
 //
 
 // default version used by build scripts
-buildVersion=1.0.80
+buildVersion=1.0.81
 
 // Must be configured boot build in substitute/release installation
 //devHome=/work/fan/