From 84cd0c73cbee9f97e410c3c89bd3ab08271cc704 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 30 Jun 2024 08:34:22 -0700 Subject: [PATCH 1/4] More consistent HCFILES filenames --- internal/MEDLEY-UTILS | 26 ++++++++++++-------------- internal/MEDLEY-UTILS.DFASL | Bin 18006 -> 17877 bytes 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/internal/MEDLEY-UTILS b/internal/MEDLEY-UTILS index f5fc7f225..fb61fc23a 100644 --- a/internal/MEDLEY-UTILS +++ b/internal/MEDLEY-UTILS @@ -1,10 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Apr-2024 16:25:20" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;9 28903 +(FILECREATED "30-Jun-2024 08:28:44" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;2 28720 :EDIT-BY "lmm" - :PREVIOUS-DATE "26-Apr-2024 16:34:08" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;8) + :CHANGES-TO (FNS HCFILES) + + :PREVIOUS-DATE "29-Apr-2024 16:25:20" {DSK}larry>il>medley>internal>MEDLEY-UTILS.;1) (PRETTYCOMPRINT MEDLEY-UTILSCOMS) @@ -258,7 +260,8 @@ (DEFINEQ (HCFILES - [LAMBDA (BASE REDO SUBSETS) (* ; "Edited 23-Apr-2024 23:15 by lmm") + [LAMBDA (BASE REDO SUBSETS) (* ; "Edited 30-Jun-2024 08:27 by lmm") + (* ; "Edited 23-Apr-2024 23:15 by lmm") (* ; "Edited 22-Apr-2024 13:22 by lmm") (* ; "Edited 5-Feb-2024 12:16 by lmm") (* ; "Edited 4-Nov-2023 11:14 by lmm") @@ -302,12 +305,7 @@ (* ;;  " doesnt (yet) implement / to - translattion. .readme should show up as -.readme.") - (SETQ DEST (PACKFILENAME 'EXTENSION 'pdf 'NAME - (IF EXT - THEN (LISTGET SRC 'NAME) - ELSE (PACK* (LISTGET SRC 'NAME) - '-src)) - 'BODY NOV)) + (SETQ DEST (CONCAT NOV ".pdf")) (CL:WHEN (AND (NOT REDO) (INFILEP DEST)) (CL:FORMAT T "~a already there~%%" DEST) @@ -502,9 +500,9 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1064 11630 (GATHER-INFO 1074 . 6456) (MAKE-FULLER-DB 6458 . 7235) (MAKE-INDEX-HTMLS -7237 . 10999) (MEDLEY-FIX-LINKS 11001 . 11394) (MEDLEY-FIX-DATES 11396 . 11628)) (12809 15597 ( -MAKE-EXPORTS-ALL 12819 . 13878) (MAKE-WHEREIS-HASH 13880 . 15069) (MAKE-WHEREIS-LOOPS 15071 . 15595)) -(15598 23855 (HCFILES 15608 . 20089) (MAKE-INDEX-HTMLS 20091 . 23853)) (24105 28717 (RECOMPILE-ONE -24115 . 26012) (RECMPL 26014 . 26617) (COMPILE-SETUP 26619 . 27243) (REMAKEFILES 27245 . 28715))))) + (FILEMAP (NIL (1099 11665 (GATHER-INFO 1109 . 6491) (MAKE-FULLER-DB 6493 . 7270) (MAKE-INDEX-HTMLS +7272 . 11034) (MEDLEY-FIX-LINKS 11036 . 11429) (MEDLEY-FIX-DATES 11431 . 11663)) (12844 15632 ( +MAKE-EXPORTS-ALL 12854 . 13913) (MAKE-WHEREIS-HASH 13915 . 15104) (MAKE-WHEREIS-LOOPS 15106 . 15630)) +(15633 23672 (HCFILES 15643 . 19906) (MAKE-INDEX-HTMLS 19908 . 23670)) (23922 28534 (RECOMPILE-ONE +23932 . 25829) (RECMPL 25831 . 26434) (COMPILE-SETUP 26436 . 27060) (REMAKEFILES 27062 . 28532))))) STOP diff --git a/internal/MEDLEY-UTILS.DFASL b/internal/MEDLEY-UTILS.DFASL index d739e7b7c1726a11f52949b1bbf99a855ee4291e..317ed2c7af04aafe215be4e50a641eb079bedb6d 100644 GIT binary patch delta 1375 zcmZuwZ)_7~7{BMeb|uqID1Q_-=0SDXuI<{pLptohj$Wm3tYvo#b1J6Nn>L$m*L6lB zY%&uP;;A)nMy`-(FhooUkmUmSNi@Mv{`n>eAB>5?#27;q<1~h(zVBP<#c0#q^Lu~K z?|Gizd-uLKO!($asD<34Ge%|R-RNWEV!KwFtsF9hiNcg29I6<(s*x9@NNCS&F(gJr zS%}28i?Qvp+@4Bk>c3^$Y%!lZ93*mq$PIz&gTg=hrOQ|O&HvYE(Uf0HYI~2y@0kG6 zzT*05wJQ>hZnIx_D9#h&{jOREoW&7;3?^~G?}sNa_P^czVa8kH$giC~7Ck|33E@n4 zlfqMh)36G!=$nK^TxKfF9$=X-DBSJn<1Gkx8Kk9fgBsBlO{a_Nj^twp zdTWk+l0xn(4u}D77lHf{%XB3(!wSW_@r0;)!s1vm={K3FS(mSS=J^WaLTK=yn}zOw0S;?RpOOc9NDiK5{2hF$ zD{lWaa2_FO*yrLgSl_#jX%Wqnn~V86JG-bC|2cS&&XDlVU=XdM{zr?rI$9NAD zi>&2sH~-(ETSfb~o&DfpXPdlae_{`a_*}dfpGtfS5`J}P6X|$rNJZ;2h*?Hi#IdgX Yxn`7bBk3bjpYjPDz~3v=e5KL&8#UXClmGw# delta 1491 zcmZvce`p(J7{~8@FKM8*TgmE=Y_+@ERhu-)a+lmRrLl|6MYCR;EO$yPT1eY0i_Mxe z%jkyK>KOA6&zbpBxJ=w+Oc;#8YGm^daUc!^fBhjFR4o3XuzzG54jqCx-{%d@AuNP@ zKF|04KF|BS+>h(;pc@9N`fU4)2eRZ{TmLKJR;_rbJd+jnxU4w5 z+$#Pu2W(xE&RVjArB7Yz+#r^-B1Xxs_7)QHe1LY7HP0OSiYNnB6d^YTj-z$*s`tRd zCmjRa>OVQPgTuY%ieZn6VNoQ%c;BN#ih+9BH-)zQk8&LUS*-+NwYC7^;~KppH{dk6 z?SFK6u%Y`Kp|25KEa0DLEHoMZ0jkm51t(~a zP05rpt}7F|rl*zY7&rtfJ4V#xvZlm`LD(rH4Lifj$>9MFzd1DN8 ziTPj*^pS-p*m=?0>un z4xICKQH?)CHCsHIP$8+BRikAbMq}wQC`I4F$_Tj~czpRzQ^3Dj_&LMxsSTf|-C9y< zMb{@GJLl8`fAgTP62XPz#L-uJD>-e_zsq5 zAlbq6lYm<-?6B}5>gG$c`@qq{ zkvuJ_NF~RlC$x}h@P0pgMz_;Sp;8pUvc)voQ?a-}U)cFdem(~xzQ(%z40zEb_)R(n zW;Xy6Yg0T${+9M)IY88)2faitc6SjH^tQ3nB38VKd=qrFeckMaE|5FH-WLv=#%ASk zsgR$^R|NmTxqJzBMLE;3vka27X*icMLZ(2!L9<7M%KmIQyVOTlxIazO#yZ|4xzOdF zALwxQ#CS}ZVB*V|dU$pRxvLa$y8f&jMDUsh>xXuo#@!f!k-KGca1A1Vpxn;hkHo-fX zxpCib+4%=-B-hKsJCS3U8AWn__Z}32J&7y2j%0E#+Cw|Ko>Q@FZ)0Gb#vC(iTqDY4 VDb`D^XJcQWNs>_(_{#nJ{{fH|qGSL7 From a8c82aa9c4204b9538a7fd0165483824700d44fc Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 30 Jun 2024 14:45:12 -0700 Subject: [PATCH 2/4] The new HCFILES process is simpler if .pdf files aren't ignored --- scripts/make-gh-pages.md | 92 +++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 49 deletions(-) diff --git a/scripts/make-gh-pages.md b/scripts/make-gh-pages.md index a6ad9a120..a38080854 100644 --- a/scripts/make-gh-pages.md +++ b/scripts/make-gh-pages.md @@ -3,71 +3,65 @@ HCFILES writes in {MEDLEYDIR} but it should write in something like (SRCDIR) # setup - github pages are maintained in the 'src' repository as a forked repo - If you don't have a clone of src: -``` - gh repo clone interlisp/src # make one - cd src # all other commands -``` -the first time once you've cloned, point the 'src' clone -``` - gh remote add upstream https://github.com/interlisp/medley +## Remove extraneous files -``` -now update src repository to match 'medley' -Run these in the 'src' repository! +There are lots of ways to get there but basically set up the execution environment with everything clean but notecards loops, test are copied in. If you don't make fresh, at least 'git clean'. ``` - git fetch upstream # pull down remote branches - git checkout master # make sure you're in master - git rebase upstream/master # update src's master - # to latest medley's master - git push -f origin master # push back go sfc -``` +gh repo clone interlisp/medley +gh repo clone interlisp/notecards +gh repo clone interlisp/loops +gh repo clone interlisp/test -# Run Medly to create PDFs. - -Start with the apps sysout to spare yourself package problems -In an Interlisp exec: -``` - (FILESLOAD PDFSTREAM GITFNS MEDLEY-UTILS) - (HCFILES) - (MAKE-INDEX-HTMLS) +cp -r notecards loops test medley +rm -rf notecards/.git loops/.git test/.git ``` -check out that it looks right if you point your browser the index/index.hrml at the top level - -# deploying -* find the current release tags -Not sure how to do that. +# making the .pdfs and index.html files +## best start with a fresh loadup ``` - wget -l 1 https://github.com/interlisp/medley/releases/latest +./scripts/loadup-all.sh ``` -will retrieve a 3xx redirect from the web server; -But all you need is the name, not the web page. -anyway, assuming the release is medley-YYMMDD-xxxxxxx. -put release name in variable -``` - export release=medley-240420-1234567 -``` -## make a new branch +# Now run in Medley "apps" loadup ``` - git checkout -b pages-$release + ./medley -a & ``` -*temporarily* change .gitignore to allow checkin of pdfs and index.html -``` -cp .gitignore /tmp/save$release -cp .gitignore.for.pages .gitignore +and enter the following to make the PDFs and the index.html files that links them. + ``` -Now you can push this to the github-pages +(DRIBBLE "medley/loadups/hcfiles.dribble") + +(FILESLOAD MEDLEY-UTILS PDFSTREAM GITFNS) + +(SETQ NO-HELP NIL) +ADVISE(HELP :BEFORE (IF NO-HELP THEN ( (ERROR MESS1 MESS2))) + (LET ((NO-HELP T)) (DECLARE (SPECIAL NO-HELP)) (HCFILES))) + +(MAKE-INDEX-HTML) ``` - git add . - git commit -m "rerun making ghpages and index" - git push +# Deploying + +The trick is to take a repository based on the master branch of medley and produce a gh-pages branch in the Interlisp/src reposiory. + ``` +git remote set-url --push https://github.com/Interlisp/src +git branch -D gh-pages ## if necessary +git checkout -b gh-pages ## make the current directory content the same + +## make sure the .gitignore DOESN'T ignore .pdf and index.html files +git add . +git commit -m "add created pdf's and index.html's" +git push --force +# Put it all back +after you've done this, you can clean up (from the medley folder): +``` +find . -iname "*.pdf" -exec rm {} \; +git remote set-url --push https://github.com/Interlisp/medley +rm -rf loops notecards test +``` From 31863256c82a70e09e822b7838d40f8f8db6d0e3 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 30 Jun 2024 14:45:46 -0700 Subject: [PATCH 3/4] The new HCFILES process is simpler if .pdf files aren't ignored --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cada3c154..fa4c87d21 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,10 @@ maiko/ # because they will get regenerated when you rebuild. # MEDLEY-UTILS HCFILES regenerates -*.pdf +# do not ignore .pdf files after all... rather, [new workflow](scripts/make-gh-pages.md) stores it in the src repository gh-pages branch. + +# *.pdf +# index.html # all loadup files From 9e7445927c6982de5958f45442b84003e94f8bf0 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 30 Jun 2024 15:09:40 -0700 Subject: [PATCH 4/4] .nojekyll is used to indicate that no processing or workflows should be run before web publishing --- .nojekyll | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .nojekyll diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 000000000..e69de29bb