From 95a58ee5bcb75371cd21636d39bc12281b6dc90a Mon Sep 17 00:00:00 2001 From: kenunix Date: Sat, 2 Oct 2021 08:53:32 -0400 Subject: [PATCH 1/3] compile.bat updated for 32/64 bit XP,7,10,11 --- compile.bat | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/compile.bat b/compile.bat index 7461f0f..5d654d7 100644 --- a/compile.bat +++ b/compile.bat @@ -1,7 +1,14 @@ @echo off -echo 8-5-2020 Ken. bwbasic. Works under Windows 10 using gcc 7.4.0 -echo and gcc 8.1.0 64 bit -echo Wait +echo 10-02-2021 Ken. bwbasic compile.bat +echo. +echo Tested under Windows XP , 7 ,10 and 11 +echo added notes for 32 bit +echo. +echo Source - https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm64-gcc-5.1.0-2.exe/download +echo. +echo Tested under bwbasic-3.20d +echo. +echo Wait echo. if exist *.o del *.o @@ -25,8 +32,10 @@ call stdcomp bwx_tty.c call stdcomp bwd_cmd.c call stdcomp bwd_fun.c +Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -s gcc -s -ansi -DMSDOS -o bwbasic.exe bwb_cmd.o bwb_cnd.o bwb_dio.o bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o bwb_prn.o bwb_stc.o bwb_str.o bwb_tbl.o bwb_var.o bwbasic.o bwd_cmd.o bwd_fun.o bwx_tty.o +Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -s gcc -s -ansi -DMSDOS -o renum.exe renum.c if exist "renum.exe" ( From 392bffc737b7525b7d4ac6a66c1e9ab8b566614d Mon Sep 17 00:00:00 2001 From: kenunix Date: Sat, 2 Oct 2021 14:38:38 -0400 Subject: [PATCH 2/3] added addgui, delgui to Makefile see more after make sudo make install addgui will put bwbasic.desktop in users Desktop DO NOT run as sudo make addgui use make addgui fixed typos in Makefile fixed typo bwbasic.sh changed dest to /usr/local/bin --- Makefile | 27 ++++++++++++++++++--------- bwbasic.desktop | 2 +- bwbasic.sh | 4 ++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6743378..c06c13e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ # -# Makefile for bwbasic on Linux 8-9-2020 +# Makefile for bwbasic on Linux 10-02-2021 kenunix # Now version bwbasic-3.20d # +# 10-02-2021 kenunix add addgui and delgui and corrected typos. +# set DEST to /usr/local/bin +# # Tested on Ubuntu 18.04 Had to fix compatabily issues # Ubuntu 20.04 Had to fix compatabily issues # Debian 10 Buster @@ -10,7 +13,7 @@ # Linux Mint LMDE4 # Linux Lite 4.8 # -# ken.at.github@gmail.com +# ken.unix.guy@gmail.com # CC=gcc # If running on a Beaglebone you might want to replace @@ -18,7 +21,7 @@ CC=gcc # to have a smaller runtime size CFLAGS=-s -ansi LIB=-lm -DEST=/usr/bin +DEST=/usr/local/bin # HOME=$HOME bwbasic: @@ -26,26 +29,23 @@ bwbasic: $(CC) $(CFLAGS) -o renum renum.c $(LIB) ls -l bwbasic renum -# bwbasic and renum runtime. editfl temp file created by renum +# bwbasic and renum runtime. editfl.bas temp file created by renum clean: - rm -f *.o bwbasic renum editfl core + rm -f *.o bwbasic renum editfl.bas core install: ls -l bwbasic renum cp bwbasic renum bwbasic.sh $(DEST)/. ls -l $(DEST)/bwbasic $(DEST)/renum $(DEST)/bwbasic.sh mkdir -p /usr/share/bwbasic - mkdir -p /usr/share/doc/cbwbasic + mkdir -p /usr/share/doc/bwbasic mkdir -p /usr/share/doc/bwbasic/docs - mkdir -p $HOME/Desktop cp BAS-EXAMPLES/* /usr/share/bwbasic/. cp DOCS/* /usr/share/doc/bwbasic/docs/. cp README READMEFIRST /usr/share/doc/bwbasic/. cp COPYING /usr/share/doc/bwbasic/. cp bwbasic.png /usr/share/pixmaps/. cp bwbasic.desktop /usr/share/applications/bwbasic.desktop - # cp bwbasic.desktop $HOME/Desktop/. - # chmod 666 $HOME/Desktop/bwbasic/desktop remove: rm $(DEST)/bwbasic $(DEST)/renum $(DEST)/bwbasic.sh @@ -67,3 +67,12 @@ run: runlocal: ./bwbasic +# Must do as user not root +addgui: + cp bwbasic.desktop ${HOME}/Desktop/bwbasic.desktop + ls -l ${HOME}/Desktop/bwbasic.desktop + +# Must do as user not root +delgui: + rm -f ${HOME}/Desktop/bwbasic.desktop + diff --git a/bwbasic.desktop b/bwbasic.desktop index 1c81de9..5574292 100755 --- a/bwbasic.desktop +++ b/bwbasic.desktop @@ -4,7 +4,7 @@ Encoding=UTF-8 Name=Bywater BASIC GenericName=Bywater BASIC Type=Application -Exec=/usr/bin/bwbasic.sh +Exec=/usr/local/bin/bwbasic.sh Icon=/usr/share/pixmaps/bwbasic.png StartupNotify=true Terminal=true diff --git a/bwbasic.sh b/bwbasic.sh index cdbdf67..971a125 100755 --- a/bwbasic.sh +++ b/bwbasic.sh @@ -4,8 +4,8 @@ [ -z "$BWBASIC" ] && BWBASIC="$HOME/bwbasic" [ ! -d "$BWBASIC" ] && mkdir "$BWBASIC" cd "$BWBASIC" -trap 'echo " "; echo "PROGRAM INTERRUPTED"; echo "Press Enter "; read j; exit 1' INT +trap '/bin/echo " "; /bin/echo -e "PROGRAM INTERRUPTED. \007Press Enter "; read j; exit 1' INT bwbasic "$@" # -n = no newline -e interpret special octel numbers \007 = Bell -/bin/echo -n -e "Bwbasic terminated. Press Enter \007" +/bin/echo -n "Bwbasic terminated. Press Enter " read j From 11071464c60e077e045ddc683786a174f724896b Mon Sep 17 00:00:00 2001 From: kenunix Date: Sat, 2 Oct 2021 15:21:41 -0400 Subject: [PATCH 3/3] Additions to Makefile addgui and delgui and typos Updated bwbasic.sh typo and bwbasic.desktop Change bwbasic.png --- bwbasic.png | Bin 3927 -> 1574 bytes bwbasic.sh | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 bwbasic.png diff --git a/bwbasic.png b/bwbasic.png old mode 100755 new mode 100644 index 9745723b4a37491d4ae69ed0b26e0bada9cad70c..3ae4eca507cef666f0170f5149c4f89e9ac30754 GIT binary patch delta 1568 zcmV+*2H*MD9;OVC8Gi-<00374`G)`i1?@>hK~#90-I-lz6jv0-fA`MJ&SuqOqYa5D zRuf~~;?>nY4CPR_eF!+;JApHn|`W0!&lhw=6fJ*VGsb zLERo4d^E@dCG3sbUZUcI`@X z^yqMQOfS4iN`KI_hsvuYhyvSAP#^=#vPq>>I?@Dc3_&3 zk_0-A!?ta&v2WilK$Xw12z))DX&R;(ArdKF0bPH1d(cM#MPp-v0|(wkD={FHQZzKI z;9*!Frtm<0eJ%C%bs@znW?2D2PfsuB&ixR|18deiLw{4#+G(Iy9KIg7bmy|B6y}vcVKOQ#F+`ed=5kTWBQ6S4CMNuH4!-;ZZd`-W5pRAh1~p4y z#~x^W8GpDt9SR6KJI~P3@fn6;U|ANRNTn>40?V>+U4?CXR?O$>I4;|_zs~;syUAK~ zY!u#q8%}=((E>Z%0siTO?|+2#ufpMD5UC)jH>M~hEbiYQB@)SP1t}!}nr5ODfH`iC zQsBDIMCi*tqc(qEQnmC7LGDGz}>Q znx-R!K-V>d5EzEH)pXqx7mwHDS6E`*{0tuN? z{CjP|$Y-Dd=Q^QvH(p##4H=eNASC~W(GV5wl|KneZDth+-4_L)II{{=E(Wu-LTN1hRPZs;*A9i+yDwFT3XiA(z1bYHN9U)<^uP;uM3_?k6Dx!<>TS&0o%6IMSolf zp}Ib0AF+4u0Qc^>jEyN4Ez&rAxRS8V&y>e1hYpo~tYX{VvC7`PJAFwVJ2uSlu(w?r z8jQ38;oxf~DJ6zsWcPYd2qCjotN%T@@2OOIZKp50L?TXG+gqWU`qisf;lCwBfdbyx zG;bkAJid~6d}Roc88ZHa9*PHU+<&;q<;#75m%JRu+p~`2O!6sk96Q^s)z{aONW^^? zt*DR;47f9?fZ)P~i?p{NNe8haKn?>ug<4xTkw`p+pBJKe{lScRz;PUghwoyV5tQ=W zo(X7O*R#n>N}280gz%DCu^^5{bN`2YQWsM|v3c`)wrts${%tb3HT|rYIe(>?9MNbl z2rO%cJm6U|BYdo^MGBFxK)I)PGu#hMj{k`Q({pY*K>;ae{smt}Md2F3l_~m;?B-2} z603)zsH&Qix3Iu8$7lEcetQD3$smMaWMq8Ftt*u~0#FJTFYYUoZXqNiBaOsjIfk)V zu3r#BQd3jPnwj?1gT81{bLL13l##z^{woJBL6*K|Rh4nm zFhok;zHR+>{rZEYv6wbmKHZ5>3cc{fc`TOyhz^IrL8oeH$eyeB^(8*6t?j*AU2QBG z9CS)K1Pp{|RM=SR5G#OHz9sCEEVEkB| Sxld>S0000q`?Ti8NKgzQTtwZD2*^|pKO z{BgB9Vn%V9bLRI)ojR}Tz4v*)-}kpYNGS#XpA3D!(=5wU6s4x7rn|eF5b|RZ(eG#& z<4`Dc`SRuM+qVM%IF37h{J3El^hdJq0Av_OAP_in=FHBWJ8yWZ_3PKy*Vq3jSlrQnbdU|>Sfq>f4(f33SA>QGLMx$+QZ4W*4(1;Nu1VJb+ zE?%{2)%^MMZw9D;4Tam=%OAKK@F3^szZo!fdH{nfpMUQ4dM8YnplMoncXuL@;5ZIK z*tlj5r4&Ml02uw?gJXaBOO=opUU;FnxHxsSqN1W%vu2$=dv@i@mHGMk6l01p5(J3Q z%>wC~7VPP1*VHy7b2k2Z=)8P7FsrVvj#A2T9HZel?ov?^0Du?8Meo0l-R|Po zU$3pLEiEnm`Zd?BTQ_&^+{1?tuU@@6KR>^3h`+scK!hZxGiSxBNpJ4ST3XQf(yM{X z7rMK56$ygS)z!6h>CyuS z4)p7b{yk(EhN`NpQ5eZ&*U@rYnnTMT8I48>AqXKt2&L4rtk!qmHF|q>%bLDo#hK@y zpS*FSmX-CZb?Z8G{Tqa`YSpSGOO}+Dmfo{q!GlFb9M69XP&^*jGz~(CF(!my%i;)b z@97N&gUmOEVd!zyNG3ave`3U9*s{h98FKy5Apn4k(9CVyz>pz3UVH7}!Gqs0O>Ex0 z`Dcq4@7c3w_wL=`%Lt;c_gX@TrfH#2C>Dz$gb+d;&kGJGgpg8dnr1v6k3=HDmTSSz zHpMXF2*nXfX+k69*dPAz+4}XncI|3xY<%XKXZoetuwg^~oH^;(=;`k2UqcLqeTtF< z5sJlPmSv$Yb3xa2MNwk0SYu=3<;$1jK zmbcz|D|Ms6g9pFyx819Mws<(Ou5Ei(MqEF2h&h&Z6VtR3Nv$iO49Rp`mL&)R^HWz> zSABgwAtWA;zxd*dh09kV(KU!rB=8)^vD(P72V+T zsp+oi(}wVz=#z1LiiTwk#@MnfjESNq4AUAuDAR7YGbhDjF|XGf z427P1?zxXkD;6%gJ1@Urq(gAXGJuekA^-q^5K#&M5Cp-pEC`{ZD4%@t2|{T0?Adch z-g@IL`QRb5ec^5}nuL!p6oyIYa~LIMB+01^Nqgd&8pBuSDa2!bezJkMi{ zo0^*1D~?@1R^>z}cju1D+qR1i#|;IEPX&v4$S@3D*9ks;cqNlbPLSB(oJ=Ma#jjiV`nASC{eH{A4^GUQGo$(Q zsFu_un_#!gAMC9xTrqq3efLd92w==ooZW=9w@IT$5{?rD!8A>t=Q)nczW)IOB0&_H zE>oG5B1SienqghMbkX12V_6oZ6e1Yt>H5{fs}FuyF>~g$&elkB!1Dk?;BZ*JHrUk)A!JPkLWmHO-0A$6SrQJ1!{M-LnwDj; z@&*9-XZ=Whp_F2hCg zXlrfj(R7_LQA+ugdl(AO^O7VPhGDbWG)?>Se{3)LM_JyTGuxW|m=epRdeX|saE2n0 zj8O=`a0Ygr~CpxftD z)tF(#94?2i%LkDlNj%3Pk+-?ioTEl&e^~PAl7GGPiJTlSrP!iWHE|%er{T!koNM)l z8HMv_K?pG+=j*Rme0sU|bmQopVTglDEaoJH)taw(h!DbYoFqx1P-w}LC4YbC$doBl zeLZ2z#Fj-=RY@jeJkJ3@0EG^xGm%gU5kyfKFuIWrb|tFHvS^bWqRkzH^$h@U7~^m_LI~zLUenDHBPI+QJcv?kw+WC<0lS1S#x;h zvVv*TCVw&Ha2$k?@7r0&jvagQi+Mlv6@=J&8C12!uSP79s#E(a2|~Pkd1NW?^9=$8lG$UTtcsrSvBb$8D;b;3bqh zW$@{975}!bX!!8q4u?aQWt+{$a-8oQGK}%(w-Ez<>c` z#*ArdYHIVf17lEBy{<*bhR1&H@px=Do6Tl(I2@uVilQh80>l`n`aEldhGEpy)GS-J zZ0_vEdDHR-W@TBHAxkpHaXilhh#;k*a5x+cQ%E?-c|0Dw-A(|N1i`?`@}nQUe_+p+ zEnB=^ud1pTV^)PJrGY@8qT;m2<6gdesmtZc$jETJ-5D7fE|<&gcH3+=Ns_(-r0cq> zs_}T75OVeE)khzF^zOUvo0+=+P#}mrL=Zv_A>I%Jq^6XS`* ziK?;#AHBVK^JcHtn@A)OLZT?Laf%Ibf*?qeB+IhhZg;s{>FMd|>FG|V(`K{Dvdr`R z7Yhv`gaJjP(P%VknkIzs!i5V@KKbOG)9=ljc`pY5;2;kWZYj~S|T2&rbQ4K zKW+>L=8>|)hsySC-MTd`EiI8q5JKE;cV=cL&-1Lmre-5alI(Un<8V5icDr2^MM;tn zLNGN)vtcNaNGOUDkH>Xgw=Ao!u5Rnrt+Vs)n>KYWfRF=}0Dve@0d4PW!xpBHq`RFI z=;zLz`=qLL%a$$a>FKdp3_@tP+XoID=yJL2b~~HYWLXwPk?onxB}_x?pdbj4EfOgv zw%;U^Nfx+hG^*=*eSQ7YPd}YE?VcGk=2OhpNDz)he7+8W6S7ARLlA%TQR%r0m5)5~ zh{xlhl*+Qqaz_vZx7*Ev;&3<^7E2~U5K<0fqY{fOyx|QM)1a>Fi9{kC4l9bHXi}s#H@)ecn2JWphmhE~Rlz z(-cKvs;aB2d;Iao?_Kb~;)11uC@9g${sSc^KPxLJD9Fyv&dkhYzG2Q_Cd;zZ>10}w zWtqt~6&*(NExUc+*jbjvW`0f6qS0s~kvMtsNDjM2w^Hl-|U#1 z0_s;)rfC|6p=lb%IJFwEHkYa~tS+b0=O$5Z7AS?qx*l8BQvH$vrRoa%ev{GpK|nV| l5M!L0>=?ui_3eAx{{UN7(&yp9p11%2002ovPDHLkV1kC0m^lCd diff --git a/bwbasic.sh b/bwbasic.sh index 971a125..89dcc3d 100755 --- a/bwbasic.sh +++ b/bwbasic.sh @@ -1,10 +1,11 @@ #!/bin/sh # 12/14/2019 Ken # 07/28/2020 enhanced by ChipMaster +# 10/02/2021 fix typo kenunix [ -z "$BWBASIC" ] && BWBASIC="$HOME/bwbasic" [ ! -d "$BWBASIC" ] && mkdir "$BWBASIC" cd "$BWBASIC" -trap '/bin/echo " "; /bin/echo -e "PROGRAM INTERRUPTED. \007Press Enter "; read j; exit 1' INT +trap '/bin/echo " "; /bin/echo -e -n "PROGRAM INTERRUPTED. \007Press Enter "; read j; exit 1' INT bwbasic "$@" # -n = no newline -e interpret special octel numbers \007 = Bell /bin/echo -n "Bwbasic terminated. Press Enter "