diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx index 18dd31f9..6e47ca29 100644 Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po index ebaeba10..b0921d7d 100644 Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ diff --git a/.Floppies/PK-A2OSX.dsk b/.Floppies/PK-A2OSX.dsk index 90295d29..1786bd19 100644 Binary files a/.Floppies/PK-A2OSX.dsk and b/.Floppies/PK-A2OSX.dsk differ diff --git a/Notes for Developers.md b/Notes for Developers.md index d3be8d7d..05c326c5 100644 --- a/Notes for Developers.md +++ b/Notes for Developers.md @@ -6,7 +6,8 @@ There has been a significant uptick in interest in A2osX and its development. T >This section mentions the names of Software products some of use in the A2osX development process. Other than the Assembler, which is core, the other products could be replaced by similar software of the users choosing. Below, more information is providing on these products and as alternatives become know to us, we will update this document to make you aware of them. -In the purest sense, the development of A2osX is at its core an Apple II centric process. All the programs that make up A2osX are Assembled on an Apple II computer using a ProDOS-based assembler made by S-C Software Corporation. The reality of the development workflow is a little more nuanced. So lets talk about the actual process, starting with the place that brought you here, GitHub(GH). GH is our repository for code and files used to create A2osX. You can browse all of these files on GH, presumably you are reading this file from the root directory of the A2osX repository. +In the purest sense, the development of A2osX is at its core an Apple II centric process. All the programs that make up A2osX are Assembled on an Apple II computer using a ProDOS-based assembler made by S-C Software Corporation. + The reality of the development workflow is a little more nuanced. So lets talk about the actual process, starting with the place that brought you here, GitHub(GH). GH is our repository for code and files used to create A2osX. You can browse all of these files on GH, presumably you are reading this file from the root directory of the A2osX repository. Currently, all of the active developers of A2osX use a SVN (Subversion) client to create, maintain and update files in the repository. Many of us use TortoiseSVN, but other clients are available, including some GitHub specific desktop apps. Using SVN, we can download updates from other developers and submit updates we have made. TortoiseSVN happens to integrate well with Windows Explorer. @@ -14,7 +15,7 @@ Most of our developers are using Notepad++ to edit the files stored in the repos So how do we get from a source text file on GH to a running binary on an Apple...that magic or rather our current particular flow is achieved by combining two tools, the **S-C Macro Assembler running under ProDos** hosted on **The AppleWin Emulator** running on Windows. If you were to look at any (well most) of our source files in the GH repository you will see non-source like extras at the top and bottom of each file. These are actually S-C Assembler directives. If in AppleWin (AW) you mount and boot from the current BUILD media (found in .Floppies) the default behavior is to load the S-C Macro Assembler (you see the : prompt). In our source files you will see at the top directives such as AUTO 4,1 which means start automatic line numbering at 4 incrementing by 1. At the bottom of the file are directives such as TEXT SRC/LS.S which means save the source listing to the ProDOS disk in directory SRV as file LS.S. -What we do in our current work flow, is we edit the file with Notepad++, save locally, which then gets sync'd to GH, but then we select all text in file (Ctrl-A), Copy (control-C) and then switch to AW with the S-C : prompt and paste (Shift-Insert in AW). That types the source into the assembler and the other bits at the top and bottom of the file Assemble and save everything to the BUILD disk image. To test our new program (bin), you type -RUN which is the same as -A2OSX.SYSTEM which loads A2osX. +What we do in our current work flow, we edit the file with Notepad++, save locally to sync with GH, and then we select all text in the file (Ctrl-A), Copy (control-C) and then switch to AW with the S-C : prompt and paste (Shift-Insert in AW). That types the source into the assembler and the other bits at the top and bottom of the file which Assembles and saves everything to the BUILD disk image. To test our new program (bin), you type -RUN which is the same as -A2OSX.SYSTEM which loads A2osX. >As stated at the very beginning, technically this Assemble/BUILD is a native Apple II process. Technically, you could run any ProDOS text editor, edit your source files and if using the right S-C Assembler commands you could Assemble binaries all in AW or on real Apple Hardware. We do not do this ourselves as it would then break the GH/SVN part of the workflow which we believe has value. This document does not cover the Apple only dev process, but read the Planned Development Process for what is coming in that area. diff --git a/TESTS/ARGTEST.txt b/TESTS/ARGTEST.txt index 69aabdbc..b66eba49 100644 --- a/TESTS/ARGTEST.txt +++ b/TESTS/ARGTEST.txt @@ -12,6 +12,19 @@ AUTO 4,1 # and can be checked in ARGTEST2 to compare with # parent process id, this will validate both are working. # +# This script is part of the BUILDTEST suite, as such +# we first make sure it was called from that suite by +# checking for $LOG +# +IF [ $LOG = "" ] + ECHO "Log Empty True" +ELSE + ECHO "Log Empty False" +FI +PAUSE +# +# Now call Argtest Sub Script +# ARGTEST2 A 1 B 2 C 3 Hello $$ 82 Tenth MAN TEXT /MAKE/USR/SHARE/TESTS/ARGTEST diff --git a/TESTS/IFSTRTEST.txt b/TESTS/IFSTRTEST.txt index 52b7e914..db2d98ab 100644 --- a/TESTS/IFSTRTEST.txt +++ b/TESTS/IFSTRTEST.txt @@ -32,6 +32,13 @@ echo FAILED ELSE echo PASSED FI +# Check comparison to bogus var +ECHO -N " Test 5 Bad VAR = ABC : " +IF [ "$ABC" = "ABC" ] +echo FAILED +ELSE +echo PASSED +FI ECHO "\n End of Test\n" MAN TEXT /MAKE/USR/SHARE/TESTS/IFSTRTEST diff --git a/TESTS/TWITTEST.txt b/TESTS/TWITTEST.txt new file mode 100644 index 00000000..6510e565 --- /dev/null +++ b/TESTS/TWITTEST.txt @@ -0,0 +1,11 @@ +NEW + PREFIX +AUTO 4,1 +#!/BIN/SH +# +# +# +httpget maker.ifttt.com -U "trigger/tweet/with/key/i1Gka-oOsIGIfmZ9hTNb68LM5lrmVPdQ2kBwNztk2D9?value1=%Message% with {SPACE} and special ~chars^" + +MAN +TEXT /MAKE/USR/SHARE/TESTS/TWITTEST