Apple-2gs-SW
/
md2teach
mirror of https://github.com/jeremysrand/md2teach.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using the latest version of GoldenGate, the teachRez script workaround is no longer required. The md2teach exec works as well now under GoldenGate as it does under GNO/ORCA (which hopefully means it works well, TBD).

This commit is contained in:
Jeremy Rand 2021-05-11 23:35:26 -04:00
parent c361a9c311
commit 9e8e470ed9
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
md2teach.xcodeproj/project.pbxproj
View File

@ -73,7 +73,6 @@
9DDFC7C4262FD50C006D6E71 /* createDiskImage */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = createDiskImage; sourceTree = "<group>"; };
9DDFC7C5262FD50D006D6E71 /* config.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = config.txt; sourceTree = "<group>"; };
9DDFC7CA262FD7DD006D6E71 /* tar */ = {isa = PBXFileReference; lastKnownFileType = file; path = tar; sourceTree = "<group>"; };
9DEEBB90263A673200DAA063 /* teachRez */ = {isa = PBXFileReference; lastKnownFileType = text; path = teachRez; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -156,7 +155,6 @@
9D6532F52626240800105D50 /* orca-cc */,
9D6532F72626240800105D50 /* orca-rez */,
9D6532F92626240800105D50 /* tail.mk */,
9DEEBB90263A673200DAA063 /* teachRez */,
9DDFC7C5262FD50D006D6E71 /* config.txt */,
9DDFC7C4262FD50C006D6E71 /* createDiskImage */,
9DDFC7C3262FD50C006D6E71 /* empty.2mg */,

3
md2teach/make/tail.mk
View File

@ -196,8 +196,7 @@ executeGUI: all
make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)"
executeShell: all
$(ORCA) --mem $(TARGETDIR)/$(PGM) -d -r test.md $(TARGETDIR)/outfile.txt
make/teachRez $(TARGETDIR)/outfile.txt
$(ORCA) --mem $(TARGETDIR)/$(PGM) -d test.md $(TARGETDIR)/outfile.txt
make/createDiskImage "$(DISKIMAGE)" $(DESTBOOTIMAGE) "$(TARGETDIR)/$(PGM)" "$(TARGETDIR)/outfile.txt" test.md
make/launchEmulator "$(DISKIMAGE)" "$(DESTBOOTIMAGE)"

28
md2teach/make/teachRez
View File

@ -1,28 +0,0 @@
#!/bin/bash
PROJECT_DIR=`pwd`
cd `dirname $1`
TEACH_FILE=`basename $1`
BASEFILE=`echo $TEACH_FILE | sed 's/\.[^\/]*$//'`
REZ_FILE="${BASEFILE}.rez"
R_FILE="${BASEFILE}.r"
if [ ! -f "${TEACH_FILE}.rez" ]
then
exit 0
fi
mv "${TEACH_FILE}.rez" "$REZ_FILE"
$ORCA chtyp -l rez "$REZ_FILE"
$PROJECT_DIR/make/orca-rez "$REZ_FILE" "$BASEFILE"
if [ $? -ne 0 ]
then
echo Error compiling resource file
exit 1
fi
cp "${R_FILE}"/..namedfork/rsrc "$TEACH_FILE"/..namedfork/rsrc
exit 0