Hello
In order to integrate PDFhelp.fth into the kernel I had to make ./RebuildLin64.sh work. It says in the manual be careful of paths, which I automated, and fixed a couple of typos as well.
So now no more include for PDFhelp.fth, it just works when I boot Forth, happy bunny :)
Binary files ../../VfxForth64Lin.VIRGIN/Bin/VfxForth_x64_lin.elf and ./Bin/VfxForth_x64_lin.elf differ
diff -ruN ../../VfxForth64Lin.VIRGIN/Kernel/mlin64.sh ./Kernel/mlin64.sh
--- ../../VfxForth64Lin.VIRGIN/Kernel/mlin64.sh 2023-06-09 11:36:10.000000000 +0100
+++ ./Kernel/mlin64.sh 2023-08-27 19:06:03.625947939 +0100
@@ -6,12 +6,12 @@
# build arguments
VFX_ARGS="1 constant Community?"
-if [ "$VFX_BATCH_MODE" -eq "1" ]; then
+if [ "$VFX_BATCH_MODE" = "1" ]; then
VFX_ARGS+=" 1 constant BatchMode"
fi
# save the INI file
-cp ~/.VfxForth/VfxForth.ini ini.temp
+cp ~/.VfxForth/VfxForth64.ini ini.temp
# Build the desktop version
# TODO CI2020 stephen: why isn't that crosscompile in the buildkit?
@@ -28,7 +28,7 @@
$XCDIR/x64.elf $VFX_ARGS include x64lin1.ctl
mv -f VFXFORTH.img vfxkern64.elf
chmod +x vfxkern64.elf
-cp -a vfxkern64.elf ../Images/VfxForthK_x64_lin.elf
+cp -a vfxkern64.elf ${XCDIR}/VfxForthK_x64_lin.elf
# restore the INI file
-mv ini.temp ~/.VfxForth/VfxForth.ini
+mv ini.temp ~/.VfxForth/VfxForth64.ini
Binary files ../../VfxForth64Lin.VIRGIN/Kernel/vfxkern64.elf and ./Kernel/vfxkern64.elf differ
Binary files ../../VfxForth64Lin.VIRGIN/Kernel/XREF.XRF and ./Kernel/XREF.XRF differ
diff -ruN ../../VfxForth64Lin.VIRGIN/RebuildLin64.sh ./RebuildLin64.sh
--- ../../VfxForth64Lin.VIRGIN/RebuildLin64.sh 2023-06-09 11:36:10.000000000 +0100
+++ ./RebuildLin64.sh 2023-08-27 19:28:23.128666912 +0100
@@ -1,5 +1,5 @@
#! /bin/bash
-INI_FILE=${VFX_DEFAULT_INI:-$HOME/.VfxForth/VfxForth.ini}
+INI_FILE=${VFX_DEFAULT_INI:-$HOME/.VfxForth/VfxForth64.ini}
INI_TEMP=ini.temp
[ -f $INI_FILE ] && cp $INI_FILE $INI_TEMP
@@ -9,6 +9,15 @@
./mlin64.sh $*
cd ..
if [ "$VFX_BATCH_MODE" != "1" ]; then
- ./CopyLin64.sh
+ # ./CopyLin64.sh
+
+ printf "\n\n !!!! IMPORTANT PLEASE READ !!!! \n\n"
+ printf "Rebuild64.sh tries to execute ./CopyLin64.sh which does not exist !\n"
+ printf "I can't find the code for this file but from the name and the fact that\n"
+ printf "is right at the end I would guess that it copies the 64 bit linux exes\n"
+ printf "to Linux ... I would suggest you run ./InstallMe.Lin64.sh instead :)"
+ printf "\n\n"
+
fi
+
[ -f $INI_TEMP ] && mv $INI_TEMP $INI_FILE
diff -ruN ../../VfxForth64Lin.VIRGIN/VFXBase/mlin64.sh ./VFXBase/mlin64.sh
--- ../../VfxForth64Lin.VIRGIN/VFXBase/mlin64.sh 2023-06-09 11:36:10.000000000 +0100
+++ ./VFXBase/mlin64.sh 2023-08-27 18:59:10.784766919 +0100
@@ -4,7 +4,7 @@
# CI2020: setup directories
VFX_BUILDKIT_DIR=${VFX_BUILDKIT_DIR:-$HOME/buildkit.dev}
-VFX_DEFAULT_INI=${VFX_DEFAULT_INI:-$HOME/.VfxForth/VfxForth.ini}
+VFX_DEFAULT_INI=${VFX_DEFAULT_INI:-$HOME/.VfxForth/VfxForth64.ini}
# default values
BUILD_LEVEL=2
@@ -19,12 +19,24 @@
# save INI file
cp $VFX_DEFAULT_INI ini.temp
+# Build the desktop version
+# TODO CI2020 stephen: why isn't that crosscompile in the buildkit?
+if [ -d ../Images ]; then
+ XCDIR=../Images
+else
+ if [ -d ../Bin ]; then
+ XCDIR=../Bin
+ else
+ XCDIR=${HOME}/buildkit.dev/software/COMPILER
+ fi
+fi
+
# Build proper
cp VfxLin.no VfxLin.tmp
-../Images/VfxForthK_x64_lin.elf $VFX_ARGS
-cp -a vfxlin64 ../Images/VfxForth_x64_lin.elf
+${XCDIR}/VfxForthK_x64_lin.elf $VFX_ARGS
+cp -a vfxlin64 ${XCDIR}/VfxForth_x64_lin.elf
# mv -f vfxlin64 ../Images/VfxForth_x64_lin.elf
-chmod +x ../Images/VfxForth_x64_lin.elf
+chmod +x ${XCDIR}/VfxForth_x64_lin.elf
cp VfxLin.tmp VfxLin.no
# restore INI file
diff -ruN ../../VfxForth64Lin.VIRGIN/VFXBase/VfxBase64.bld ./VFXBase/VfxBase64.bld
--- ../../VfxForth64Lin.VIRGIN/VFXBase/VfxBase64.bld 2023-08-27 19:32:54.755206149 +0100
+++ ./VFXBase/VfxBase64.bld 2023-08-27 19:03:15.535811987 +0100
@@ -152,7 +152,7 @@
cr .( XREF ) include ../Lib/xref
cr .( DocGen ) include ../Lib/DocGen4
\ The next line should be the last of this group
-cr .( Config save/restore ) include Lin32/SysConfig
+cr .( Config save/restore ) include Lin64/SysConfig
[THEN]
[defined] Target_AA64_Linux [IF]
Binary files ../../VfxForth64Lin.VIRGIN/VFXBase/vfxlin64 and ./VFXBase/vfxlin64 differ
diff -ruN ../../VfxForth64Lin.VIRGIN/VFXBase/VfxLin64.no ./VFXBase/VfxLin64.no
--- ../../VfxForth64Lin.VIRGIN/VFXBase/VfxLin64.no 2023-06-09 11:36:10.000000000 +0100
+++ ./VFXBase/VfxLin64.no 2023-08-27 19:28:30.224730620 +0100
@@ -1 +1 @@
-5.41 [build 0183]
\ No newline at end of file
+5.41 [build 0197]
\ No newline at end of file
