Merged branch scratch into scratch

scripts/common.sh

@@ -13,6 +13,7 @@ then
 	
 	ted2="../bin/ted2_linux"
 	ted2_new="../src/ted2/ted2.buildv1.0.91/linux_release"
+	ted2go_new="../src/ted2go/ted2.buildv1.0.91/linux_release"
 	
 	launcher="../Monkey2 (Linux)"
 	launcher_new="../src/launcher/launcher.buildv1.0.91/linux_release/launcher"
@@ -24,6 +25,7 @@ then
 	
 	ted2="../bin/ted2_raspbian"
 	ted2_new="../src/ted2/ted2.buildv1.0.9/raspbian_release"
+	ted2go_new="../src/ted2go/ted2.buildv1.0.9/raspbian_release"
 	
 	launcher="../Monkey2 (Raspbian)"
 	launcher_new="../src/launcher/launcher.buildv1.0.9/raspbian_release/launcher"
@@ -33,6 +35,7 @@ else
 	
 	ted2="../bin/ted2_macos.app"
 	ted2_new="../src/ted2/ted2.buildv1.0.91/macos_release/ted2.app"
+	ted2go_new="../src/ted2go/ted2.buildv1.0.91/macos_release/ted2.app"
 	
 	launcher="../Monkey2 (Macos).app"
 	launcher_new="../src/launcher/launcher.buildv1.0.91/macos_release/launcher.app"

scripts/rebuildted2go.sh

@@ -0,0 +1,42 @@
+
+source common.sh
+
+echo ""
+echo "***** Rebuilding ted2 *****"
+echo ""
+
+$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+
+$mx2cc makeapp -apptype=gui -clean -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+
+if [ "$OSTYPE" = "linux-gnu" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+elif [ "$OSTYPE" = "linux-gnueabihf" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+else
+
+	rm -r -f "$ted2"
+	cp -R "$ted2go_new" "$ted2"
+	rm -r -f "$launcher"
+	cp -R "$launcher_new" "$launcher"
+	
+	cp ../src/launcher/info.plist "$launcher/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"
+	
+fi

scripts/updateted2go.sh

@@ -0,0 +1,42 @@
+
+source common.sh
+
+echo ""
+echo "***** Updating ted2 *****"
+echo ""
+
+$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/ted2go/ted2.monkey2
+
+$mx2cc makeapp -apptype=gui -build -config=release -target=desktop ../src/launcher/launcher.monkey2
+
+if [ "$OSTYPE" = "linux-gnu" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+elif [ "$OSTYPE" = "linux-gnueabihf" ]
+then
+
+	rm -r -f "$ted2"
+	mkdir "$ted2"
+	cp -R "$ted2go_new/assets" "$ted2/assets"
+	cp "$ted2go_new/ted2" "$ted2/ted2"
+	rm -r -f "$launcher"
+	cp "$launcher_new" "$launcher"
+
+else
+
+	rm -r -f "$ted2"
+	cp -R "$ted2go_new" "$ted2"
+	rm -r -f "$launcher"
+	cp -R "$launcher_new" "$launcher"
+	
+	cp ../src/launcher/info.plist "$launcher/Contents"
+	cp ../src/launcher/Monkey2logo.icns "$launcher/Contents/Resources"
+
+fi