Turned off libreadline support on all platforms until the

horrible problems experienced on Windows Vista and the lesser but still irritating problems on other platforms can be fixed. Fixed some bugs in the way libreadline was being used, but with libreadline disabled this is a moot point. Fixed the main GUI (VirtualAGC) so that the choice of folders in some file-dialogs is better, with hopefully less bleed- through from one dialog to the other when directories are using the dialogs. Custom AGC/AEA source code can now be symbolically debugged or be browsed from the main GUI. Previously, it could only be assembled or run (in normal mode, without debugging) from the GUI. This should make (command line) debugging much simpler to do. Added some mods for compiling yaAGC (only) for the iPhone. Added some proofing for Luminary 99.
RobertSkorpil · Aug 2, 2009 · 8e5232f · 8e5232f
1 parent e3ff71a
commit 8e5232f
Show file tree

Hide file tree

Showing 16 changed files with 413 additions and 126 deletions.
diff --git a/Luminary099/Luminary099.binsource b/Luminary099/Luminary099.binsource
@@ -15,6 +15,10 @@
 ;				There needs to be a final proofing of the 
 ;				complete file before I'll have any confidence 
 ;				in it.
+;		2009-08-02 RSB	Finally got around to adding the proofing marks
+;				for the proofing that Steve Case (thanks, Steve!)
+;				did 3 weeks ago.  These were pages 1590-1598 with
+;				no errors found.
 ;
 ; As usual, banks marked V or A have been proofed visually or aurally without 
 ; errors found, while V(n) or A(n) have been proofed with n errors found.
@@ -24,7 +28,7 @@
 ; a "special" proofing step where only some specific characteristic was checked
 ; (such as a single column of digits) rather than the entire page.
 
-; p. 1590, 4000
+; p. 1590, 4000, A
 
 BANK=2
 
@@ -68,7 +72,7 @@ BANK=2
 00023 00021 00025 00012 34745 00006 05011 00002 
 44745 00006 03011 00002 34747 00006 05011 00002 
 
-; p. 1591, 4400
+; p. 1591, 4400, A
 
 00006 30025 52014 00002 00006 30156 20156 60154 
 26154 54007 00002 54162 00002 54135 10000 30135 
@@ -110,7 +114,7 @@ BANK=2
 00013 00015 00017 00030 00033 00035 00032 00045 
 00046 00050 00055 00060 00062 00120 00140 00144 
 
-; p. 1592, 5000
+; p. 1592, 5000, A
 
 00310 00401 00454 00620 00777 01124 01211 01400 
 01426 01776 01777 02177 02400 03000 03400 05000 
@@ -152,7 +156,7 @@ BANK=2
 54065 34753 54066 00006 35367 52006 02224 20103 
 22073 22006 22073 75024 10000 17750 30062 74745 
 
-; p. 1593, 5400
+; p. 1593, 5400, A
 
 10000 15423 50061 31052 54070 30062 74744 10000 
 15427 30002 54063 30006 00006 04007 54064 35422 
@@ -194,7 +198,7 @@ BANK=2
 54001 45774 00006 02005 60001 00006 01005 00002 
 31474 54001 35774 15762 00314 05775 05776 67044 
 
-; p. 1594, 6000
+; p. 1594, 6000, A
 
 BANK=3
 
@@ -238,7 +242,7 @@ BANK=3
 40000 67747 54116 74356 56116 77722 00006 74747 
 50000 16372 06422 16061 06414 16061 06417 16061 
 
-; p. 1595, 6400
+; p. 1595, 6400, A
 
 06422 16460 06422 16144 06422 16463 06422 16466 
 06422 34766 54020 16252 50120 40046 16421 50120 
@@ -280,7 +284,7 @@ BANK=3
 16762 07014 00006 50116 00005 20162 00006 16771 
 07011 00006 50116 00001 17000 00006 50116 30001 
 
-; p. 1596, 7000
+; p. 1596, 7000, A
 
 20155 00006 16061 07017 16061 00006 50116 40001 
 17000 54001 34756 17016 54001 36245 56001 50000 
@@ -322,7 +326,7 @@ BANK=3
 26116 07156 52123 52155 52125 52160 52127 52162 
 30140 26116 07156 52134 52155 52162 52125 52160 
 
-; p. 1597, 7400
+; p. 1597, 7400, A
 
 16061 10163 17430 17430 07107 07140 52160 52155 
 52160 07107 07140 52162 52155 52162 07107 07140 
@@ -364,7 +368,7 @@ BANK=3
 61751 00000 00000 00000 00000 00000 00000 00000 
 00000 00000 00000 00000 00000 00000 00000 00000 
 
-; p. 1598, 00,2000
+; p. 1598, 00,2000, A
 
 BANK=0
 

diff --git a/Makefile b/Makefile
@@ -115,6 +115,12 @@
 #		05/23/09 RSB	Added Comanche055 to the normal build sequence.
 #		06/07/09 RSB	Added Luminary099 to the normal build sequence.
 #		06/29/09 RSB	Added the 'listings' target.
+#		08/02/09 RSB	Now that I got rid of libreadline on the Win32
+#				productin build (yesterday), I'm beginning to
+#				experience readline-related problems (but 
+#				different ones) on Linux.  I'm completely
+#				disabling readline for all platforms for now,
+#				until these problems can be fixed.
 #
 # The build box is always Linux for cross-compiles.  For native compiles:
 #	Use "make MACOSX=yes" for Mac OS X.
@@ -124,7 +130,7 @@
 #	Use "make" for Linux.
 
 # NVER is the overall version code for the release.
-NVER:=\\\"20090704\\\"
+NVER:=\\\"20090802\\\"
 DATE:=`date +%Y%m%d`
 
 # DON'T CHANGE THE FOLLOWING SWITCH *********************************
@@ -157,7 +163,12 @@ YADEDA_SUFFIX=2
 
 # Uncomment the following line (or do 'make NOREADLINE=yes') if the build 
 # gives errors related to readline.
-#NOREADLINE=yes
+NOREADLINE=yes
+
+# The following line, if uncommented, allows my production builds for Win32
+# to use libreadline.  If commented, they can't.  Native Win32 builds aren't
+# affected.
+#ReadlineForWin32=yes
 
 # Uncomment the following line (or do 'make CURSES=yes') if the build fails
 # with an indication that libcurses.a is needed.
@@ -237,44 +248,69 @@ default: all
 all: ARCHS=default
 all-archs: ARCHS=all-archs
 all all-archs:
-	$(MAKE) -C yaLEMAP PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} EXT=${EXT}
-	$(MAKE) -C yaAGC PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" NOREADLINE=${NOREADLINE} CURSES="${CURSES}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
-	${MAKE} -C yaAGS PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" NOREADLINE=${NOREADLINE} CURSES="${CURSES}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	$(MAKE) -C yaLEMAP PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		${ARCHS} EXT=${EXT}
+	$(MAKE) -C yaAGC PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		NOREADLINE=${NOREADLINE} ReadlineForWin32=${ReadlineForWin32} \
+		CURSES="${CURSES}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	${MAKE} -C yaAGS PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		NOREADLINE=${NOREADLINE} ReadlineForWin32=${ReadlineForWin32} \
+		CURSES="${CURSES}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
 ifndef NOGUI
 ifeq "${YADEDA_SUFFIX}" ""
-	$(MAKE) -C yaDEDA/src -f Makefile.all-archs PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
-	-${MAKE} -C yaDEDA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	$(MAKE) -C yaDEDA/src -f Makefile.all-archs PREFIX=${PREFIX} \
+		NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	-${MAKE} -C yaDEDA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
 else
-	-$(MAKE) -C yaDEDA/src -f Makefile.all-archs PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
-	${MAKE} -C yaDEDA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	-$(MAKE) -C yaDEDA/src -f Makefile.all-archs PREFIX=${PREFIX} \
+		NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	${MAKE} -C yaDEDA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
 endif
 ifeq "${YADSKY_SUFFIX}" ""
-	$(MAKE) -C yaDSKY/src -f Makefile.all-archs PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	$(MAKE) -C yaDSKY/src -f Makefile.all-archs PREFIX=${PREFIX} \
+		NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
 	cp yaDSKY/src/yadsky yaDSKY/src/yaDSKY
-	-${MAKE} -C yaDSKY2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	-${MAKE} -C yaDSKY2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
 else
-	-$(MAKE) -C yaDSKY/src -f Makefile.all-archs PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	-$(MAKE) -C yaDSKY/src -f Makefile.all-archs PREFIX=${PREFIX} \
+		NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
 	-cp yaDSKY/src/yadsky yaDSKY/src/yaDSKY
-	${MAKE} -C yaDSKY2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	${MAKE} -C yaDSKY2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
 endif	
 endif
-	$(MAKE) -C yaYUL PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} EXT=${EXT}
-	$(MAKE) -C yaUniverse PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
-	${yaACA}${MAKE} -C yaACA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	$(MAKE) -C yaYUL PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		${ARCHS} EXT=${EXT}
+	$(MAKE) -C yaUniverse PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	${yaACA}${MAKE} -C yaACA2 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
 ifndef WIN32
-	${yaACA}$(MAKE) -C yaACA PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
+	${yaACA}$(MAKE) -C yaACA PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		${ARCHS} LIBS2="${LIBS}" EXT=${EXT}
 endif
-	${yaACA}${MAKE} -C yaACA3 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} CURSES="${CURSES}"
-	$(MAKE) -C Luminary131 PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} EXT=${EXT}
-	$(MAKE) -C Colossus249 PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" EXT=${EXT}
+	${yaACA}${MAKE} -C yaACA3 NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} CURSES="${CURSES}"
+	$(MAKE) -C Luminary131 PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		${ARCHS} EXT=${EXT}
+	$(MAKE) -C Colossus249 PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		EXT=${EXT}
 	$(MAKE) -C Comanche055
 	$(MAKE) -C Luminary099
 	${MAKE} -C Artemis072 PREFIX=${PREFIX} NVER=${NVER} EXT=${EXT}
-	$(MAKE) -C Validation PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" EXT=${EXT}
-	$(MAKE) -C ControlPulseSim NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} EXT=${EXT}
-	${MAKE} -C yaTelemetry NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
-	${MAKE} -C jWiz NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} ${ISMACOSX} LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
-	${MAKE} -C VirtualAGC NVER=${NVER} "YADSKY_SUFFIX=${YADSKY_SUFFIX}" "YADEDA_SUFFIX=${YADEDA_SUFFIX}" clean ${ARCHS} LIBS2="${LIBS}" ${ISMACOSX} EXT=${EXT} ${DEV_STATIC}
+	$(MAKE) -C Validation PREFIX=${PREFIX} NVER=${NVER} CFLAGS="${CFLAGS}" \
+		EXT=${EXT}
+	$(MAKE) -C ControlPulseSim NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		EXT=${EXT}
+	${MAKE} -C yaTelemetry NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	${MAKE} -C jWiz NVER=${NVER} CFLAGS="${CFLAGS}" ${ARCHS} ${ISMACOSX} \
+		LIBS2="${LIBS}" EXT=${EXT} ${DEV_STATIC}
+	${MAKE} -C VirtualAGC NVER=${NVER} "YADSKY_SUFFIX=${YADSKY_SUFFIX}" \
+		"YADEDA_SUFFIX=${YADEDA_SUFFIX}" clean ${ARCHS} LIBS2="${LIBS}" ${ISMACOSX} EXT=${EXT} ${DEV_STATIC}
 
 # This target is for making HTML assembly listings for the website.
 .PHONY: listings

diff --git a/VirtualAGC/Makefile b/VirtualAGC/Makefile
@@ -58,6 +58,10 @@
 #				added a 4th parameter for Windows vs. non-Windows.
 #		2009-06-07 RSB	Added Luminary099.
 #		2009-07-02 RSB	Added SyntaxHighlight stuff to the binary installers.
+#		2009-08-01 RSB	Putting readline5.dll into the installation 
+#				directory is now non-fatal if the dll doesn't 
+#				exist, which it wouldn't if readline was built
+#				static-only.
 
 APP=VirtualAGC
 
@@ -284,7 +288,7 @@ endif
 ifeq "$YADEDA2" ""	
 	cp ${HOME}/IMCROSS/i386-mingw32/bin/*.dll $@/Resources
 endif
-	cp ${HOME}/IMCROSS/i386-mingw32/bin/readline5.dll $@/Resources
+	-cp ${HOME}/IMCROSS/i386-mingw32/bin/readline5.dll $@/Resources
 	-mkdir $@/Resources/etc
 	cp -a ${HOME}/IMCROSS/i386-mingw32/etc/gtk-2.0 $@/Resources/etc